[knex#3033] fix: restrict hasColumn test to sqlite and mysql, add mysql

elunic · Feb 8, 2019 · 350ff63 · 350ff63
1 parent 85f998e
commit 350ff63
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/src/dialects/mysql/schema/compiler.js b/src/dialects/mysql/schema/compiler.js
@@ -3,7 +3,7 @@
 import inherits from 'inherits';
 import SchemaCompiler from '../../../schema/compiler';
 
-import { assign } from 'lodash';
+import { assign, some } from 'lodash';
 
 function SchemaCompiler_MySQL(client, builder) {
   SchemaCompiler.call(this, client, builder);
@@ -44,12 +44,14 @@ assign(SchemaCompiler_MySQL.prototype, {
   // Check whether a column exists on the schema.
   hasColumn(tableName, column) {
     this.pushQuery({
-      sql:
-        `show columns from ${this.formatter.wrap(tableName)}` +
-        ' like ' +
-        this.formatter.parameter(column),
+      sql: `show columns from ${this.formatter.wrap(tableName)}`,
       output(resp) {
-        return resp.length > 0;
+        return some(resp, (row) => {
+          return (
+            this.client.wrapIdentifier(row.Field) ===
+            this.client.wrapIdentifier(column)
+          );
+        });
       },
     });
   },

diff --git a/test/integration/schema/index.js b/test/integration/schema/index.js
@@ -930,22 +930,35 @@ module.exports = function(knex) {
       });
 
       describe('using snakeCaseMappers', function() {
-        beforeEach(function() {
-          knex.client.config.postProcessResponse = postProcessResponse;
-          knex.client.config.wrapIdentifier = wrapIdentifier;
-        });
+        describe('sqlite and mysql only', function() {
+          if (
+            !knex ||
+            !knex.client ||
+            !(
+              /sqlite3/i.test(knex.client.driverName) ||
+              /mysql/i.test(knex.client.driverName)
+            )
+          ) {
+            return Promise.resolve();
+          }
 
-        afterEach(function() {
-          knex.client.config.postProcessResponse = null;
-          knex.client.config.wrapIdentifier = null;
-        });
+          beforeEach(function() {
+            knex.client.config.postProcessResponse = postProcessResponse;
+            knex.client.config.wrapIdentifier = wrapIdentifier;
+          });
 
-        it('checks whether a column exists, resolving with a boolean', function() {
-          return knex.schema
-            .hasColumn('accounts', 'firstName')
-            .then(function(exists) {
-              expect(exists).to.equal(true);
-            });
+          afterEach(function() {
+            knex.client.config.postProcessResponse = null;
+            knex.client.config.wrapIdentifier = null;
+          });
+
+          it('checks whether a column exists, resolving with a boolean', function() {
+            return knex.schema
+              .hasColumn('accounts', 'firstName')
+              .then(function(exists) {
+                expect(exists).to.equal(true);
+              });
+          });
         });
       });
     });