summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuan HE <ruan.he@orange.com>2015-09-16 14:11:54 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-09-16 14:11:54 +0000
commiteaffb0e85c81325387e21f47195a679b63215a83 (patch)
treefcbf1ba3e5d97575ef03eff68678bb5818cef591
parentf1b6eb75976f1ee00e7af649634f6fa31cddf2ad (diff)
parent1c3a5e37210fd9ce7d50fbe2458e468869374109 (diff)
Merge "Fix a bug in object_assignments SQL table."
-rw-r--r--keystone-moon/keystone/contrib/moon/migrate_repo/versions/001_moon.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone-moon/keystone/contrib/moon/migrate_repo/versions/001_moon.py b/keystone-moon/keystone/contrib/moon/migrate_repo/versions/001_moon.py
index c4d57324..b9b981cf 100644
--- a/keystone-moon/keystone/contrib/moon/migrate_repo/versions/001_moon.py
+++ b/keystone-moon/keystone/contrib/moon/migrate_repo/versions/001_moon.py
@@ -138,7 +138,7 @@ def upgrade(migrate_engine):
'object_assignments',
meta,
sql.Column('id', sql.String(64), primary_key=True),
- sql.Column('object_assignments', k_sql.JsonBlob(), nullable=True),
+ sql.Column('object_assignment', k_sql.JsonBlob(), nullable=True),
sql.Column('intra_extension_id', sql.ForeignKey("intra_extensions.id"), nullable=False),
sql.Column('object_id', sql.ForeignKey("objects.id"), nullable=False),
sql.Column('object_category_id', sql.ForeignKey("object_categories.id"), nullable=False),