Merge from latest

.gitignore

@@ -4,3 +4,4 @@ test*.js
 .DS_STORE
 node_modules
 npm-debug.log
+*~

.jshintrc

@@ -0,0 +1,22 @@
+{
+    "globals": {
+        "jasmine": false,
+        "spyOn": false,
+        "it": false,
+        "console": false,
+        "describe": false,
+        "expect": false,
+        "beforeEach": false,
+        "waits": false,
+        "waitsFor": false,
+        "runs": false
+    },
+    "camelcase": true,
+    "curly": true,
+    "forin": true,
+    "indent": 2,
+    "unused": true,
+    "asi": true,
+    "evil": false,
+    "laxcomma": true
+}

.travis.yml

@@ -19,7 +19,4 @@ env:
 language: node_js
 
 node_js:
-  # - 0.6
-  - 0.8
-  # - 0.9
-
+  - 0.8

.watchr.js

@@ -0,0 +1,17 @@
+var watchr = require('watchr')
+  , spawn  = require('child_process').spawn
+
+watchr.watch({
+  paths: [__dirname + '/lib', __dirname + '/spec', __dirname + '/index.js'],
+  listener: function(eventName) {
+    if (['new', 'change'].indexOf(eventName) > -1) {
+      // generate the documentation
+      spawn('npm', ['run', 'docs'])
+
+      // run the tests
+      var buster = spawn('./node_modules/.bin/buster-test', ['--reporter', 'specification'], { env: process.ENV })
+      buster.stderr.on('data', function(data) { console.log(data.toString()) })
+      buster.stdout.on('data', function(data) { console.log(data.toString()) })
+    }
+  }
+})

README.md

@@ -2,7 +2,18 @@
 
 The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databases by mapping database entries to objects and vice versa. To put it in a nutshell... it's an ORM (Object-Relational-Mapper). The library is written entirely in JavaScript and can be used in the Node.JS environment.
 
+<a href="http://flattr.com/thing/1259407/Sequelize" target="_blank">
+<img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
+
+## Important Notes ##
+
+### 1.6.0 ###
+
+- We changed the way timestamps are handled. From v1.6.0 on timestamps are stored and loaded as UTC.
+- Support for synchronous migrations has been dropped. `up` and `down` methods in migrations do have a third parameter which is the callback parameter. Pass an error or an error message as first parameter to the callback if something went wrong in the migration.
+
 ## Blogposts/Changes ##
+- [v1.6.0](http://blog.sequelizejs.com/post/46949108134/v1-6-0-eager-loading-support-for-enums-decimals-and) Eager loading, support for enums, decimals and bigint, performance improvements …
 - [v1.4.1](http://blog.sequelizejs.com/post/24403298792/changes-in-sequelize-1-4-1): deprecation of node < 0.6, logging customization, ...
 - [v1.4.0](http://blog.sequelizejs.com/post/24345409723/changes-in-sequelize-1-4-0): postgresql, connection pooling, ...
 - [v1.3.0](http://blog.depold.com/post/15283366633/changes-in-sequelize-1-3-0): migrations, cross-database, validations, new listener notation, ...
@@ -19,16 +30,55 @@ The Sequelize library provides easy access to MySQL, SQLite or PostgreSQL databa
 - Associations
 - Importing definitions from single files
 
-## Documentation, Examples and Updates ##
+## Documentation and Updates ##
 
 You can find the documentation and announcements of updates on the [project's website](http://www.sequelizejs.com).
 If you want to know about latest development and releases, follow me on [Twitter](http://twitter.com/sdepold).
 Also make sure to take a look at the examples in the repository. The website will contain them soon, as well.
 
 - [Documentation](http://www.sequelizejs.com)
 - [Twitter](http://twitter.com/sdepold)
-- [IRC](irc://irc.freenode.net/sequelizejs)
-- [XING](https://www.xing.com/net/priec1b5cx/sequelize)
+- [IRC](http://webchat.freenode.net?channels=sequelizejs)
+- [Google Groups](https://groups.google.com/forum/#!forum/sequelize)
+- [XING](https://www.xing.com/net/priec1b5cx/sequelize) (pretty much inactive, but you might want to name it on your profile)
+
+## Running Examples
+Instructions for running samples are located in the [example directory](https://github.com/sequelize/sequelize/tree/master/examples). Try these samples in a live sandbox environment:
+
+<a href="https://runnable.com/sequelize" target="_blank"><img src="https://runnable.com/external/styles/assets/runnablebtn.png"></a>
+
+## Roadmap
+
+A very basic roadmap. Chances aren't too bad, that not mentioned things are implemented as well. Don't panic :)
+
+### 1.7.0
+- ~~Check if lodash is a proper alternative to current underscore usage.~~
+- Transactions
+- Support for update of tables without primary key
+- MariaDB support
+- ~~Support for update and delete calls for whole tables without previous loading of instances~~ Implemented in [#569](https://github.com/sequelize/sequelize/pull/569) thanks to @optiltude
+- Eager loading of nested associations [#388](https://github.com/sdepold/sequelize/issues/388#issuecomment-12019099)
+- Model#delete
+- ~~Validate a model before it gets saved.~~ Implemented in [#601](https://github.com/sequelize/sequelize/pull/601), thanks to @durango
+- Move validation of enum attribute value to validate method
+- BLOB [#99](https://github.com/sequelize/sequelize/issues/99)
+- ~~Support for foreign keys~~ Implemented in [#595](https://github.com/sequelize/sequelize/pull/595), thanks to @optilude
+
+### 1.7.x
+- Complete support for non-id primary keys
+
+### 1.8.0
+- API sugar (like Model.select().where().group().include().all())
+- Schema dumping
+- ~~enum support~~
+- attributes / values of a dao instance should be scoped
+
+### 2.0.0
+- ~~save datetimes in UTC~~
+- encapsulate attributes if a dao inside the attributes property
+- ~~add getters and setters for dao~~ Implemented in [#538](https://github.com/sequelize/sequelize/pull/538), thanks to iamjochem
+- add proper error message everywhere
+
 
 ## Collaboration 2.0 ##
 
@@ -39,8 +89,8 @@ Still interested? Coolio! Here is how to get started:
 ### 1. Prepare your environment ###
 
 Here comes a little surprise: You need [Node.JS](http://nodejs.org). In order to be
-a productive developer, I would recommend the latest v0.8 (or a stable 0.9 if
-already out). Also I usually recommend [NVM](https://github.com/creationix/nvm).
+a productive developer, I would recommend the latest v0.8. Also I usually recommend
+[NVM](https://github.com/creationix/nvm).
 
 Once Node.JS is installed on your computer, you will also have access to the lovely
 Node Package Manager (NPM).
@@ -118,10 +168,78 @@ Ah and one last thing: If you think you deserve it, feel free to add yourself to
 `package.json`. Also I always look for projects which are using sequelize. If you have
 one of them, drop me a line!
 
+### 6. Some words about coding style ###
+
+As people are regularly complaining about missing semi-colons and strangely formatted
+things, I just want to explain the way I code JavaScript (including Sequelize
+... obviously). I won't reject any pull-request because of having a different code
+style than me but it would be good to have a consistent way of coding in the whole
+project. Here are my rules of thumb:
+
+- No semi-colons. Where possible I try to avoid semi-colons. Please don't discuss this topic with me. Thanks.
+- Curly braces for single line if blocks. I always add curly braces to if blocks. Same for loops and other places.
+- Spacing. Indentation = 2 spaces. Also I add a lot of spaces where possible. See below.
+- Anonymous functions over names functions. Usually I declare a function and assign it to a variable: `var foo = function() {}`
+- Variable declarations. If multiple variables are defined, I use a leading comma for separation.
+- Camelcased variable names. No underscores.
+- Make sure that key is in objects when iterating over it. See below.
+
+#### 6.1. Spaces ####
+
+Use spaces when defining functions.
+
+```js
+function(arg1, arg2, arg3) {
+  return 1
+}
+```
+
+Use spaces for if statements.
+
+```js
+if (condition) {
+  // do something
+} else {
+  // something else
+}
+```
+
+#### 6.2. Variable declarations ####
+
+```js
+var num  = 1
+  , user = new User()
+  , date = new Date()
+```
+
+#### 6.3. For-In-loops ####
+
+```js
+for (var key in obj) {
+  if (obj.hasOwnProperty(key)) {
+    console.log(obj[key])
+  }
+}
+```
+
+#### 6.4. JSHint options ####
+
+```js
+{
+  "camelcase": true,
+  "curly": true,
+  "forin": true,
+  "indent": 2,
+  "unused": true,
+  "asi": true,
+  "evil": false,
+  "laxcomma": true
+}
+```
 
 # Build status
 
 The automated tests we talk about just so much are running on
 [Travis public CI](http://travis-ci.org), here is its status:
 
-[![Build Status](https://secure.travis-ci.org/sdepold/sequelize.png)](http://travis-ci.org/sdepold/sequelize)
+[![Build Status](https://secure.travis-ci.org/sequelize/sequelize.png)](http://travis-ci.org/sequelize/sequelize)

bin/sequelize

@@ -84,7 +84,7 @@ program
   .version(packageJson.version)
   .option('-i, --init', 'Initializes the project. Creates a config/config.json')
   .option('-m, --migrate', 'Runs undone migrations')
-  .option('-u, --undo', 'Redo the last migration.')
+  .option('-u, --undo', 'Undo the last migration.')
   .option('-f, --force', 'Forces the action to be done.')
   .option('-c, --create-migration [migration-name]', 'Create a new migration skeleton file.')
   .parse(process.argv)

changelog.md

@@ -1,10 +1,42 @@
+# v1.7.0 #
+- [DEPENDENCIES] Upgraded validator for IPv6 support. [#603](https://github.com/sequelize/sequelize/pull/603). thanks to durango
+- [DEPENDENCIES] replaced underscore by lodash. [#954](https://github.com/sequelize/sequelize/pull/594). thanks to durango
+- [BUG] Fix string escape with postgresql on raw SQL queries. [#586](https://github.com/sequelize/sequelize/pull/586). thanks to zanamixx
+- [BUG] "order by" is now after "group by". [#585](https://github.com/sequelize/sequelize/pull/585). thanks to mekanics
+- [BUG] Added decimal support for min/max. [#583](https://github.com/sequelize/sequelize/pull/583). thanks to durango
+- [BUG] Null dates don't break SQLite anymore. [#572](https://github.com/sequelize/sequelize/pull/572). thanks to mweibel
+- [BUG] Correctly handle booleans in MySQL. [#608](https://github.com/sequelize/sequelize/pull/608). Thanks to terraflubb
+- [BUG] Fixed empty where conditions in MySQL. [#619](https://github.com/sequelize/sequelize/pull/619). Thanks to terraflubb
+- [BUG] Allow overriding of default columns. [#635](https://github.com/sequelize/sequelize/pull/635). Thanks to sevastos
+- [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
+- [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
+- [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
+- [FEATURE] Support for bulk insert (`<DAOFactory>.bulkCreate()`, update (`<DAOFactory>.update()`) and delete (`<DAOFactory>.destroy()`) [#569](https://github.com/sequelize/sequelize/pull/569). thanks to optilude
+- [FEATURE] Add an extra `queryOptions` parameter to `DAOFactory.find` and `DAOFactory.findAll`. This allows a user to specify `{ raw: true }`, meaning that the raw result should be returned, instead of built DAOs. Usefull for queries returning large datasets, see [#611](https://github.com/sequelize/sequelize/pull/611) janmeier
+- [FEATURE] Added convenient data types. [#616](https://github.com/sequelize/sequelize/pull/616). Thanks to Costent
+- [FEATURE] Binary is more verbose now. [#612](https://github.com/sequelize/sequelize/pull/612). Thanks to terraflubb
+- [FEATURE] Promises/A support. [#626](https://github.com/sequelize/sequelize/pull/626). Thanks to kevinbeaty
+- [FEATURE] Added Getters/Setters method for DAO. [#538](https://github.com/sequelize/sequelize/pull/538). Thanks to iamjochem
+
 # v1.6.0 #
+- [DEPENDENCIES] upgrade mysql to alpha7. You *MUST* use this version or newer for DATETIMEs to work
 - [DEPENDENCIES] upgraded most dependencies. most important: mysql was upgraded to 2.0.0-alpha-3
+- [DEPENDENCIES] mysql is now an optional dependency. #355 (thanks to clkao)
 - [REFACTORING] separated tests for dialects
+- [REFACTORING] reduced number of sql queries used for adding an element to a N:M association. #449 (thanks to innofluence/janmeier)
+- [REFACTORING] dropped support for synchronous migrations. added third parameter which needs to get called once the migration has been finished. also this adds support for asynchronous actions in migrations.
+- [OTHERS] code was formatted to fit the latest code style guidelines (thanks to durango)
+- [OTHERS] Explicitly target ./docs folder for generate-docs script. #444 (thanks to carsondarling)
+- [OTHERS] Overwrite existing daoFactoryDefinition if there already has been one. (thanks to robraux)
 - [BUG] fixed wrong version in sequelize binary
 - [BUG] local options have higher priority than global options (thanks to guersam)
 - [BUG] fixed where clause when passing an empty array (thanks to kbackowski)
-- [FEATURE] added association prefetching for find and findAll
+- [BUG] fixed updateAttributes for models/tables without primary key (thanks to durango)
+- [BUG] fixed the location of the foreign key when using belongsTo (thanks to ricardograca)
+- [BUG] don't return timestamps if only specific attributes have been seleceted (thanks to ricardograca)
+- [BUG] fixed removeColumn for sqlite
+- [BUG] fixed date equality check for instances. (thanks to solotimes)
+- [FEATURE] added association prefetching /eager loading for find and findAll. #465
 - [FEATURE] it's now possible to use callbacks of async functions inside migrations (thanks to mphilpot)
 - [FEATURE] improved comfort of sequelize.query. just pass an sql string to it and wait for the result
 - [FEATURE] Migrations now understand NODE_ENV (thanks to gavri)
@@ -17,6 +49,18 @@
 - [FEATURE] added possibility to define the attributes of received associations (thanks to joshm)
 - [FEATURE] added findOrCreate, which returns a the already existing instance or creates one (thanks to eveiga)
 - [FEATURE] minConnections option for MySQL pooling (thanks to dominiklessel)
+- [FEATURE] added BIGINT data type which is treated like a string (thanks to adamsch1)
+- [FEATURE] experimental support for read replication for mysql (thanks to Janzeh)
+- [FEATURE] allow definition of a models table name (thanks to slamkajs)
+- [FEATURE] allow usage of enums. #440 (thanks to KevinMartin)
+- [FEATURE] allows updateAttributes to target specific fields only (thanks to Pasvaz)
+- [FEATURE] timestamps are now stored as UTC. #461 (thanks to innofluence/janmeier)
+- [FEATURE] results of raw queries are parsed with dottie. #468 (thanks to kozze89)
+- [FEATURE] support for array serialization. pg only. #443 (thanks to clkao)
+- [FEATURE] add increment and decrement methods on dao. #408 (thanks to janmeier/innofluence)
+- [FEATURE] unified the result of describeTable
+- [FEATURE] add support for decimals (thanks to alexyoung)
+- [FEATURE] added DAO.reload(), which updates the attributes of the DAO in-place (as opposed to doing having to do a find() and returning a new model)
 
 # v1.5.0 #
 - [REFACTORING] use underscore functions for Utils.isHash (thanks to Mick-Hansen/innofluence)

docs/api.js

@@ -0,0 +1,18 @@
+YUI.add("yuidoc-meta", function(Y) {
+   Y.YUIDoc = { meta: {
+    "classes": [
+        "QueryInterface",
+        "Sequelize"
+    ],
+    "modules": [
+        "Sequelize"
+    ],
+    "allModules": [
+        {
+            "displayName": "Sequelize",
+            "name": "Sequelize",
+            "description": "The entry point."
+        }
+    ]
+} };
+});