summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2013-02-01 09:20:12 -0500
committerDan Prince <dprince@redhat.com>2013-02-01 10:01:16 -0500
commit4722c84fb90c51fb5810ad7b46c48230ecee1a6c (patch)
tree432dee8369e531346fd770aca4c0f733e28a8d11 /keystone
parent5bc46d861e9c8f355d2bdd68912be3e64c2dc9e9 (diff)
downloadkeystone-4722c84fb90c51fb5810ad7b46c48230ecee1a6c.tar.gz
keystone-4722c84fb90c51fb5810ad7b46c48230ecee1a6c.tar.xz
keystone-4722c84fb90c51fb5810ad7b46c48230ecee1a6c.zip
Updates migration 008 to work on PostgreSQL.
This fixes a regression in 5bc46d8 which caused migration 008 to fail when using PostgreSQL. Fixes LP Bug #1112535. Change-Id: I94f69c2dece3a5753eed3cc3cf7b63ba60208c5c
Diffstat (limited to 'keystone')
-rw-r--r--keystone/common/sql/migrate_repo/versions/008_create_default_domain.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py b/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py
index 27d4b28b..fb1da77b 100644
--- a/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py
+++ b/keystone/common/sql/migrate_repo/versions/008_create_default_domain.py
@@ -41,13 +41,8 @@ def upgrade(migrate_engine):
'on Identity API v2.'})}
session = orm.sessionmaker(bind=migrate_engine)()
-
- session.execute(
- 'INSERT INTO `%s` (%s) VALUES (%s)' % (
- domain_table.name,
- ', '.join(['`%s`' % k for k in domain.keys()]),
- ', '.join([':%s' % k for k in domain.keys()])),
- domain)
+ insert = domain_table.insert()
+ insert.execute(domain)
session.commit()
@@ -59,5 +54,5 @@ def downgrade(migrate_engine):
sql.Table('domain', meta, autoload=True)
session = orm.sessionmaker(bind=migrate_engine)()
session.execute(
- 'DELETE FROM `domain` WHERE `id`=:id', {'id': DEFAULT_DOMAIN_ID})
+ 'DELETE FROM domain WHERE id=:id', {'id': DEFAULT_DOMAIN_ID})
session.commit()