Changeset: 405d49f9718a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=405d49f9718a
Modified Files:
sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 22881 to 300 lines):
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/subselect_cardinality.SF-1240701.1242164.stable.err
@@ -30,10 +30,10 @@ stderr of test 'subselect_cardinality.SF
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select * from tab where i = (select 0 from tab where i < 3) order by i;
-ERROR = !cardinality violation (2>1)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+ERROR = !cardinality violation, scalar value expected
+MAPI = (monetdb) /var/tmp/mtest-8091/.s.monetdb.39076
QUERY = select * from tab where i = (select i from tab where i < 3) order by i;
-ERROR = !cardinality violation (2>1)
+ERROR = !cardinality violation, scalar value expected
# 11:09:03 >
# 11:09:03 > "Done."
diff --git
a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
--- a/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
+++ b/sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
@@ -84,7 +84,7 @@ stderr of test 'sql_command_kills_db.SF-
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = insert into t1 values ((select id from tbls));
-ERROR = !cardinality violation (3>1)
+ERROR = !cardinality violation, scalar value expected
# 16:15:09 >
# 16:15:09 > Done.
diff --git a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
--- a/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
+++ b/sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
@@ -47,7 +47,7 @@ QUERY = select
left join sys.db_user_info as ref_25
on (ref_24.dimpos = ref_25.default_schema )
on (ref_23.id = ref_24.var_id )
-ERROR = !cardinality violation (2>1)
+ERROR = !cardinality violation, scalar value expected
# 17:09:30 >
# 17:09:30 > "Done."
diff --git a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
--- a/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
+++ b/sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
@@ -17,7 +17,7 @@ QUERY = SELECT date, (SELECT date from t
ERROR = !syntax error, unexpected LIMIT, expecting UNION or EXCEPT or
INTERSECT or ')' in: "select date, (select date from test_subquery where date >
t1892413a.date limit"
MAPI = (monetdb) /var/tmp/mtest-9352/.s.monetdb.30593
QUERY = SELECT date, (SELECT date from test_subquery where date >
t1892413a.date) as dtNext from test_subquery t1892413a;
-ERROR = !zero_or_one: cardinality violation (2>1)
+ERROR = !zero_or_one: cardinality violation, scalar expression expected
# 10:24:35 >
# 10:24:35 > Done.
diff --git a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
--- a/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
+++ b/sql/test/BugTracker/Tests/insert_values.SF-1578838.stable.err
@@ -93,8 +93,8 @@ QUERY = INSERT INTO "examines" ("docID",
WHERE "name" LIKE 'vic%'
)
);
-ERROR = !cardinality violation (2>1)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+ERROR = !cardinality violation, scalar value expected
+MAPI = (monetdb) /var/tmp/mtest-8091/.s.monetdb.39076
QUERY = INSERT INTO "timelines" ("vicID", "time", "event") VALUES
(
(
@@ -105,7 +105,7 @@ QUERY = INSERT INTO "timelines" ("vicID"
'11:00 PM',
'Polly is seen walking etc...'
);
-ERROR = !cardinality violation (2>1)
+ERROR = !cardinality violation, scalar value expected
# 19:33:23 >
# 19:33:23 > Done.
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
@@ -345,7 +345,7 @@ Ready.
\dSf sys."var_samp"
SYSTEM SCHEMA bam
SYSTEM SCHEMA json
-SYSTEM SCHEMA profiler
+SYSTEM SCHEMA profiler
SYSTEM SCHEMA sys
SYSTEM SCHEMA tmp
SYSTEM TABLE sys._columns
@@ -373,7 +373,7 @@ SYSTEM TABLE sys.privilege_codes
SYSTEM TABLE sys.privileges
SYSTEM TABLE sys.schemas
SYSTEM TABLE sys.sequences
-SYSTEM TABLE sys.spatial_ref_sys
+SYSTEM TABLE sys.spatial_ref_sys
SYSTEM TABLE sys.statistics
SYSTEM TABLE sys.storagemodelinput
SYSTEM TABLE sys.systemfunctions
@@ -383,7 +383,7 @@ SYSTEM TABLE sys.types
SYSTEM TABLE sys.user_role
SYSTEM VIEW sys.columns
SYSTEM VIEW sys.environment
-SYSTEM VIEW sys.geometry_columns
+SYSTEM VIEW sys.geometry_columns
SYSTEM VIEW sys.optimizers
SYSTEM VIEW sys.querylog_calls
SYSTEM VIEW sys.querylog_catalog
@@ -397,61 +397,61 @@ SYSTEM VIEW sys.tables
SYSTEM VIEW sys.tablestoragemodel
SYSTEM VIEW sys.tracelog
SYSTEM VIEW sys.users
-SYSTEM FUNCTION sys.<
-SYSTEM FUNCTION sys.<=
-SYSTEM FUNCTION sys.<>
-SYSTEM FUNCTION sys.=
-SYSTEM FUNCTION sys.>
-SYSTEM FUNCTION sys.>=
+SYSTEM FUNCTION sys.<
+SYSTEM FUNCTION sys.<=
+SYSTEM FUNCTION sys.<>
+SYSTEM FUNCTION sys.=
+SYSTEM FUNCTION sys.>
+SYSTEM FUNCTION sys.>=
SYSTEM FUNCTION sys.abbrev
-SYSTEM FUNCTION sys.abs
-SYSTEM FUNCTION sys.acos
+SYSTEM FUNCTION sys.abs
+SYSTEM FUNCTION sys.acos
SYSTEM FUNCTION sys.all
SYSTEM FUNCTION sys.alpha
SYSTEM FUNCTION sys.analyze
-SYSTEM FUNCTION sys.and
-SYSTEM FUNCTION sys.ascii
-SYSTEM FUNCTION sys.asin
-SYSTEM FUNCTION sys.atan
-SYSTEM FUNCTION sys.avg
+SYSTEM FUNCTION sys.and
+SYSTEM FUNCTION sys.ascii
+SYSTEM FUNCTION sys.asin
+SYSTEM FUNCTION sys.atan
+SYSTEM FUNCTION sys.avg
SYSTEM FUNCTION sys.bbp
-SYSTEM FUNCTION sys.bit_and
-SYSTEM FUNCTION sys.bit_not
-SYSTEM FUNCTION sys.bit_or
-SYSTEM FUNCTION sys.bit_xor
+SYSTEM FUNCTION sys.bit_and
+SYSTEM FUNCTION sys.bit_not
+SYSTEM FUNCTION sys.bit_or
+SYSTEM FUNCTION sys.bit_xor
SYSTEM FUNCTION sys.broadcast
-SYSTEM FUNCTION sys.ceil
-SYSTEM FUNCTION sys.ceiling
-SYSTEM FUNCTION sys.char_length
-SYSTEM FUNCTION sys.character_length
-SYSTEM FUNCTION sys.charindex
+SYSTEM FUNCTION sys.ceil
+SYSTEM FUNCTION sys.ceiling
+SYSTEM FUNCTION sys.char_length
+SYSTEM FUNCTION sys.character_length
+SYSTEM FUNCTION sys.charindex
SYSTEM FUNCTION sys.clearrejects
-SYSTEM FUNCTION sys.code
+SYSTEM FUNCTION sys.code
SYSTEM FUNCTION sys.columnsize
-SYSTEM FUNCTION sys.concat
+SYSTEM FUNCTION sys.concat
SYSTEM FUNCTION sys.contains
-SYSTEM FUNCTION sys.copyfrom
+SYSTEM FUNCTION sys.copyfrom
SYSTEM FUNCTION sys.corr
-SYSTEM FUNCTION sys.cos
-SYSTEM FUNCTION sys.cosh
-SYSTEM FUNCTION sys.cot
-SYSTEM FUNCTION sys.count
-SYSTEM FUNCTION sys.count_no_nil
+SYSTEM FUNCTION sys.cos
+SYSTEM FUNCTION sys.cosh
+SYSTEM FUNCTION sys.cot
+SYSTEM FUNCTION sys.count
+SYSTEM FUNCTION sys.count_no_nil
SYSTEM FUNCTION sys.createorderindex
-SYSTEM FUNCTION sys.curdate
-SYSTEM FUNCTION sys.current_date
-SYSTEM FUNCTION sys.current_time
-SYSTEM FUNCTION sys.current_timestamp
-SYSTEM FUNCTION sys.curtime
+SYSTEM FUNCTION sys.curdate
+SYSTEM FUNCTION sys.current_date
+SYSTEM FUNCTION sys.current_time
+SYSTEM FUNCTION sys.current_timestamp
+SYSTEM FUNCTION sys.curtime
SYSTEM FUNCTION sys.date_to_str
-SYSTEM FUNCTION sys.day
-SYSTEM FUNCTION sys.dayofmonth
-SYSTEM FUNCTION sys.dayofweek
-SYSTEM FUNCTION sys.dayofyear
+SYSTEM FUNCTION sys.day
+SYSTEM FUNCTION sys.dayofmonth
+SYSTEM FUNCTION sys.dayofweek
+SYSTEM FUNCTION sys.dayofyear
SYSTEM FUNCTION sys.db_users
-SYSTEM FUNCTION sys.debug
+SYSTEM FUNCTION sys.debug
SYSTEM FUNCTION sys.degrees
-SYSTEM FUNCTION sys.dense_rank
+SYSTEM FUNCTION sys.dense_rank
SYSTEM FUNCTION sys.dependencies_columns_on_functions
SYSTEM FUNCTION sys.dependencies_columns_on_indexes
SYSTEM FUNCTION sys.dependencies_columns_on_keys
@@ -469,26 +469,26 @@ SYSTEM FUNCTION sys.dependencies_tables
SYSTEM FUNCTION sys.dependencies_tables_on_views
SYSTEM FUNCTION sys.dependencies_views_on_functions
SYSTEM FUNCTION sys.dependencies_views_on_triggers
-SYSTEM FUNCTION sys.diff
+SYSTEM FUNCTION sys.diff
SYSTEM FUNCTION sys.difference
SYSTEM FUNCTION sys.droporderindex
-SYSTEM FUNCTION sys.editdistance
-SYSTEM FUNCTION sys.editdistance2
+SYSTEM FUNCTION sys.editdistance
+SYSTEM FUNCTION sys.editdistance2
SYSTEM FUNCTION sys.env
SYSTEM FUNCTION sys.environment
SYSTEM FUNCTION sys.epoch
SYSTEM FUNCTION sys.evalalgebra
-SYSTEM FUNCTION sys.exist
-SYSTEM FUNCTION sys.exp
+SYSTEM FUNCTION sys.exist
+SYSTEM FUNCTION sys.exp
SYSTEM FUNCTION sys.fitsattach
SYSTEM FUNCTION sys.fitsload
-SYSTEM FUNCTION sys.floor
-SYSTEM FUNCTION sys.flush_log
+SYSTEM FUNCTION sys.floor
+SYSTEM FUNCTION sys.flush_log
SYSTEM FUNCTION sys.fuse
SYSTEM FUNCTION sys.generate_series
-SYSTEM FUNCTION sys.geometrytype
-SYSTEM FUNCTION sys.get_type
-SYSTEM FUNCTION sys.get_value_for
+SYSTEM FUNCTION sys.geometrytype
+SYSTEM FUNCTION sys.get_type
+SYSTEM FUNCTION sys.get_value_for
SYSTEM FUNCTION sys.getanchor
SYSTEM FUNCTION sys.getbasename
SYSTEM FUNCTION sys.getcontent
@@ -498,78 +498,78 @@ SYSTEM FUNCTION sys.getextension
SYSTEM FUNCTION sys.getfile
SYSTEM FUNCTION sys.gethost
SYSTEM FUNCTION sys.getport
-SYSTEM FUNCTION sys.getproj4
+SYSTEM FUNCTION sys.getproj4
SYSTEM FUNCTION sys.getprotocol
SYSTEM FUNCTION sys.getquery
SYSTEM FUNCTION sys.getroboturl
SYSTEM FUNCTION sys.getuser
-SYSTEM FUNCTION sys.has_m
-SYSTEM FUNCTION sys.has_z
-SYSTEM FUNCTION sys.hash
+SYSTEM FUNCTION sys.has_m
+SYSTEM FUNCTION sys.has_z
+SYSTEM FUNCTION sys.hash
SYSTEM FUNCTION sys.hashsize
SYSTEM FUNCTION sys.heapsize
SYSTEM FUNCTION sys.host
SYSTEM FUNCTION sys.hostmask
-SYSTEM FUNCTION sys.hour
-SYSTEM FUNCTION sys.identity
-SYSTEM FUNCTION sys.ifthenelse
+SYSTEM FUNCTION sys.hour
+SYSTEM FUNCTION sys.identity
+SYSTEM FUNCTION sys.ifthenelse
SYSTEM FUNCTION sys.ilike
SYSTEM FUNCTION sys.imprintsize
-SYSTEM FUNCTION sys.in
-SYSTEM FUNCTION sys.index
-SYSTEM FUNCTION sys.insert
-SYSTEM FUNCTION sys.internaltransform
+SYSTEM FUNCTION sys.in
+SYSTEM FUNCTION sys.index
+SYSTEM FUNCTION sys.insert
+SYSTEM FUNCTION sys.internaltransform
SYSTEM FUNCTION sys.isaurl
SYSTEM FUNCTION sys.isauuid
-SYSTEM FUNCTION sys.isnull
-SYSTEM FUNCTION sys.lcase
-SYSTEM FUNCTION sys.left
+SYSTEM FUNCTION sys.isnull
+SYSTEM FUNCTION sys.lcase
+SYSTEM FUNCTION sys.left
SYSTEM FUNCTION sys.left_shift
SYSTEM FUNCTION sys.left_shift_assign
SYSTEM FUNCTION sys.length
-SYSTEM FUNCTION sys.levenshtein
+SYSTEM FUNCTION sys.levenshtein
SYSTEM FUNCTION sys.lidarattach
SYSTEM FUNCTION sys.lidarexport
SYSTEM FUNCTION sys.lidarload
SYSTEM FUNCTION sys.like
SYSTEM FUNCTION sys.listdir
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
