fix 2184: add binder errors

kuzudb · Oct 13, 2023 · 4bc562b · 4bc562b
1 parent 72dcb79
commit 4bc562b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/binder/bind/bind_ddl.cpp b/src/binder/bind/bind_ddl.cpp
@@ -107,8 +107,14 @@ std::unique_ptr<BoundCreateTableInfo> Binder::bindCreateNodeTableInfo(const Crea
 std::unique_ptr<BoundCreateTableInfo> Binder::bindCreateRelTableInfo(const CreateTableInfo* info) {
     auto boundProperties = bindProperties(info->propertyNameDataTypes);
     for (auto& boundProperty : boundProperties) {
-        if (boundProperty->getDataType()->getLogicalTypeID() == LogicalTypeID::SERIAL) {
-            throw BinderException("Serial property is not supported in rel table.");
+        if (boundProperty->getDataType()->getLogicalTypeID() == LogicalTypeID::SERIAL ||
+            boundProperty->getDataType()->getLogicalTypeID() == LogicalTypeID::UNION ||
+            boundProperty->getDataType()->getLogicalTypeID() == LogicalTypeID::STRUCT ||
+            boundProperty->getDataType()->getLogicalTypeID() == LogicalTypeID::MAP) {
+            throw BinderException(
+                StringUtils::string_format("{} property is not supported in rel table.",
+                    LogicalTypeUtils::dataTypeToString(
+                        boundProperty->getDataType()->getLogicalTypeID())));
         }
     }
     auto extraInfo = (ExtraCreateRelTableInfo*)info->extraInfo.get();

diff --git a/test/test_files/exceptions/binder/binder_error.test b/test/test_files/exceptions/binder/binder_error.test
@@ -470,7 +470,7 @@ Binder exception: Serial property in node table must be the primary key.
 -LOG SerialInRelTable
 -STATEMENT CREATE REL TABLE test(FROM person TO person, seq SERIAL)
 ---- error
-Binder exception: Serial property is not supported in rel table.
+Binder exception: SERIAL property is not supported in rel table.
 
 -LOG MatchBuiltIn
 -STATEMENT MATCH (a:person) RETURN a.age + 'hh'

diff --git a/test/test_files/issue/issue.test b/test/test_files/issue/issue.test
@@ -62,3 +62,21 @@
            MATCH (t:T)-[:LIKES]->(:Fruit {name: "Apple"}), (t)-[:LIKES]->(:Fruit {name: "Banana"}) return t;
 ---- 1
 {_ID: 0:0, _LABEL: T, name: T1}
+
+-CASE 2184
+-STATEMENT CREATE NODE TABLE T(name STRING, PRIMARY KEY(name));
+---- ok
+-STATEMENT CREATE NODE TABLE T2(name STRING, myprops MAP(STRING,STRING), PRIMARY KEY(name));
+---- ok
+-STATEMENT CREATE REL TABLE KIND_OF3(FROM T TO T, myprops MAP(STRING,STRING));
+---- error
+Binder exception: MAP property is not supported in rel table.
+-STATEMENT CREATE REL TABLE KIND_OF3(FROM T TO T, myprops SERIAL);
+---- error
+Binder exception: SERIAL property is not supported in rel table.
+-STATEMENT CREATE REL TABLE KIND_OF3(FROM T TO T, myprops STRUCT(v INT64));
+---- error
+Binder exception: STRUCT property is not supported in rel table.
+-STATEMENT CREATE REL TABLE KIND_OF3(FROM T TO T, myprops UNION(v1 STRING, v2 INT64));
+---- error
+Binder exception: UNION property is not supported in rel table.