openstack/deb-migrate
Code Issues Proposed changes

Merge "Use native sqlalchemy 0.9 quote attribute with ibmdb2"

Browse Source
This commit is contained in:
Jenkins 2015-01-10 00:03:23 +00:00 committed by Gerrit Code Review
commit 397682b9c8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migrate/changeset/databases/ibmdb2.py
View File

@ -14,6 +14,7 @@ from sqlalchemy.schema import (Index,
from migrate.changeset import ansisql from migrate.changeset import ansisql
from migrate.changeset import constraint from migrate.changeset import constraint
from migrate.changeset import util
from migrate import exceptions from migrate import exceptions
@ -107,7 +108,8 @@ class IBMDBSchemaChanger(IBMDBSchemaGenerator, ansisql.ANSISchemaChanger):
"""Rename a table; #38. Other ops aren't supported.""" """Rename a table; #38. Other ops aren't supported."""
self._rename_table(table) self._rename_table(table)
self.append("TO %s" % self.preparer.quote(table.new_name, table.quote)) q = util.safe_quote(table)
self.append("TO %s" % self.preparer.quote(table.new_name, q))
self.execute() self.execute()
self.append("COMMIT") self.append("COMMIT")
self.execute() self.execute()
@ -128,10 +130,11 @@ class IBMDBSchemaChanger(IBMDBSchemaGenerator, ansisql.ANSISchemaChanger):
def _run_subvisit(self, delta, func, start_alter=True): def _run_subvisit(self, delta, func, start_alter=True):
"""Runs visit method based on what needs to be changed on column""" """Runs visit method based on what needs to be changed on column"""
table = delta.table table = delta.table
q = util.safe_quote(table)
if start_alter: if start_alter:
self.start_alter_table(table) self.start_alter_table(table)
ret = func(table, ret = func(table,
self.preparer.quote(delta.current_name, delta.quote), self.preparer.quote(delta.current_name, q),
delta) delta)
self.execute() self.execute()
self._reorg_table(self.preparer.format_table(delta.table)) self._reorg_table(self.preparer.format_table(delta.table))