Changeset: 581e4a71ac24 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=581e4a71ac24 Modified Files: sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/Test_Dobjects.stable.out Branch: geo Log Message:
Test_Dobjects: approved HAVE_GEOM output diffs (49 lines): diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All --- a/sql/jdbc/tests/Tests/All +++ b/sql/jdbc/tests/Tests/All @@ -5,7 +5,7 @@ HAVE_JDBCTESTS?Test_Creplysize HAVE_JDBCTESTS?Test_Csavepoints HAVE_JDBCTESTS?Test_Ctransaction #HAVE_JDBCTESTS?Test_Csendthread # unfortunately has runtime-dependant output -HAVE_JDBCTESTS&HAVE_SAMTOOLS&HAVE_NETCDF?Test_Dobjects +HAVE_JDBCTESTS&HAVE_SAMTOOLS&HAVE_NETCDF&HAVE_GEOM?Test_Dobjects HAVE_JDBCTESTS?Test_PSgeneratedkeys HAVE_JDBCTESTS?Test_PSsomeamount HAVE_JDBCTESTS?Test_PSlargebatchval 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 @@ -92,6 +92,7 @@ mTests_sql_jdbc_tests sys objects 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 spatial_ref_sys 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 @@ -106,6 +107,25 @@ mTests_sql_jdbc_tests tmp objects 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 geometry_columns SYSTEM VIEW -- create geometry_columns metadata view +create view geometry_columns as + select e.value as f_table_catalog, + s.name as f_table_schema, + y.f_table_name, y.f_geometry_column, y.coord_dimension, y.srid, y.type + from schemas s, environment e, ( + select t.schema_id, + t.name as f_table_name, + x.name as f_geometry_column, + has_z(info)+has_m(info)+2 as coord_dimension, + srid, get_type(info, 0) as type + from tables t, ( + select name, table_id, type_digits as info, type_scale as srid + from columns + where type in ( select distinct sqlname from types where systemname='wkb') + ) as x + where t.id=x.table_id + ) y + where y.schema_id=s.id and e.name='gdk_dbname'; 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 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
