Fixing an error in sqlite schema grammar when a column's name is a ke…

…yword Fixes #32
sdispater · Dec 22, 2015 · 7b867b3 · 7b867b3
1 parent 7fa9dbe
commit 7b867b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/orator/schema/grammars/sqlite_grammar.py b/orator/schema/grammars/sqlite_grammar.py
@@ -157,7 +157,7 @@ def compile_rename_column(self, blueprint, command, connection):
         # We reinsert the data into the new table
         sql.append('INSERT INTO %s (%s) SELECT %s FROM %s'
                    % (self.wrap_table(table),
-                      ', '.join(new_column_names),
+                      self.columnize(new_column_names),
                       self.columnize(old_column_names),
                       self.wrap_table(temp_table)
                       ))
@@ -262,8 +262,8 @@ def compile_change(self, blueprint, command, connection):
         sql += new_blueprint.to_sql(None, self)
         sql.append('INSERT INTO %s (%s) SELECT %s FROM %s'
                    % (self.wrap_table(table),
-                      ', '.join(sorted(new_column_names)),
-                      self.columnize(sorted(list(map(lambda x: x.get_name(), columns)))),
+                      self.columnize(new_column_names),
+                      self.columnize(list(map(lambda x: x.get_name(), columns))),
                       self.wrap_table(temp_table)
                       ))
         sql += Blueprint(temp_table).drop().to_sql(None, self)

diff --git a/tests/schema/integrations/test_sqlite.py b/tests/schema/integrations/test_sqlite.py
@@ -37,6 +37,7 @@ def setUp(self):
             table.integer('user_id')
             table.string('name').unique()
             table.string('status').default('draft').nullable()
+            table.string('default').default(0)
             table.timestamps()
 
             table.foreign('user_id').references('id').on('users')