Fixed knex knex#1577

Aslo corrected tests for primarykey
statyan · Jul 13, 2016 · c6d5897 · c6d5897
1 parent 4f28c99
commit c6d5897
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 18 deletions.
diff --git a/src/dialects/mssql/schema/columncompiler.js b/src/dialects/mssql/schema/columncompiler.js
@@ -25,16 +25,21 @@ assign(ColumnCompiler_MSSQL.prototype, {
   bigint: 'bigint',
 
   double(precision, scale) {
-    if (!precision) return 'double'
-    return `double(${this._num(precision, 8)}, ${this._num(scale, 2)})`
+    if (!precision) return 'decimal'
+    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`
+  },
+
+  floating(precision, scale) {
+    if (!precision) return 'decimal'
+    return `decimal(${this._num(precision, 8)}, ${this._num(scale, 2)})`
   },
 
   integer(length) {
     length = length ? `(${this._num(length, 11)})` : ''
     return `int${length}`
   },
 
-  mediumint: 'mediumint',
+  mediumint: 'int',
 
   smallint: 'smallint',
 
@@ -62,7 +67,10 @@ assign(ColumnCompiler_MSSQL.prototype, {
   timestamp: 'datetime',
 
   bit(length) {
-    return length ? `bit(${this._num(length)})` : 'bit'
+    if (length > 1) {
+      helpers.warn('Bit field is exactly 1 bit length for MSSQL');
+    }
+    return 'bit';
   },
 
   binary(length) {
@@ -83,11 +91,13 @@ assign(ColumnCompiler_MSSQL.prototype, {
   },
 
   first() {
-    return 'first'
+    helpers.warn('Column first modifier not available for MSSQL');
+    return '';
   },
 
   after(column) {
-    return `after ${this.formatter.wrap(column)}`
+    helpers.warn('Column after modifier not available for MSSQL');
+    return '';
   },
 
   comment(comment) {

diff --git a/src/dialects/mssql/schema/tablecompiler.js b/src/dialects/mssql/schema/tablecompiler.js
@@ -104,7 +104,7 @@ assign(TableCompiler_MSSQL.prototype, {
   },
 
   primary (columns, constraintName) {
-    constraintName = constraintName ? this.formatter.wrap(constraintName) : this._indexCommand('primary', this.tableNameRaw, columns);
+    constraintName = constraintName ? this.formatter.wrap(constraintName) : this.formatter.wrap(`${this.tableNameRaw}_pkey`);
     if (!this.forCreate) {
       this.pushQuery(`ALTER TABLE ${this.tableName()} ADD CONSTRAINT ${constraintName} PRIMARY KEY (${this.formatter.columnize(columns)})`);
     } else {
@@ -134,8 +134,9 @@ assign(TableCompiler_MSSQL.prototype, {
   },
 
   // Compile a drop primary key command.
-  dropPrimary () {
-    this.pushQuery(`ALTER TABLE ${this.tableName()} DROP PRIMARY KEY`);
+  dropPrimary (constraintName) {
+    constraintName = constraintName ? this.formatter.wrap(constraintName) : this.formatter.wrap(`${this.tableNameRaw}_pkey`);
+    this.pushQuery(`ALTER TABLE ${this.tableName()} DROP CONSTRAINT ${constraintName}`);
   },
 
   // Compile a drop unique key command.

diff --git a/test/integration/schema/index.js b/test/integration/schema/index.js
@@ -480,7 +480,7 @@ module.exports = function(knex) {
         .then(function() {
             return tr.schema.createTable(tableName, function(table) {
               table.string('test').primary(constraintName);
-              table.string('test2');
+              table.string('test2').notNullable();
             })
           })
           .then(function() {

diff --git a/test/unit/schema/mssql.js b/test/unit/schema/mssql.js
@@ -76,11 +76,11 @@ describe("MSSQL SchemaBuilder", function() {
 
   it('test drop primary', function() {
     tableSql = client.schemaBuilder().table('users', function() {
-      this.dropPrimary();
+      this.dropPrimary('testconstraintname');
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP PRIMARY KEY');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] DROP CONSTRAINT [testconstraintname]');
   });
 
   it('test drop unique', function() {
@@ -224,7 +224,7 @@ describe("MSSQL SchemaBuilder", function() {
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [name] nvarchar(255) after [foo]');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [name] nvarchar(255)');
   });
 
   it('test adding column on the first place', function() {
@@ -233,7 +233,7 @@ describe("MSSQL SchemaBuilder", function() {
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [first_name] nvarchar(255) first');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [first_name] nvarchar(255)');
   });
 
   it('test adding string', function() {
@@ -304,7 +304,7 @@ describe("MSSQL SchemaBuilder", function() {
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] mediumint');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] int');
   });
 
   it('test adding small integer', function() {
@@ -331,7 +331,7 @@ describe("MSSQL SchemaBuilder", function() {
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] float(5, 2)');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] decimal(5, 2)');
   });
 
   it('test adding double', function() {
@@ -340,7 +340,7 @@ describe("MSSQL SchemaBuilder", function() {
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] double');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] decimal');
   });
 
   it('test adding double specifying precision', function() {
@@ -349,7 +349,7 @@ describe("MSSQL SchemaBuilder", function() {
     }).toSQL();
 
     equal(1, tableSql.length);
-    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] double(15, 8)');
+    expect(tableSql[0].sql).to.equal('ALTER TABLE [users] ADD [foo] decimal(15, 8)');
   });
 
   it('test adding decimal', function() {