collections: fix for updating records.

fahad19 · Aug 22, 2015 · 7b0fc93 · 7b0fc93
1 parent 1e06b47
commit 7b0fc93
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1307,6 +1307,8 @@ $ npm test
 
 # Changelog
 
+* v0.2.1
+  * Fix for updating records
 * [`v0.2.0`](https://github.com/fahad19/firenze/compare/v0.1.5...v0.2.0):
   * Model classes are now optional, as configuration has moved to Collection level.
   * Model classes cannot be created via Database instance any more
@@ -1334,6 +1336,7 @@ To publish a new release:
 * Update `package.json` and `bower.json` with version number.
 * Run:
   * `npm run docs`
+  * `npm run test`
   * `npm run dist`
 * Commit the changes.
 * Run `npm publish .`

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "firenze",
   "main": "dist/firenze.full.min.js",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "homepage": "https://github.com/fahad19/firenze",
   "authors": [
     "Fahad Ibnay Heylaal"

diff --git a/dist/firenze.full.js b/dist/firenze.full.js
@@ -13592,7 +13592,7 @@ this["firenze"] =
 
 	          q = _this9.query({
 	            alias: false,
-	            conditions: _defineProperty({}, model.primaryKey, model.getId())
+	            conditions: _defineProperty({}, _this9.primaryKey, model.getId())
 	          });
 	          promise = _this9.getAdapter().update(q, obj);
 	        }

diff --git a/dist/firenze.full.min.js b/dist/firenze.full.min.js
diff --git a/dist/firenze.js b/dist/firenze.js
@@ -1340,7 +1340,7 @@ this["firenze"] =
 
 	          q = _this9.query({
 	            alias: false,
-	            conditions: _defineProperty({}, model.primaryKey, model.getId())
+	            conditions: _defineProperty({}, _this9.primaryKey, model.getId())
 	          });
 	          promise = _this9.getAdapter().update(q, obj);
 	        }

diff --git a/dist/firenze.min.js b/dist/firenze.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firenze",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "ORM for relational databases.",
   "main": "index.js",
   "scripts": {

diff --git a/src/Collection.js b/src/Collection.js
@@ -977,7 +977,7 @@ export default class Collection {
         q = this.query({
           alias: false,
           conditions: {
-            [model.primaryKey]: model.getId()
+            [this.primaryKey]: model.getId()
           }
         });
         promise = this