Changeset: 1be3e8efe59e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1be3e8efe59e Modified Files: sql/backends/monet5/sql_upgrades.c sql/scripts/97_comments.sql sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 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 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 Branch: Mar2018 Log Message:
Simplify query. diffs (truncated from 420 to 300 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 @@ -1469,7 +1469,7 @@ sql_update_mar2018(Client c, mvc *sql) " s.name || '.' || f.name AS fullname,\n" " CAST(8 AS SMALLINT) AS ntype,\n" " (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type,\n" - " CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system,\n" + " sf.function_id IS NOT NULL AS system,\n" " c.remark AS remark\n" " FROM sys.functions f\n" " LEFT OUTER JOIN sys.comments c ON f.id = c.id\n" @@ -1492,7 +1492,7 @@ sql_update_mar2018(Client c, mvc *sql) " s.name AS schema,\n" " f.name AS fname,\n" " sys.function_type_keyword(f.type) AS category,\n" - " CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system,\n" + " sf.function_id IS NOT NULL AS system,\n" " CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name,\n" " CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark,\n" " p.type, p.type_digits, p.type_scale,\n" diff --git a/sql/scripts/97_comments.sql b/sql/scripts/97_comments.sql --- a/sql/scripts/97_comments.sql +++ b/sql/scripts/97_comments.sql @@ -66,7 +66,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -91,7 +91,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5783,7 +5783,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5806,7 +5806,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64 @@ -5778,7 +5778,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5801,7 +5801,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5070,7 +5070,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5093,7 +5093,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5070,7 +5070,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5093,7 +5093,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5833,7 +5833,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5856,7 +5856,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 --- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 @@ -5833,7 +5833,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5856,7 +5856,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5783,7 +5783,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5806,7 +5806,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5070,7 +5070,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5093,7 +5093,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5070,7 +5070,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5093,7 +5093,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5833,7 +5833,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5856,7 +5856,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5781,7 +5781,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5804,7 +5804,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5065,7 +5065,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, (CASE WHEN sf.function_id IS NOT NULL THEN 'SYSTEM ' ELSE '' END) || sys.function_type_keyword(f.type) AS type, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, c.remark AS remark FROM sys.functions f LEFT OUTER JOIN sys.comments c ON f.id = c.id @@ -5088,7 +5088,7 @@ SELECT f.id AS fid, s.name AS schema, f.name AS fname, sys.function_type_keyword(f.type) AS category, - CASE WHEN sf.function_id IS NULL THEN FALSE ELSE TRUE END AS system, + sf.function_id IS NOT NULL AS system, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number ASC) WHEN 1 THEN f.name ELSE NULL END AS name, CASE RANK() OVER (PARTITION BY f.id ORDER BY p.number DESC) WHEN 1 THEN c.remark ELSE NULL END AS remark, p.type, p.type_digits, p.type_scale, 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 @@ -5065,7 +5065,7 @@ SELECT DISTINCT s.name AS sname, -- DIS s.name || '.' || f.name AS fullname, CAST(8 AS SMALLINT) AS ntype, _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list