Release/1.6.10-mod (#5)

Release/1.6.10-mod

Author: falkenhawk

.travis.yml

@@ -35,4 +35,4 @@ addons:
   postgresql: '9.5'
 
 services:
-  - mysql
+  - mysql

doc/.vuepress/config.js

@@ -5,7 +5,7 @@ module.exports = {
 
   themeConfig: {
     repo: 'vincit/objection.js',
-    repoLabel: 'Github',
+    repoLabel: 'GitHub',
 
     algolia: {
       apiKey: '8b9b4ac9f68d11c702e8102479760861',

doc/api/objection/README.md

@@ -297,15 +297,17 @@ For older nodes:
 const Knex = require('knex');
 const knexSnakeCaseMappers = require('objection').knexSnakeCaseMappers;
 
-const knex = Knex(Object.assign({
+const knex = Knex({
   client: 'postgres',
 
   connection: {
     host: '127.0.0.1',
     user: 'objection',
     database: 'objection_test'
-  }
-}, knexSnakeCaseMappers()));
+  },
+
+  ...knexSnakeCaseMappers()
+});
 ```
 
 ## knexIdentifierMapping
@@ -381,19 +383,21 @@ For older nodes:
 const Knex = require('knex');
 const knexIdentifierMapping = require('objection').knexIdentifierMapping;
 
-const knex = Knex(Object.assign({
+const knex = Knex({
   client: 'postgres',
 
   connection: {
     host: '127.0.0.1',
     user: 'objection',
     database: 'objection_test'
-  }
-}, knexIdentifierMapping({
-  MyId: 'id',
-  MyProp: 'prop',
-  MyAnotherProp: 'anotherProp'
-})));
+  },
+
+  ...knexIdentifierMapping({
+    MyId: 'id',
+    MyProp: 'prop',
+    MyAnotherProp: 'anotherProp'
+  })
+});
 ```
 
 ## ValidationError

doc/api/query-builder/find-methods.md

@@ -737,6 +737,8 @@ Type|Description
 
 See [knex documentation](http://knexjs.org/#Builder-count)
 
+Also see the [resultSize](/api/query-builder/other-methods.md#resultsize) method for a cleaner way to just get the number of rows a query would create.
+
 ##### Return value
 
 Type|Description

doc/api/query-builder/other-methods.md

@@ -947,13 +947,15 @@ Type|Description
 const promise = queryBuilder.resultSize();
 ```
 
-Returns the amount of rows the current query would produce without [limit](/api/query-builder/find-methods.html#limit) and [offset](/api/query-builder/find-methods.html#offset) applied. Note that this executes a query (not the one we are building) and returns a Promise.
+Returns the amount of rows the current query would produce without [limit](/api/query-builder/find-methods.html#limit) and [offset](/api/query-builder/find-methods.html#offset) applied. Note that this executes a copy of the query and returns a Promise.
+
+This method is often more convenient than `count` which returns an array of objects instead a single number.
 
 ##### Return value
 
 Type|Description
 ----|-----------------------------
-`Promise`|Promise the will be resolved with the result size.
+`Promise<number>`|Promise the will be resolved with the result size.
 
 ##### Examples
 

doc/changelog/README.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.10
+
+  * Fixes [#1455](https://github.com/Vincit/objection.js/issues/1455)
+
 ## 1.6.9
 
   * Revert fix for [#1089](https://github.com/Vincit/objection.js/issues/1089). It was causing more bugs than it fixed. #1089 will be addressed in 2.0.

doc/guide/query-examples.md

@@ -710,7 +710,7 @@ await Person
   }]);
 ```
 
-The query above will insert a pet named `I am the dog of Jennifer whose id is 523` for Jennifer. If `#ref{}` is used within a string, the references are replaced with the referred values inside the string. If the reference string contains nothing but the reference, the referred value is copied to it's place preserving its type.
+The query above will insert a pet named `I am the dog of Jennifer whose id is 523` for Jennifer. If `#ref{}` is used within a string, the references are replaced with the referred values inside the string. If the reference string contains nothing but the reference, the referred value is copied to its place preserving its type.
 
 Existing rows can be related to newly inserted rows by using the `relate` option. `relate` can be `true` in which case all models in the graph that have an identifier get related. `relate` can also be an array of relation paths like `['children', 'children.movies.actors']` in which case only objects in those paths get related even if they have an idetifier.
 

doc/recipes/extra-properties.md

@@ -1,6 +1,6 @@
 # Join table extra properties
 
-Sometimes when you have a many-to-many relationship, you want to store some properties in the join (pivot) table and still join them with the related objects. In objection, these proerties can be defined as `extra` properties of many-to-many relationship.
+Sometimes when you have a many-to-many relationship, you want to store some properties in the join (pivot) table and still join them with the related objects. In objection, these properties can be defined as `extra` properties of many-to-many relationship.
 
 Let's consider a schema like this:
 

doc/recipes/returning-tricks.md

@@ -50,7 +50,7 @@ const deletedJennifers = await Person
   .where({firstName: 'Jennifer'})
   .returning('*');
 
-console.log(deletedJennifers.length); // However many Jennifers there were
+console.log(deletedJennifers.length); // How many Jennifers there were
 console.log(deletedJennifers[0].lastName); // Maybe "Lawrence"
 ```
 
@@ -63,6 +63,6 @@ const jennsDeletedDogs = await jennifer
   .where({'species': 'dog'})
   .returning('*');
 
-console.log(jennsDeletedDogs.length); // However many dogs Jennifer had
+console.log(jennsDeletedDogs.length); // How many dogs Jennifer had
 console.log(jennsDeletedDogs[0].name); // Maybe "Fido"
 ```

lib/model/modelColPropMap.js

@@ -12,7 +12,7 @@ function columnNameToPropertyName(modelClass, columnName) {
   const props = Object.keys(model.$parseDatabaseJson(row));
   const propertyName = difference(props, addedProps)[0];
 
-  return propertyName || null;
+  return propertyName || columnName;
 }
 
 function propertyNameToColumnName(modelClass, propertyName) {
@@ -25,7 +25,7 @@ function propertyNameToColumnName(modelClass, propertyName) {
   const cols = Object.keys(model.$formatDatabaseJson(obj));
   const columnName = difference(cols, addedCols)[0];
 
-  return columnName || null;
+  return columnName || propertyName;
 }
 
 module.exports = {