diff options
| author | Eoghan Glynn <eglynn@redhat.com> | 2012-05-04 16:03:00 +0100 |
|---|---|---|
| committer | Eoghan Glynn <eglynn@redhat.com> | 2012-05-04 17:39:35 +0100 |
| commit | 3e09b7cd9020384ab488b5fdef8fa77244e2acb5 (patch) | |
| tree | f1cf3b0db70e85a3accc30ac8172079e54996179 | |
| parent | 6dc62775d77c9879fa40e275811715004e7d9fae (diff) | |
| download | nova-3e09b7cd9020384ab488b5fdef8fa77244e2acb5.tar.gz nova-3e09b7cd9020384ab488b5fdef8fa77244e2acb5.tar.xz nova-3e09b7cd9020384ab488b5fdef8fa77244e2acb5.zip | |
Default auto-increment for int primary key columns
Consistently rely on the default auto-increment flag for integral
primary key columns (rather than being explicit in some cases and
implicit elsewhere).
Change-Id: I5da89b286b199b0ddb709ca882699e9419ec68e0
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/082_essex.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py index f4eab7e77..6dfd9a960 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/082_essex.py @@ -11,6 +11,9 @@ FLAGS = flags.FLAGS LOG = logging.getLogger(__name__) +# Note on the autoincrement flag: this is defaulted for primary key columns +# of integral type, so is no longer set explicitly in such cases. + def _populate_instance_types(instance_types_table): if FLAGS.connection_type == "libvirt": default_inst_types = { @@ -98,8 +101,7 @@ def upgrade(migrate_engine): Column('updated_at', DateTime), Column('deleted_at', DateTime), Column('deleted', Boolean), - Column('id', Integer, primary_key=True, nullable=False, - autoincrement=True), + Column('id', Integer, primary_key=True, nullable=False), Column('name', String(length=255), unique=True), Column('operational_state', String(length=255), nullable=False), Column('availability_zone', String(length=255), nullable=False), @@ -127,8 +129,7 @@ def upgrade(migrate_engine): Column('updated_at', DateTime), Column('deleted_at', DateTime), Column('deleted', Boolean), - Column('id', Integer, primary_key=True, autoincrement=True, - nullable=False), + Column('id', Integer, primary_key=True, nullable=False), Column('instance_id', Integer, ForeignKey('instances.id'), nullable=False), Column('device_name', String(length=255), nullable=False), |