From 69f736a51a26ab9a343000a1b2bf6e465f7e8c9c Mon Sep 17 00:00:00 2001 From: Alexey Zankevich Date: Tue, 14 Jul 2015 22:58:52 +0300 Subject: [PATCH] fixed unquoted columns in index and constraints generation --- mysql2pgsql/lib/postgres_writer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql2pgsql/lib/postgres_writer.py b/mysql2pgsql/lib/postgres_writer.py index 2c2470a..0e4275f 100644 --- a/mysql2pgsql/lib/postgres_writer.py +++ b/mysql2pgsql/lib/postgres_writer.py @@ -195,7 +195,7 @@ def write_indexes(self, table): index_sql.append('ALTER TABLE "%(table_name)s" ADD CONSTRAINT "%(index_name)s_pkey" PRIMARY KEY(%(column_names)s);' % { 'table_name': table.name, 'index_name': '%s_%s' % (table.name, '_'.join(re.sub('[\W]+', '', c) for c in primary_index[0]['columns'])), - 'column_names': ', '.join('%s' % col for col in primary_index[0]['columns']), + 'column_names': ', '.join('"%s"' % col for col in primary_index[0]['columns']), }) for index in table.indexes: if 'primary' in index: @@ -209,14 +209,13 @@ def write_indexes(self, table): 'table_name': table.name, 'column_names': ', '.join('"%s"' % col for col in index['columns']), }) - return index_sql def write_constraints(self, table): constraint_sql = [] for key in table.foreign_keys: constraint_sql.append("""ALTER TABLE "%(table_name)s" ADD FOREIGN KEY ("%(column_name)s") - REFERENCES "%(ref_table_name)s"(%(ref_column_name)s);""" % { + REFERENCES "%(ref_table_name)s"("%(ref_column_name)s");""" % { 'table_name': table.name, 'column_name': key['column'], 'ref_table_name': key['ref_table'],