Changeset: 7b94b805390f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b94b805390f
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
Branch: default
Log Message:
Approving changed output.
diffs (truncated from 305 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -18,32 +18,6 @@ stdout of test 'Test_Dobjects` in direct
# MonetDB/SQL module loaded
Ready.
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading sql script: 11_times.sql
-# loading sql script: 12_url.sql
-# loading sql script: 13_date.sql
-# loading sql script: 14_inet.sql
-# loading sql script: 15_querylog.sql
-# loading sql script: 16_tracelog.sql
-# loading sql script: 19_cluster.sql
-# loading sql script: 20_vacuum.sql
-# loading sql script: 21_dependency_functions.sql
-# loading sql script: 22_clients.sql
-# loading sql script: 23_skyserver.sql
-# loading sql script: 24_zorder.sql
-# loading sql script: 25_debug.sql
-# loading sql script: 26_sysmon.sql
-# loading sql script: 39_analytics.sql
-# loading sql script: 40_json.sql
-# loading sql script: 41_md5sum.sql
-# loading sql script: 45_uuid.sql
-# loading sql script: 75_storagemodel.sql
-# loading sql script: 80_statistics.sql
-# loading sql script: 80_udf.sql
-# loading sql script: 85_bam.sql
-# loading sql script: 99_system.sql
# 15:28:56 >
# 15:28:56 > "./Test_Dobjects.SQL.sh" "Test_Dobjects"
@@ -56,75 +30,75 @@ Ready.
Resultset with 1 columns
TABLE_CAT
-mTests_sql_jdbc_tests
+
Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
-bam mTests_sql_jdbc_tests mTests_sql_jdbc_tests
-json mTests_sql_jdbc_tests mTests_sql_jdbc_tests
-profiler mTests_sql_jdbc_tests mTests_sql_jdbc_tests
-sys mTests_sql_jdbc_tests mTests_sql_jdbc_tests
-tmp mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+bam null null
+json null null
+profiler null null
+sys null null
+tmp null null
Resultset with 3 columns
TABLE_SCHEM TABLE_CATALOG TABLE_CAT
-sys mTests_sql_jdbc_tests mTests_sql_jdbc_tests
+sys null null
Resultset with 10 columns
TABLE_CAT TABLE_SCHEM TABLE_NAME TABLE_TYPE REMARKS
TYPE_CAT TYPE_SCHEM TYPE_NAME SELF_REFERENCING_COL_NAME
REF_GENERATION
-mTests_sql_jdbc_tests bam export SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests bam files SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests bam pg SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests bam rg SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests bam sq SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys _columns SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys _tables SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys args SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys auths SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys connections SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys db_user_info SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys dependencies SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys dependency_types SYSTEM TABLE null
null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys functions SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys idxs SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys keys SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys keywords SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys netcdf_attrs SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys netcdf_dims SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys netcdf_files SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys netcdf_vardim SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys netcdf_vars SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys objects SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys privileges SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys schemas SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys sequences SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys statistics SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys storagemodelinput SYSTEM TABLE null
null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys systemfunctions SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys table_types SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys triggers SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys types SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys user_role SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests tmp _columns SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests tmp _tables SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests tmp idxs SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests tmp keys SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests tmp objects SYSTEM TABLE null null null
null rowid SYSTEM
-mTests_sql_jdbc_tests tmp triggers SYSTEM TABLE null null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys columns SYSTEM VIEW SELECT * FROM (SELECT
p.* FROM "sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t)
AS columns; null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys environment SYSTEM VIEW create view
sys.environment as select * from sys.environment(); null null null
rowid SYSTEM
-mTests_sql_jdbc_tests sys optimizers SYSTEM VIEW create view
sys.optimizers as select * from sys.optimizers(); null null null
rowid SYSTEM
-mTests_sql_jdbc_tests sys querylog_calls SYSTEM VIEW create view
sys.querylog_calls as select * from sys.querylog_calls(); null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys querylog_catalog SYSTEM VIEW --
create table views for convenience
+null bam export SYSTEM TABLE null null null null rowid
SYSTEM
+null bam files SYSTEM TABLE null null null null rowid
SYSTEM
+null bam pg SYSTEM TABLE null null null null rowid
SYSTEM
+null bam rg SYSTEM TABLE null null null null rowid
SYSTEM
+null bam sq SYSTEM TABLE null null null null rowid
SYSTEM
+null sys _columns SYSTEM TABLE null null null null
rowid SYSTEM
+null sys _tables SYSTEM TABLE null null null null rowid
SYSTEM
+null sys args SYSTEM TABLE null null null null rowid
SYSTEM
+null sys auths SYSTEM TABLE null null null null rowid
SYSTEM
+null sys connections SYSTEM TABLE null null null null
rowid SYSTEM
+null sys db_user_info SYSTEM TABLE null null null null
rowid SYSTEM
+null sys dependencies SYSTEM TABLE null null null null
rowid SYSTEM
+null sys dependency_types SYSTEM TABLE null null null
null rowid SYSTEM
+null sys functions SYSTEM TABLE null null null null
rowid SYSTEM
+null sys idxs SYSTEM TABLE null null null null rowid
SYSTEM
+null sys keys SYSTEM TABLE null null null null rowid
SYSTEM
+null sys keywords SYSTEM TABLE null null null null
rowid SYSTEM
+null sys netcdf_attrs SYSTEM TABLE null null null null
rowid SYSTEM
+null sys netcdf_dims SYSTEM TABLE null null null null
rowid SYSTEM
+null sys netcdf_files SYSTEM TABLE null null null null
rowid SYSTEM
+null sys netcdf_vardim SYSTEM TABLE null null null null
rowid SYSTEM
+null sys netcdf_vars SYSTEM TABLE null null null null
rowid SYSTEM
+null sys objects SYSTEM TABLE null null null null rowid
SYSTEM
+null sys privileges SYSTEM TABLE null null null null
rowid SYSTEM
+null sys schemas SYSTEM TABLE null null null null rowid
SYSTEM
+null sys sequences SYSTEM TABLE null null null null
rowid SYSTEM
+null sys statistics SYSTEM TABLE null null null null
rowid SYSTEM
+null sys storagemodelinput SYSTEM TABLE null null null
null rowid SYSTEM
+null sys systemfunctions SYSTEM TABLE null null null null
rowid SYSTEM
+null sys table_types SYSTEM TABLE null null null null
rowid SYSTEM
+null sys triggers SYSTEM TABLE null null null null
rowid SYSTEM
+null sys types SYSTEM TABLE null null null null rowid
SYSTEM
+null sys user_role SYSTEM TABLE null null null null
rowid SYSTEM
+null tmp _columns SYSTEM TABLE null null null null
rowid SYSTEM
+null tmp _tables SYSTEM TABLE null null null null rowid
SYSTEM
+null tmp idxs SYSTEM TABLE null null null null rowid
SYSTEM
+null tmp keys SYSTEM TABLE null null null null rowid
SYSTEM
+null tmp objects SYSTEM TABLE null null null null rowid
SYSTEM
+null tmp triggers SYSTEM TABLE null null null null
rowid SYSTEM
+null sys columns SYSTEM VIEW SELECT * FROM (SELECT p.* FROM
"sys"."_columns" AS p UNION ALL SELECT t.* FROM "tmp"."_columns" AS t) AS
columns; null null null rowid SYSTEM
+null sys environment SYSTEM VIEW create view sys.environment as
select * from sys.environment(); null null null rowid SYSTEM
+null sys optimizers SYSTEM VIEW create view sys.optimizers as
select * from sys.optimizers(); null null null rowid SYSTEM
+null sys querylog_calls SYSTEM VIEW create view sys.querylog_calls
as select * from sys.querylog_calls(); null null null rowid SYSTEM
+null sys querylog_catalog SYSTEM VIEW -- create table views
for convenience
create view sys.querylog_catalog as select * from sys.querylog_catalog();
null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys querylog_history SYSTEM VIEW create
view sys.querylog_history as
+null sys querylog_history SYSTEM VIEW create view
sys.querylog_history as
select qd.*, ql."start",ql."stop", ql.arguments, ql.tuples, ql.run, ql.ship,
ql.cpu, ql.io
from sys.querylog_catalog() qd, sys.querylog_calls() ql
where qd.id = ql.id and qd.owner = user; null null null rowid
SYSTEM
-mTests_sql_jdbc_tests sys queue SYSTEM VIEW create view sys.queue
as select * from sys.queue(); null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys rejects SYSTEM VIEW create view sys.rejects
as select * from sys.rejects(); null null null rowid SYSTEM
-mTests_sql_jdbc_tests sys sessions SYSTEM VIEW create view
sys.sessions as select * from sys.sessions(); null null null
rowid SYSTEM
-mTests_sql_jdbc_tests sys storage SYSTEM VIEW create view
sys."storage" as select * from sys."storage"(); null null null
rowid SYSTEM
-mTests_sql_jdbc_tests sys storagemodel SYSTEM VIEW create view
sys.storagemodel as select * from sys.storagemodel(); null null
null rowid SYSTEM
-mTests_sql_jdbc_tests sys tables SYSTEM VIEW SELECT "id", "name",
"schema_id", "query", CAST(CASE WHEN "system" THEN "type" + 10 /* system
table/view */ ELSE (CASE WHEN "commit_action" = 0 THEN "type" /* table/view */
ELSE "type" + 20 /* global temp table */ END) END AS SMALLINT) AS "type",
"system", "commit_action", "access", CASE WHEN (NOT "system" AND
"commit_action" > 0) THEN 1 ELSE 0 END AS "temporary" FROM "sys"."_tables"
WHERE "type" <> 2 UNION ALL SELECT "id", "name", "schema_id", "query",
CAST("type" + 30 /* local temp table */ AS SMALLINT) AS "type", "system",
"commit_action", "access", 1 AS "temporary" FROM "tmp"."_tables"; null
null null rowid SYSTEM
-mTests_sql_jdbc_tests sys tablestoragemodel SYSTEM VIEW -- A
summary of the table storage requirement is is available as a table view.
+null sys queue SYSTEM VIEW create view sys.queue as select * from
sys.queue(); null null null rowid SYSTEM
+null sys rejects SYSTEM VIEW create view sys.rejects as select *
from sys.rejects(); null null null rowid SYSTEM
+null sys sessions SYSTEM VIEW create view sys.sessions as
select * from sys.sessions(); null null null rowid SYSTEM
+null sys storage SYSTEM VIEW create view sys."storage" as select *
from sys."storage"(); null null null rowid SYSTEM
+null sys storagemodel SYSTEM VIEW create view sys.storagemodel as
select * from sys.storagemodel(); null null null rowid SYSTEM
+null sys tables SYSTEM VIEW SELECT "id", "name", "schema_id",
"query", CAST(CASE WHEN "system" THEN "type" + 10 /* system table/view */ ELSE
(CASE WHEN "commit_action" = 0 THEN "type" /* table/view */ ELSE "type" + 20 /*
global temp table */ END) END AS SMALLINT) AS "type", "system",
"commit_action", "access", CASE WHEN (NOT "system" AND "commit_action" > 0)
THEN 1 ELSE 0 END AS "temporary" FROM "sys"."_tables" WHERE "type" <> 2 UNION
ALL SELECT "id", "name", "schema_id", "query", CAST("type" + 30 /* local temp
table */ AS SMALLINT) AS "type", "system", "commit_action", "access", 1 AS
"temporary" FROM "tmp"."_tables"; null null null rowid SYSTEM
+null sys tablestoragemodel SYSTEM VIEW -- A summary of the
table storage requirement is is available as a table view.
-- The auxiliary column denotes the maximum space if all non-sorted columns
-- would be augmented with a hash (rare situation)
create view sys.tablestoragemodel
@@ -135,8 +109,8 @@ as select "schema","table",max(count) as
sum(imprints) as imprints,
sum(case when sorted = false then 8 * count else 0 end) as auxiliary
from sys.storagemodel() group by "schema","table"; null null null
rowid SYSTEM
-mTests_sql_jdbc_tests sys tracelog SYSTEM VIEW create view
sys.tracelog as select * from sys.tracelog(); null null null
rowid SYSTEM
-mTests_sql_jdbc_tests sys users SYSTEM VIEW SELECT u."name" AS
"name", ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
rowid SYSTEM
+null sys tracelog SYSTEM VIEW create view sys.tracelog as
select * from sys.tracelog(); null null null rowid SYSTEM
+null sys users SYSTEM VIEW SELECT u."name" AS "name",
ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
rowid SYSTEM
# 21:45:39 >
# 21:45:39 > "Done."
diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
@@ -52,7 +52,7 @@ Ready.
0. false false
0. 6 columns: 6
-1. mTests_sql_jdbc_tests
+1.
classname java.lang.Short
displaysize 8
label intnull
@@ -72,7 +72,7 @@ 1. mTests_sql_jdbc_tests
searchable true
signed true
writable false
-2. mTests_sql_jdbc_tests
+2.
classname java.lang.Integer
displaysize 32
label myint
@@ -92,7 +92,7 @@ 2. mTests_sql_jdbc_tests
searchable true
signed true
writable false
-3. mTests_sql_jdbc_tests
+3.
classname java.lang.Double
displaysize 53
label mydouble
@@ -112,7 +112,7 @@ 3. mTests_sql_jdbc_tests
searchable true
signed true
writable false
-4. mTests_sql_jdbc_tests
+4.
classname java.lang.Boolean
displaysize 1
label mybool
@@ -132,7 +132,7 @@ 4. mTests_sql_jdbc_tests
searchable true
signed false
writable false
-5. mTests_sql_jdbc_tests
+5.
classname java.lang.String
displaysize 15
label myvarchar
@@ -152,7 +152,7 @@ 5. mTests_sql_jdbc_tests
searchable true
signed false
writable false
-6. mTests_sql_jdbc_tests
+6.
classname java.sql.Clob
displaysize 0
label myclob
diff --git a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
@@ -25,7 +25,7 @@ Ready.
0. false false
0. 4 columns: 5
-1. mTests_sql_jdbc_tests
+1.
classname java.lang.Integer
displaysize 1
label myint
@@ -45,7 +45,7 @@ 1. mTests_sql_jdbc_tests
searchable true
signed true
writable false
-2. mTests_sql_jdbc_tests
+2.
classname java.lang.Double
displaysize 24
label mydouble
@@ -65,7 +65,7 @@ 2. mTests_sql_jdbc_tests
searchable true
signed true
writable false
-3. mTests_sql_jdbc_tests
+3.
classname java.lang.Boolean
displaysize 5
label mybool
@@ -85,7 +85,7 @@ 3. mTests_sql_jdbc_tests
searchable true
signed false
writable false
-4. mTests_sql_jdbc_tests
+4.
classname java.lang.String
displaysize 8
label myvarchar
@@ -105,7 +105,7 @@ 4. mTests_sql_jdbc_tests
searchable true
signed false
writable false
-5. mTests_sql_jdbc_tests
+5.
classname java.sql.Clob
displaysize 11
label myclob
diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
@@ -52,12 +52,12 @@ Ready.
0. false false
0. 4 columns: 2
-1. mTests_sql_jdbc_tests
+1.
classname nl.cwi.monetdb.jdbc.types.INET
schemaname sys
tablename table_test_rsqldata
name myinet
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
