SQL scripts should not manage transactions

Cinder SQL scripts assume too much about the environment and the way in
which they are executed by sqlalchemy-migrate. Particularly, they manage
transactions on their own even though sqlalchemy-migrate do it itself,
plus it assumes that scripts are executed in one go (even though
standard Python DB-API 2.0 does not mention multi-statement SQL commands
to be executed on DB cursors.

blueprint enable-mysql-connector

Change-Id: I10c58b3af75d3ab9153a8bbd2a539bf1577de328
Closes-Bug: 1368391

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql b/cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql
index c34f31752fb27a252866c448295874643d56b8fd..51dd54f7e513052a3335403d0cb597b7d3c3787b 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/005_sqlite_downgrade.sql
@@ -1,5 +1,3 @@
-BEGIN TRANSACTION;
-
 CREATE TEMPORARY TABLE volumes_backup (
     created_at DATETIME,
     updated_at DATETIME,
@@ -121,4 +119,3 @@ INSERT INTO volumes
     FROM volumes_backup;
 
 DROP TABLE volumes_backup;
-COMMIT;

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql b/cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql
index d2fe9b693050b6216a95ef9b8b12a6e2b6fa9719..5c73a1c6dcb012fd0013cb4562bad92c8681fddd 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/007_sqlite_downgrade.sql
@@ -1,8 +1,6 @@
 -- As sqlite does not support the DROP FOREIGN KEY, we need to create
 -- the table, and move all the data to it.
 
-BEGIN TRANSACTION;
-
 CREATE TABLE snapshots_v6 (
     created_at DATETIME,
     updated_at DATETIME,
@@ -28,5 +26,3 @@ INSERT INTO snapshots_v6 SELECT * FROM snapshots;
 DROP TABLE snapshots;
 
 ALTER TABLE snapshots_v6 RENAME TO snapshots;
-
-COMMIT;

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/011_sqlite_downgrade.sql b/cinder/db/sqlalchemy/migrate_repo/versions/011_sqlite_downgrade.sql
index f27f48541a0bb1a5b432b9d0e3f0674928f81b88..d86ea6a9816deffe0e8a03c1fe2e181d8d095504 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/011_sqlite_downgrade.sql
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/011_sqlite_downgrade.sql
@@ -1,5 +1,3 @@
-BEGIN TRANSACTION;
-
 CREATE TABLE volumes_v10 (
     created_at DATETIME,
     updated_at DATETIME,
@@ -61,4 +59,3 @@ INSERT INTO volumes_v10
 
 DROP TABLE volumes;
 ALTER TABLE volumes_v10 RENAME TO volumes;
-COMMIT;

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/012_sqlite_downgrade.sql b/cinder/db/sqlalchemy/migrate_repo/versions/012_sqlite_downgrade.sql
index f3813cc5cf131527e72b242fa676c60c051ce80c..0170e8d8968c81de0dc3fbea13e498334b8c015e 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/012_sqlite_downgrade.sql
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/012_sqlite_downgrade.sql
@@ -1,5 +1,3 @@
-BEGIN TRANSACTION;
-
 CREATE TABLE volumes_v11 (
     created_at DATETIME,
     updated_at DATETIME,
@@ -63,4 +61,3 @@ INSERT INTO volumes_v11
 
 DROP TABLE volumes;
 ALTER TABLE volumes_v11 RENAME TO volumes;
-COMMIT;

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/013_sqlite_downgrade.sql b/cinder/db/sqlalchemy/migrate_repo/versions/013_sqlite_downgrade.sql
index 509fe434b4158a7da8c5cc5744181d40008212fc..b42162863287e10c65aae58fa40e5d1c420f8d07 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/013_sqlite_downgrade.sql
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/013_sqlite_downgrade.sql
@@ -1,5 +1,3 @@
-BEGIN TRANSACTION;
-
 CREATE TABLE volumes_v12 (
     created_at DATETIME,
     updated_at DATETIME,
@@ -65,4 +63,3 @@ INSERT INTO volumes_v12
 
 DROP TABLE volumes;
 ALTER TABLE volumes_v12 RENAME TO volumes;
-COMMIT;

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/014_sqlite_downgrade.sql b/cinder/db/sqlalchemy/migrate_repo/versions/014_sqlite_downgrade.sql
index a8260fa9704b0e173e49f07d10886bf6e049955f..6885168303c74da09333aeceee9634d63caca906 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/014_sqlite_downgrade.sql
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/014_sqlite_downgrade.sql
@@ -1,5 +1,3 @@
-BEGIN TRANSACTION;
-
 CREATE TABLE volumes_v13 (
     created_at DATETIME,
     updated_at DATETIME,
@@ -67,4 +65,3 @@ INSERT INTO volumes_v13
 
 DROP TABLE volumes;
 ALTER TABLE volumes_v13 RENAME TO volumes;
-COMMIT;