Skip to content

Code merge v1.7 a3 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
thomascool wants to merge 1,805 commits into
base: master
Choose a base branch
from
Open

Code merge v1.7 a3 #2

thomascool wants to merge 1,805 commits into from

Conversation

@thomascool
Copy link
Collaborator

@thomascool thomascool commented Aug 19, 2013

No description provided.

@mickhansen
Should be able to use raw even with read only attributes
6d503d2
@mickhansen
basic changed() functionality
87d2361
@mickhansen
basic previous(key) functionality
278d0a2
@mickhansen
tests & stuff
36a51ab
@mickhansen
BC with isDirty
2736e77
@mickhansen
Fix hooks
6d3202d
@mickhansen
please work
ac5fae5
@mickhansen
please work
07b8e9f
@mickhansen
get savehooks working properly, hopefully
7d41433
@mickhansen
boolean undefined values should not be converted to false
ef0e8bb
@mickhansen
remove .only, gdi
99b15f1
@mickhansen
cleanup
21e9bcb
@mickhansen
whoops, typo
5228c35
@mickhansen
use custom getters in get()
ff96051
@mickhansen
traviz
ef41cb1
@mickhansen
test virtual getters aswell
4d1d686
@mickhansen
Add test and fix for hasMany selfAssociation with through option
033e093
@mickhansen
Merge pull request sequelize#1194 from mickhansen/has-many-through-se…
09ac096 
…lf-association-fix

Add test and fix for hasMany selfAssociation with through option (Fixes sequelize#1184)
@mickhansen
cleanup
99443aa
@mickhansen
cleanup
feef42c
@mickhansen
Merge pull request sequelize#1182 from mickhansen/hydration-setter-ge…
58d5172 
…tter-refactor

Refactor of setters/getters/values in regards to hydration, toJSON and more
@mickhansen
Let's just use ONE type of updateQuery
ba29986
@mickhansen
Remove sqlite specific method
0e82a72
@mickhansen
Just ONE type of incrementQuery
3d71f04
@mickhansen
Normalize setAutocommit/setIsolation level for postgres/mysql
b58e5ed
@mickhansen
create quoteTable method
07e72bd
@mickhansen
normalize start/commit/rollback query generation
6132bcc
@mickhansen
just one renameTable query
c65f35e
@mickhansen
just ONE insertQuery
cf21f35
@mickhansen
DEFAULT support is not the same as DEFAULT VALUES support
ab1eb32
overlookmotel and others added 30 commits January 21, 2014 01:50
@overlookmotel
test bad db connection details throws error
3b3c2d6
@bulkan
Optional array argument of table names to skip
d1b1e6c 
dropAllTables now accepts optional array argument of tables names
to skip dropping these tables

implementation for sequelize#1270
@bulkan
dropAllTables now accepts an options object
cc054e9 
If this object contains a propert called `skip` that is an array,
then all table names in this array wont be dropped
@bulkan
use triple equals
fddc9e9
@mickhansen
Merge pull request sequelize#1280 from bulkan/feature/skip_tables_dro…
4123629 
…pAllTables

Optional array argument of table names to skip
@mickhansen
Update changelog.md
d176ee0
@mickhansen
Merge branch 'test_bad_db_conn_failure' of https://github.com/overloo…
a5b80a7 
…kmotel/sequelize into overlookmotel-test_bad_db_conn_failure
@mickhansen
Better mysql error handling
532754f
@mickhansen
Handle all cases
c76d53f
@mickhansen
Remove unneeded code
ce49ac0
@mickhansen
Update changelog.md
ad04b3f
@mickhansen
Merge pull request sequelize#1282 from mickhansen/overlookmotel-test_…
8158387 
…bad_db_conn_failure

Fix for MySQL connection errors
@mickhansen
Add error handler from getConnection to query
e1d048e
Adding HAVING clause support to generic query generator
060b935
Added table prepend option to getWhereConditions in query generator
b94ee06
Added unit tests for query generator
a4a83f2
@sdepold
Add new methods for and / or queries
b4b0b9b
@sdepold
Add test to make sure that array notation for where works
b49f7c0
@sdepold
Add support for Sequelize.and / Sequelize.or
44b9539
Bugfix for condition and code style issues
9f76920
@sdepold
support for or-queries. fixes sequelize#1253
8a96b61
Fixed a code style issue in mysql query generator unit tests
64c5528 
Added Postgres and SQLite unit tests
@mickhansen
Merge pull request sequelize#1287 from sequelize/feature/or-queries
0c425fb 
Support for OR queries
Merge branch 'master' of github.com:sequelize/sequelize
bf89fcb 
Conflicts:
	lib/dialects/abstract/query-generator.js
Updated changelog
304c71e
@mickhansen
Merge pull request sequelize#1286 from OtaK/master
0cd08d9 
Adding HAVING clause support to generic query generator
@sdepold
Test for find and findAll
4e462a7
@sdepold
Fix optClone for Sequelize.and / Sequelize.or
4ad706a
@thomascool
merge from the latest https://github.com/sequelize/sequelize
68aa565
@thomascool
merge from the latest https://github.com/sequelize/sequelize
c2db8d4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.