fix(sqlite/querygenerator): quote attributes in alterConstraint and r…

…enameColumn queries for sqlite (Closes sequelize#7759)
guyguyon · Jul 6, 2017 · a7f18ba · a7f18ba
1 parent 5c4ce94
commit a7f18ba
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/lib/dialects/sqlite/query-generator.js b/lib/dialects/sqlite/query-generator.js
@@ -386,7 +386,7 @@ const QueryGenerator = {
 
     const quotedTableName = this.quoteTable(tableName);
     const quotedBackupTableName = this.quoteTable(backupTableName);
-    const attributeNames = Object.keys(attributes).join(', ');
+    const attributeNames = Object.keys(attributes).map(attr => this.quoteIdentifier(attr)).join(', ');
 
     return this.createTableQuery(backupTableName, attributes).replace('CREATE TABLE', 'CREATE TEMPORARY TABLE')
       + `INSERT INTO ${quotedBackupTableName} SELECT ${attributeNames} FROM ${quotedTableName};`
@@ -411,7 +411,7 @@ const QueryGenerator = {
     }
     const quotedTableName = this.quoteTable(tableName);
     const quotedBackupTableName = this.quoteTable(backupTableName);
-    const attributeNames = Object.keys(attributes).join(', ');
+    const attributeNames = Object.keys(attributes).map(attr => this.quoteIdentifier(attr)).join(', ');
 
     return createTableSql.replace(`CREATE TABLE ${quotedTableName}`, `CREATE TABLE ${quotedBackupTableName}`)
       + `INSERT INTO ${quotedBackupTableName} SELECT ${attributeNames} FROM ${quotedTableName};`

diff --git a/test/unit/dialects/sqlite/query-generator.test.js b/test/unit/dialects/sqlite/query-generator.test.js
@@ -502,6 +502,32 @@ if (dialect === 'sqlite') {
           expectation: "UPDATE `myTable` SET `bar`=`foo` WHERE `name` = 'foo'",
           needsSequelize: true
         }
+      ],
+      renameColumnQuery: [
+        {
+          title: 'Properly quotes column names',
+          arguments: ['myTable', 'foo', 'commit', {commit: 'VARCHAR(255)', bar: 'VARCHAR(255)'}],
+          expectation:
+            'CREATE TEMPORARY TABLE IF NOT EXISTS `myTable_backup` (`commit` VARCHAR(255), `bar` VARCHAR(255));' +
+            'INSERT INTO `myTable_backup` SELECT `foo` AS `commit`, `bar` FROM `myTable`;' +
+            'DROP TABLE `myTable`;' +
+            'CREATE TABLE IF NOT EXISTS `myTable` (`commit` VARCHAR(255), `bar` VARCHAR(255));' +
+            'INSERT INTO `myTable` SELECT `commit`, `bar` FROM `myTable_backup`;' +
+            'DROP TABLE `myTable_backup`;'
+        }
+      ],
+      removeColumnQuery: [
+        {
+          title: 'Properly quotes column names',
+          arguments: ['myTable', {commit: 'VARCHAR(255)', bar: 'VARCHAR(255)'}],
+          expectation:
+            'CREATE TEMPORARY TABLE IF NOT EXISTS `myTable_backup` (`commit` VARCHAR(255), `bar` VARCHAR(255));' +
+            'INSERT INTO `myTable_backup` SELECT `commit`, `bar` FROM `myTable`;' +
+            'DROP TABLE `myTable`;' +
+            'CREATE TABLE IF NOT EXISTS `myTable` (`commit` VARCHAR(255), `bar` VARCHAR(255));' +
+            'INSERT INTO `myTable` SELECT `commit`, `bar` FROM `myTable_backup`;' +
+            'DROP TABLE `myTable_backup`;'
+        }
       ]
     };