diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-10 19:59:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-10 19:59:08 +0000 |
| commit | d6c0f5dc4cbaab72c1accbcc3e04c44bc9623a39 (patch) | |
| tree | 4c0227efb940ab6cce81ef6d47a04c51ac1c0348 /nova | |
| parent | e3911801f6814ebc8aeed1e6b4284fbfb2e74192 (diff) | |
| parent | 32f84e93638a071707f66e39f2d99e8f3007d998 (diff) | |
Merge "Fix whitespace in sqlite steps."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_downgrade.sql | 26 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_upgrade.sql | 24 |
2 files changed, 25 insertions, 25 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_downgrade.sql b/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_downgrade.sql index 8a0b4938e..50f260549 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_downgrade.sql +++ b/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_downgrade.sql @@ -8,9 +8,9 @@ BEGIN TRANSACTION; instance_name VARCHAR(255), instance_id INTEGER NOT NULL, instance_uuid VARCHAR(36), - password VARCHAR(255), - port INTEGER, - pool_id INTEGER, + password VARCHAR(255), + port INTEGER, + pool_id INTEGER, PRIMARY KEY (id) ); @@ -21,11 +21,11 @@ BEGIN TRANSACTION; deleted, id, instance_name, - NULL, + NULL, instance_uuid, - password, - port, - pool_id + password, + port, + pool_id FROM consoles; UPDATE consoles_backup @@ -45,9 +45,9 @@ BEGIN TRANSACTION; id INTEGER NOT NULL, instance_name VARCHAR(255), instance_id INTEGER NOT NULL, - password VARCHAR(255), - port INTEGER, - pool_id INTEGER, + password VARCHAR(255), + port INTEGER, + pool_id INTEGER, PRIMARY KEY (id), FOREIGN KEY(instance_id) REFERENCES instances (id) ); @@ -62,9 +62,9 @@ BEGIN TRANSACTION; id, instance_name, instance_id, - password, - port, - pool_id + password, + port, + pool_id FROM consoles_backup; DROP TABLE consoles_backup; diff --git a/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_upgrade.sql b/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_upgrade.sql index 3e2db86a9..ef48162bc 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_upgrade.sql +++ b/nova/db/sqlalchemy/migrate_repo/versions/102_sqlite_upgrade.sql @@ -8,9 +8,9 @@ BEGIN TRANSACTION; instance_name VARCHAR(255), instance_id INTEGER NOT NULL, instance_uuid VARCHAR(36), - password VARCHAR(255), - port INTEGER, - pool_id INTEGER, + password VARCHAR(255), + port INTEGER, + pool_id INTEGER, PRIMARY KEY (id) ); @@ -23,9 +23,9 @@ BEGIN TRANSACTION; instance_name, instance_id, NULL, - password, - port, - pool_id + password, + port, + pool_id FROM consoles; UPDATE consoles_backup @@ -45,9 +45,9 @@ BEGIN TRANSACTION; id INTEGER NOT NULL, instance_name VARCHAR(255), instance_uuid VARCHAR(36), - password VARCHAR(255), - port INTEGER, - pool_id INTEGER, + password VARCHAR(255), + port INTEGER, + pool_id INTEGER, PRIMARY KEY (id), FOREIGN KEY(instance_uuid) REFERENCES instances (uuid) ); @@ -62,9 +62,9 @@ BEGIN TRANSACTION; id, instance_name, instance_uuid, - password, - port, - pool_id + password, + port, + pool_id FROM consoles_backup; DROP TABLE consoles_backup; |