Be smarter about columnType.

features/autoIncrement/README.md

@@ -1,37 +1,37 @@
-Feature: autoIncrement
-======================
-
-Enable this test in `package.json` with: `"features": ["autoIncrement"]`
-
-When autoIncrement is set to true on an attribute and no value is provided for it a new unique value 
-will be assigned by the adapter before the record is created. It is guaranteed that the adapter will 
-assign a unique value not present on any existing record. The values assigned automatically will not 
-necessarily be sequential, which accommodates the use of UUIDs. If a value for the attribute is 
-present in the data provided for a new record it will be saved as-is without any guarantee of uniqueness. 
-The autoIncrement option has no effect when updating existing records.
-
-Usage on Waterline models:
-
-```
-attributes: {
-  id: {
-    type: "integer", // or "string"
-    autoIncrement: true
-  }
-}
-```
-
-## Sub-Features
-
-### autoIncrement.sequential
-
-Enable this test in `package.json` with: `"features": ["autoIncrement.sequential"]`
-
-If the adapter will provide sequential unique values, for example increasing integers, then it is 
-further guaranteed that the next value will be the last saved value plus one increment. If a value 
-is provided and is larger than the current auto-inc counter the counter will be bumped to the 
-provided value. If a provided value is less than or equal to the auto-inc counter value the 
-counter will remain unchanged, and again there will be no guaranteed that this value is unique. 
-
-This sub-feature is a special case/implementation detail of the `autoIncrement` attribute by 
-selected adapters and is not configured explicitly.  
+Feature: autoIncrement
+======================
+
+Enable this test in `package.json` with: `"features": ["autoIncrement"]`
+
+When autoIncrement is set to true on an attribute and no value is provided for it a new unique value
+will be assigned by the adapter before the record is created. It is guaranteed that the adapter will
+assign a unique value not present on any existing record. The values assigned automatically will not
+necessarily be sequential, which accommodates the use of UUIDs. If a value for the attribute is
+present in the data provided for a new record it will be saved as-is without any guarantee of uniqueness.
+The autoIncrement option has no effect when updating existing records.
+
+Usage on Waterline models:
+
+```
+attributes: {
+  id: {
+    type: 'number', // or 'string'
+    autoIncrement: true
+  }
+}
+```
+
+## Sub-Features
+
+### autoIncrement.sequential
+
+Enable this test in `package.json` with: `"features": ["autoIncrement.sequential"]`
+
+If the adapter will provide sequential unique values, for example increasing integers, then it is
+further guaranteed that the next value will be the last saved value plus one increment. If a value
+is provided and is larger than the current auto-inc counter the counter will be bumped to the
+provided value. If a provided value is less than or equal to the auto-inc counter value the
+counter will remain unchanged, and again there will be no guaranteed that this value is unique.
+
+This sub-feature is a special case/implementation detail of the `autoIncrement` attribute by
+selected adapters and is not configured explicitly.

features/autoIncrement/support/autoInc.fixture.js

@@ -16,29 +16,29 @@ module.exports = function() {
       name: {
         type: 'string',
         autoMigrations: {
-          columnType: 'varchar'          
+          columnType: 'varchar'
         }
       },
       normalField: {
         type: 'number',
         autoMigrations: {
-          columnType: 'integer'          
+          columnType: '_number'
         }
       },
       type: {
         type: 'string',
         autoMigrations: {
-          columnType: 'varchar'          
-        }        
+          columnType: 'varchar'
+        }
       },
       id: {
         type: 'number',
         autoMigrations: {
           autoIncrement: true,
-          columnType: 'integer'
+          columnType: '_numberkey'
         }
       }
     }
 
   });
-};
+};

features/compositePrimaryKey/support/fixture.js

@@ -10,7 +10,7 @@ module.exports = Waterline.Collection.extend({
   attributes: {
     name: 'string',
     pkOne: {
-      type: 'integer',
+      type: 'number',
       primaryKey: true
     },
 

features/crossAdapter/support/fixtures/hasMany.child.fixture.js

@@ -11,7 +11,7 @@ module.exports = Waterline.Collection.extend({
   connection: 'associations2',
 
   attributes: {
-    amount: 'integer',
+    amount: 'number',
     type: 'string',
     apartment: {
       model: 'apartment',

features/crossAdapter/support/fixtures/manyToMany.taxi.fixture.js

@@ -12,7 +12,7 @@ module.exports = Waterline.Collection.extend({
 
   // migrate: 'drop',
   attributes: {
-    medallion: 'integer',
+    medallion: 'number',
     model: 'string',
     drivers: {
       collection: 'driver',

features/unique/support/unique.fixture.js

@@ -18,8 +18,8 @@ module.exports = Waterline.Collection.extend({
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true,
       }
     },

interfaces/associations/support/bootstrap.js

@@ -50,7 +50,7 @@ var defaults = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
         autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }

interfaces/associations/support/fixtures/belongsTo.child.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/belongsTo.parent.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/hasMany.child.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/hasMany.parent.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/hasManyThrough.stadium.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/hasManyThrough.team.fixture.js

@@ -7,15 +7,15 @@ module.exports = {
   fetchRecordsOnDestroy: false,
   fetchRecordsOnCreate: true,
   fetchRecordsOnCreateEach: true,
-  
+
   attributes: {
     // Primary Key
     id: {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/hasManyThrough.venue.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/manyToMany.driver.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },
@@ -37,7 +37,7 @@ module.exports = {
       type: 'json',
       autoMigrations: {
         columnType: 'json',
-      }      
+      }
     },
 
     // Timestamps

interfaces/associations/support/fixtures/manyToMany.driver.withSchema.fixture.js

@@ -18,8 +18,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/manyToMany.taxi.fixture.js

@@ -14,8 +14,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/manyToMany.taxi.withSchema.fixture.js

@@ -19,8 +19,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/multipleAssociations.fixture.js

@@ -14,8 +14,8 @@ module.exports.payment = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },
@@ -86,8 +86,8 @@ module.exports.customer = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/associations/support/fixtures/oneToOne.fixture.js

@@ -14,8 +14,8 @@ module.exports.user_resource = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },
@@ -78,8 +78,8 @@ module.exports.profile = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }
     },

interfaces/migratable/support/bootstrap.js

@@ -33,7 +33,7 @@ var defaults = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
         autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true
       }

interfaces/migratable/support/fixtures/alter.fixture.js

@@ -15,8 +15,8 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true,
       }
     },

interfaces/migratable/support/fixtures/create.fixture.js

@@ -14,12 +14,12 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true,
       }
     },
-    
+
     name: {
       type: 'string',
       autoMigrations: {

interfaces/migratable/support/fixtures/custom.fixture.js

@@ -14,12 +14,12 @@ module.exports = {
       type: Adapter.identity === 'sails-mongo' ? 'string' : 'number',
       columnName: '_id',
       autoMigrations: {
-        columnType: 'integer',
-        autoIncrement: true,
+        columnType: Adapter.identity === 'sails-mongo' ? '_stringkey' : '_numberkey',
+        autoIncrement: Adapter.identity === 'sails-mongo' ? false : true,
         unique: true,
       }
     },
-    
+
     name: {
       type: 'string',
       columnName: 'nameColumn',