Changeset: 58aba4fccc13 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/58aba4fccc13
Modified Files:
sql/server/rel_schema.c
sql/test/pg_regress/Tests/arrays.test
Branch: nested
Log Message:
disallow constraints on composite and/or multisets for now
some more array operations work now,ie approve output
diffs (44 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -435,6 +435,10 @@ column_constraint_type(sql_query *query,
mvc *sql = query->sql;
int res = SQL_ERR;
+ if (cs && (cs->type.multiset || cs->type.type->composite)) {
+ (void) sql_error(sql, 02, SQLSTATE(42000) "CONSTRAINT:
constraints on multisets or composite types are not supported");
+ return res;
+ }
if (isDeclared && (s->token != SQL_NULL && s->token != SQL_NOT_NULL)) {
(void) sql_error(sql, 02, SQLSTATE(42000) "CONSTRAINT:
constraints on declared tables are not supported");
return res;
diff --git a/sql/test/pg_regress/Tests/arrays.test
b/sql/test/pg_regress/Tests/arrays.test
--- a/sql/test/pg_regress/Tests/arrays.test
+++ b/sql/test/pg_regress/Tests/arrays.test
@@ -91,7 +91,7 @@ SELECT a[1:3],
d[1:1][2:2]
FROM arrtest
-statement error
+statement ok
CREATE TEMP TABLE arrtest2 (i integer ARRAY[4], f double[], n numeric[], t
text[], d timestamp[])
statement error
@@ -168,7 +168,7 @@ SELECT t.f[1][3][1] AS "131", t.f[2][2][
SELECT
ARRAY[[[111,112],[121,122],[131,132]],[[211,212],[221,122],[231,232]]] AS f
) AS t
-statement error
+statement ok
SELECT ARRAY[[[[[['hello'],['world']]]]]]
statement error
@@ -360,7 +360,7 @@ select '{
statement error
DROP TABLE arrtest
-statement error
+statement ok
DROP TABLE arrtest2
statement ok
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
