Changeset: bec11a8ae558 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bec11a8ae558
Modified Files:
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/mergedb_create.test
Branch: Sep2022
Log Message:
Make test independent of NETCDF
diffs (99 lines):
diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All
--- a/sql/test/mergetables/Tests/All
+++ b/sql/test/mergetables/Tests/All
@@ -21,7 +21,7 @@ addtable
replicas
transaction-conflict
-HAVE_NETCDF?mergedb_create
+mergedb_create
HAVE_GEOM?sqlsmith.Bug-6459
HAVE_NETCDF?sqlsmith.Bug-6472
diff --git a/sql/test/mergetables/Tests/mergedb_create.test
b/sql/test/mergetables/Tests/mergedb_create.test
--- a/sql/test/mergetables/Tests/mergedb_create.test
+++ b/sql/test/mergetables/Tests/mergedb_create.test
@@ -169,6 +169,15 @@ 9
1
bye
+statement ok
+CREATE TABLE my_vars ("file_id" INTEGER,"name"
VARCHAR(64),"vartype" VARCHAR(64));
+
+statement ok
+CREATE TABLE my_vardim ("var_id" INTEGER,"dim_id" INTEGER,"dimpos" INTEGER);
+
+statement ok
+CREATE TABLE my_attrs ("att_name" VARCHAR(256),"att_type"
VARCHAR(64),"gr_name" VARCHAR(256));
+
query ITTTITI rowsort
select
ref_2.y as c0,
@@ -186,7 +195,7 @@ from
lateral (select
ref_2.z as c0
from
- sys.netcdf_vardim as ref_3
+ my_vardim as ref_3
where ref_3.dim_id is NULL) as subq_0
where EXISTS (
select
@@ -216,7 +225,7 @@ where EXISTS (
ref_2.x as c7,
ref_2.y as c8
from
- sys.netcdf_attrs as ref_5
+ my_attrs as ref_5
where false) as subq_2
on (subq_1.c2 = subq_2.c2 )
right join sys.r as ref_9
@@ -318,7 +327,7 @@ from
ref_2.file_id as c12,
ref_2.vartype as c13
from
- sys.netcdf_vars as ref_2
+ my_vars as ref_2
where ref_0.x is not NULL))
or (ref_0.y is NULL)))
limit 109) as subq_0
@@ -342,7 +351,7 @@ query I rowsort
select ref_0.x from sys.s2 as ref_0
where EXISTS (
select ref_1.role_id as c0 from sys.user_role as ref_1
- where (EXISTS ( select ref_0.y as c0 from sys.netcdf_vars)) or
(ref_0.y is NULL)
+ where (EXISTS ( select ref_0.y as c0 from my_vars)) or (ref_0.y is
NULL)
)
----
@@ -360,7 +369,7 @@ from
ref_13.dim_id as c0,
ref_11.query as c1
from
- sys.netcdf_vardim as ref_13,
+ my_vardim as ref_13,
lateral (select
ref_11.access as c0,
ref_13.var_id as c1,
@@ -383,7 +392,7 @@ select
ref_6.id) as int) as c2
from
sys.types as ref_0
- left join sys.netcdf_attrs as ref_1
+ left join my_attrs as ref_1
inner join sys.keys as ref_6
inner join sys.storagemodelinput as ref_7
left join sys.optimizers as ref_8
@@ -410,11 +419,11 @@ where EXISTS (
where ref_11.id is NULL
limit 79) as subq_0
left join tmp._tables as ref_13
- inner join sys.netcdf_vardim as ref_14
+ inner join my_vardim as ref_14
on (ref_14.dimpos is NULL)
on ((ref_1.att_type is not NULL)
or (ref_0.id is NULL))
- inner join sys.netcdf_vardim as ref_15
+ inner join my_vardim as ref_15
on (ref_10.id is not NULL)
where ref_0.systemname is NULL)
limit 77
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
