Changeset: 7fbe0126b638 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7fbe0126b638 Modified Files: sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err 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.32bit sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.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.32bit sql/test/emptydb-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.32bit 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.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 Branch: default Log Message:
Merge with Aug2018 branch. diffs (truncated from 336 to 300 lines): diff --git a/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err b/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err --- a/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err +++ b/sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err @@ -30,7 +30,7 @@ stderr of test 'sqlitelogictest-groupby- MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT DISTINCT - COALESCE ( - 86, + cor0.col1, cor0.col1, - cor0.col0 ) AS col2 FROM tab0 AS cor0 GROUP BY cor0.col2, cor0.col0; -ERROR = !SELECT: cannot use non GROUP BY column 'cor0.col1' in query results without an aggregate function +ERROR = !SELECT: no such aggregate 'sql_neg' CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT COALESCE ( - 86, + cor0.col1, cor0.col1, - cor0.col0 ) AS col2 FROM tab0 AS cor0 GROUP BY cor0.col2, cor0.col0; @@ -38,7 +38,7 @@ ERROR = !SELECT: cannot use non GROUP BY CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT ALL + 33 * - COALESCE ( - 86, tab1.col2 ) + + col1 FROM tab1 GROUP BY tab1.col1; -ERROR = !SELECT: cannot use non GROUP BY column 'tab1.col2' in query results without an aggregate function +ERROR = !SELECT: no such aggregate 'sql_add' CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT COALESCE ( - 86, tab1.col2 ) FROM tab1 GROUP BY tab1.col1; @@ -46,7 +46,7 @@ ERROR = !SELECT: cannot use non GROUP BY CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT ALL + COALESCE ( - cor0.col1, cor0.col1, 63, - cor0.col2 ) * - cor0.col1 AS col1 FROM tab0 cor0 GROUP BY cor0.col0, col1; -ERROR = !SELECT: cannot use non GROUP BY column 'cor0.col2' in query results without an aggregate function +ERROR = !SELECT: no such aggregate 'sql_mul' CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT ALL + COALESCE ( - cor0.col1, cor0.col1, 63, cor0.col2 ) AS col1 FROM tab0 cor0 GROUP BY cor0.col0, col1; @@ -54,7 +54,7 @@ ERROR = !SELECT: cannot use non GROUP BY CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT - 38 + - tab1.col1 - tab1.col1 / COALESCE ( + 20, - tab1.col0 ) FROM tab1 GROUP BY tab1.col1; -ERROR = !SELECT: cannot use non GROUP BY column 'tab1.col0' in query results without an aggregate function +ERROR = !SELECT: no such aggregate 'sql_sub' CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT COALESCE ( + 20, tab1.col0 ) FROM tab1 GROUP BY tab1.col1; @@ -62,7 +62,7 @@ ERROR = !SELECT: cannot use non GROUP BY CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT DISTINCT COALESCE ( - 82, - cor0.col0, - CAST ( NULL AS INTEGER ) ) / - 70 FROM tab0 AS cor0 GROUP BY cor0.col2; -ERROR = !SELECT: cannot use non GROUP BY column 'cor0.col0' in query results without an aggregate function +ERROR = !SELECT: no such aggregate 'sql_div' CODE = 42000 MAPI = (monetdb) /var/tmp/mtest-4323/.s.monetdb.30108 QUERY = SELECT DISTINCT COALESCE ( - 82, cor0.col0, - CAST ( NULL AS INTEGER ) ) FROM tab0 AS cor0 GROUP BY cor0.col2; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -5888,12 +5888,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128 @@ -5903,12 +5903,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit --- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit +++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -5888,12 +5888,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -34,12 +34,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit --- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit +++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit @@ -34,12 +34,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -5887,12 +5887,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; 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 @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: -set schema sys; drop view if exists sys.tablestoragemodel; drop view if exists sys.storagemodel cascade; drop function if exists sys.storagemodel() cascade; diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit --- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit +++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit @@ -35,12 +35,6 @@ commit; Running database upgrade commands: set schema sys; -update sys.functions set side_effect = true where language <> 0 and not side_effect and type <> 4 and (type = 2 or (language <> 2 and id not in (select func_id from sys.args where inout = 1))); -set schema "sys"; -commit; - -Running database upgrade commands: _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
