MonetDB: default - Do not end upgrade code with a COMMIT.

[Sjoerd Mullender via checkin-list]

Changeset: 4b9ca4ae8d2a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4b9ca4ae8d2a
Modified Files:
        sql/backends/monet5/sql_upgrades.c
        
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
        
sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:

Do not end upgrade code with a COMMIT.


diffs (238 lines):

diff --git a/sql/backends/monet5/sql_upgrades.c 
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -6154,8 +6154,7 @@ sql_update_default(Client c, mvc *sql, s
                "\n"
                "update sys._tables set system = true where system <> true\n"
                " and schema_id = (select s.id from sys.schemas s where s.name 
= 'information_schema')\n"
-               " and name in 
('character_sets','schemata','tables','views','columns');\n"
-               "commit;\n";
+               " and name in 
('character_sets','schemata','tables','views','columns');\n";
                printf("Running database upgrade commands:\n%s\n", cmds);
                fflush(stdout);
                err = SQLstatementIntern(c, cmds, "update", true, false, NULL);
diff --git 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- 
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ 
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git 
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -727,5 +727,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git 
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out 
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -727,5 +727,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -367,5 +367,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git 
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128 
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64.int128
@@ -367,5 +367,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out 
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -367,5 +367,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git 
a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git 
a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -727,5 +727,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git 
a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out 
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
@@ -658,5 +658,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -727,5 +727,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out 
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -367,5 +367,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out 
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -298,5 +298,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
@@ -367,5 +367,4 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
 update sys._tables set system = true where system <> true
  and schema_id = (select s.id from sys.schemas s where s.name = 
'information_schema')
  and name in ('character_sets','schemata','tables','views','columns');
-commit;
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org