diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-04 17:07:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-04 17:07:33 +0000 |
| commit | 57a2e6523390c4305b5c2ce26268ebe74a2f25ff (patch) | |
| tree | fd6656d8b85327a0d99fe40c6d2848e5f87e749a | |
| parent | 7d8231a58c469b7540ee134a3fe5af0601d306ed (diff) | |
| parent | 3e09b7cd9020384ab488b5fdef8fa77244e2acb5 (diff) | |
Merge "Default auto-increment for int primary key columns"
| -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), |