Changeset: 203dd9ac1149 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/203dd9ac1149
Modified Files:
sql/server/rel_schema.c
sql/server/sql_partition.c
Branch: literal_features
Log Message:
use 'nndunique' suffix for instantiated UNIQUE NULLS NOT DISTINCT keys
diffs (25 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
@@ -325,6 +325,9 @@ column_constraint_name(mvc *sql, symbol
case SQL_UNIQUE:
suffix = "unique";
break;
+ case SQL_UNIQUE_NULLS_NOT_DISTINCT:
+ suffix = "nndunique";
+ break;
case SQL_PRIMARY_KEY:
suffix = "pkey";
break;
diff --git a/sql/server/sql_partition.c b/sql/server/sql_partition.c
--- a/sql/server/sql_partition.c
+++ b/sql/server/sql_partition.c
@@ -53,7 +53,7 @@ str
sql_partition_validate_key(mvc *sql, sql_table *nt, sql_key *k, const char* op)
{
if (k->type != fkey) {
- const char *keys = (k->type == pkey) ? "primary" : "unique";
+ const char *keys = (k->type == pkey) ? "primary" : k->type ==
unndkey ? "nndunique" : "unique";
assert(k->type == pkey || k->type == ukey || k->type ==
unndkey);
if (isPartitionedByColumnTable(nt)) {
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
