Changeset: 72179ed3f8bd for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72179ed3f8bd Modified Files: sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128 sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out sql/test/Tests/identifiers.stable.out sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out sql/test/VOC/Tests/median.Bug-3096.stable.out sql/test/pg_regress/Tests/date.stable.out sql/test/pg_regress/Tests/strings.stable.out sql/test/pg_regress/Tests/strings_concat.stable.out Branch: queryid2 Log Message:
approved test output diffs (truncated from 354 to 300 lines): diff --git a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out --- a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out +++ b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out @@ -36,7 +36,7 @@ Ready. % .L12 # table_name % suma # name % bigint # type -% 20 # length +% 1 # length [ NULL ] #SELECT SUM(a) AS suma #FROM ( diff --git a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128 b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128 --- a/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128 +++ b/sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128 @@ -36,7 +36,7 @@ Ready. % .L12 # table_name % suma # name % hugeint # type -% 40 # length +% 1 # length [ NULL ] #SELECT SUM(a) AS suma #FROM ( diff --git a/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out b/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out --- a/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out +++ b/sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out @@ -34,7 +34,7 @@ Ready. % .L2 # table_name % L2 # name % int # type -% 11 # length +% 1 # length [ NULL ] #create function call_function( aa int ) RETURNS int #begin @@ -46,7 +46,7 @@ Ready. % .L2 # table_name % L2 # name % int # type -% 11 # length +% 1 # length [ NULL ] # 22:37:37 > diff --git a/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out b/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out --- a/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out +++ b/sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out @@ -37,7 +37,7 @@ Ready. [ "€", 1 ] #select 'Liever €uro' as "Liever euro"; % .L2 # table_name -% Liever euro # name +% "Liever euro" # name % char # type % 11 # length [ "Liever €uro" ] diff --git a/sql/test/Tests/identifiers.stable.out b/sql/test/Tests/identifiers.stable.out --- a/sql/test/Tests/identifiers.stable.out +++ b/sql/test/Tests/identifiers.stable.out @@ -58,13 +58,13 @@ Ready. #CREATE TABLE "B\"la\"" (id int); -- should fail #SELECT 1 AS "B\"la\""; -- should fail % .L2 # table_name -% B\"la\" # name +% "B\\\"la\\\"" # name % tinyint # type % 1 # length [ 1 ] #SELECT 1 AS "\"Bla\""; -- should fail % .L2 # table_name -% \"Bla\" # name +% "\\\"Bla\\\"" # name % tinyint # type % 1 # length [ 1 ] diff --git a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py --- a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py +++ b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py @@ -19,7 +19,7 @@ def query(conn, sql): try: cur.execute(sql) except pymonetdb.OperationalError, e: - print e + print "!", e return r = cur.fetchall() cur.close() @@ -30,9 +30,10 @@ def run(conn, sql): try: r = conn.execute(sql) except pymonetdb.OperationalError, e: - print e + print "!", e return - print(r) + print '# OK' + c1 = connect('monetdb', 'monetdb') # Create a new schema with a new table. diff --git a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out --- a/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out +++ b/sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out @@ -59,57 +59,43 @@ Ready. # 10:44:34 > CREATE SCHEMA new_schema_as_well -&3 - +# OK SET SCHEMA new_schema_as_well -&4 t - +# OK CREATE TABLE test (x int, y int) -&3 - +# OK INSERT INTO test VALUES (-1, -1) -&2 1 -1 - +# OK CREATE USER new_user WITH PASSWORD 'new_quite_long_password' NAME 'newUser' SCHEMA new_schema_as_well -&3 - +# OK GRANT SELECT ON new_schema_as_well.test TO new_user -&3 - +# OK GRANT UPDATE ON new_schema_as_well.test TO new_user -&3 - +# OK GRANT INSERT ON new_schema_as_well.test TO new_user -&3 - +# OK GRANT DELETE ON new_schema_as_well.test TO new_user -&3 - +# OK SELECT * FROM test [(-1, -1)] UPDATE test SET x = -3 WHERE y = -1 -&2 1 -1 - +# OK INSERT INTO test VALUES (0, 0) -&2 1 -1 - +# OK DELETE FROM test WHERE y = -2 -&2 0 -1 - +# OK REVOKE SELECT ON new_schema_as_well.test FROM new_user -&3 - +# OK UPDATE test SET x = -66 WHERE y = 66 -UPDATE: insufficient privileges for user 'new_user' to update table 'test' +! UPDATE: insufficient privileges for user 'new_user' to update table 'test' INSERT INTO test VALUES (66, 66) -&2 1 -1 - +# OK DELETE FROM test WHERE y = -66 -DELETE FROM: insufficient privileges for user 'new_user' to delete from table 'test' +! DELETE FROM: insufficient privileges for user 'new_user' to delete from table 'test' SELECT * FROM test -SELECT: access denied for new_user to table 'new_schema_as_well.test' +! SELECT: access denied for new_user to table 'new_schema_as_well.test' # 10:44:34 > diff --git a/sql/test/VOC/Tests/median.Bug-3096.stable.out b/sql/test/VOC/Tests/median.Bug-3096.stable.out --- a/sql/test/VOC/Tests/median.Bug-3096.stable.out +++ b/sql/test/VOC/Tests/median.Bug-3096.stable.out @@ -43,13 +43,13 @@ Ready. % sys.L5 # table_name % L5 # name % int # type -% 11 # length +% 1 # length [ NULL ] #select max(departure_date) - min(departure_date) from voyages; % sys.L5 # table_name % L5 # name % int # type -% 11 # length +% 1 # length [ NULL ] #drop table voyages; diff --git a/sql/test/pg_regress/Tests/date.stable.out b/sql/test/pg_regress/Tests/date.stable.out --- a/sql/test/pg_regress/Tests/date.stable.out +++ b/sql/test/pg_regress/Tests/date.stable.out @@ -1021,37 +1021,37 @@ Ready. [ NULL ] #SELECT sql_sub(current_date, 24*60*60.0) - current_date AS "One day"; % .L2 # table_name -% One day # name +% "One day" # name % int # type % 2 # length [ -1 ] #SELECT current_date - sql_add(current_date, 24*60*60.0) AS "One day"; % .L2 # table_name -% One day # name +% "One day" # name % int # type % 2 # length [ -1 ] #SELECT sql_sub(current_date, 24*60*60.0) - sql_add(current_date, 24*60*60.0) AS "Two days"; % .L2 # table_name -% Two days # name +% "Two days" # name % int # type % 2 # length [ -2 ] #SELECT sql_add(current_date, 24*60*60.0) - current_date AS "One day"; % .L2 # table_name -% One day # name +% "One day" # name % int # type % 1 # length [ 1 ] #SELECT current_date - sql_sub(current_date, 24*60*60.0) AS "One day"; % .L2 # table_name -% One day # name +% "One day" # name % int # type % 1 # length [ 1 ] #SELECT sql_add(current_date, 24*60*60.0) - sql_sub(current_date, 24*60*60.0) AS "Two days"; % .L2 # table_name -% Two days # name +% "Two days" # name % int # type % 1 # length [ 2 ] diff --git a/sql/test/pg_regress/Tests/strings.stable.out b/sql/test/pg_regress/Tests/strings.stable.out --- a/sql/test/pg_regress/Tests/strings.stable.out +++ b/sql/test/pg_regress/Tests/strings.stable.out @@ -35,7 +35,7 @@ Ready. # ' - third line' # AS "Three lines to one"; % .L2 # table_name -% Three lines to one # name +% "Three lines to one" # name % char # type % 35 # length [ "first line - next line - third line" ] @@ -44,7 +44,7 @@ Ready. #' - third line' # AS "Illegal comment within continuation"; % .L2 # table_name -% Illegal comment within continuation # name +% "Illegal comment within continuation" # name % char # type % 35 # length [ "first line - next line - third line" ] @@ -167,25 +167,25 @@ Ready. #DROP TABLE TEXT_TBL; #SELECT TRIM(' bunch o blanks ') = 'bunch o blanks' AS "bunch o blanks"; % .L2 # table_name -% bunch o blanks # name +% "bunch o blanks" # name % boolean # type % 5 # length [ true ] #SELECT LTRIM(' bunch o blanks ') = 'bunch o blanks ' AS "bunch o blanks "; % .L2 # table_name -% bunch o blanks # name +% "bunch o blanks " # name % boolean # type % 5 # length [ true ] #SELECT RTRIM(' bunch o blanks ') = ' bunch o blanks' AS " bunch o blanks"; % .L2 # table_name -% bunch o blanks # name +% " bunch o blanks" # name % boolean # type % 5 # length [ true ] #SELECT TRIM(replace('xxxxxsome Xsxxxxx', 'x', ' ')) = 'some Xs' AS "some Xs"; % .L2 # table_name -% some Xs # name +% "some Xs" # name % boolean # type % 5 # length [ true ] @@ -527,31 +527,31 @@ Ready. [ false ] #SELECT 'unknown' || ' and unknown' AS "Concat unknown types"; % .L2 # table_name _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list