Add column constraint support

duckdb · Nov 21, 2024 · a25c2cd · a25c2cd
1 parent 9cc5563
commit a25c2cd
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 9 deletions.
diff --git a/extension/autocomplete/matcher.cpp b/extension/autocomplete/matcher.cpp
@@ -156,6 +156,9 @@ class RepeatMatcher : public Matcher {
 				// match did not succeed - propagate upwards
 				return child_match;
 			}
+			if (!separator) {
+				continue;
+			}
 			// succeeded in matching the child
 			// now we optionally match the separator
 			idx_t successful_token = repeat_state.token_index;
@@ -282,10 +285,41 @@ unique_ptr<Matcher> QualifiedTableName() {
 	return Matcher::List(std::move(m));
 }
 
+unique_ptr<Matcher> TypeName() {
+	return Matcher::TypeName();
+}
+
+unique_ptr<Matcher> NotNullConstraint() {
+	vector<unique_ptr<Matcher>> m;
+	m.push_back(Matcher::Keyword("NOT"));
+	m.push_back(Matcher::Keyword("NULL", 0, '\0'));
+	return Matcher::List(std::move(m));
+}
+
+unique_ptr<Matcher> UniqueConstraint() {
+	return Matcher::Keyword("UNIQUE", 0, '\0');
+}
+
+unique_ptr<Matcher> PrimaryKeyConstraint() {
+	vector<unique_ptr<Matcher>> m;
+	m.push_back(Matcher::Keyword("PRIMARY"));
+	m.push_back(Matcher::Keyword("KEY", 0, '\0'));
+	return Matcher::List(std::move(m));
+}
+
+unique_ptr<Matcher> ColumnConstraint() {
+	vector<unique_ptr<Matcher>> m;
+	m.push_back(NotNullConstraint());
+	m.push_back(UniqueConstraint());
+	m.push_back(PrimaryKeyConstraint());
+	return Matcher::Optional(Matcher::Repeat(Matcher::Choice(std::move(m)), nullptr));
+}
+
 unique_ptr<Matcher> CreateTableColumnList() {
 	vector<unique_ptr<Matcher>> m;
 	m.push_back(Matcher::Variable());
-	m.push_back(Matcher::TypeName());
+	m.push_back(TypeName());
+	m.push_back(ColumnConstraint());
 	return Matcher::Repeat(Matcher::List(std::move(m)), Matcher::Keyword(","));
 }
 

diff --git a/test/sql/function/table/sql_auto_complete.test b/test/sql/function/table/sql_auto_complete.test
@@ -43,15 +43,32 @@ FROM sql_auto_complete('create table tbl(i INTEGER, j INTE') LIMIT 1;
 ----
 INTEGER	30
 
-## suggest a constraint
-#query II
-#FROM sql_auto_complete('create table tbl(i INTEGER PRI') LIMIT 1;
-#----
+# suggest a constraint
+query II
+FROM sql_auto_complete('create table tbl(i INTEGER PRI') LIMIT 1;
+----
+PRIMARY 	27
+
+query II
+FROM sql_auto_complete('create table tbl(i INTEGER PRIMARY KE') LIMIT 1;
+----
+KEY	35
+
+query II
+FROM sql_auto_complete('create table tbl(i INTEGER UNIQ') LIMIT 1;
+----
+UNIQUE	27
+
+query II
+FROM sql_auto_complete('create table tbl(i INTEGER UNIQUE NO') LIMIT 1;
+----
+NOT 	34
+
+query II
+FROM sql_auto_complete('create table tbl(i INTEGER UNIQUE NOT N') LIMIT 1;
+----
+NULL	38
 
-#query II
-#FROM sql_auto_complete('create table tbl(i INTEGER PRIMARY KE') LIMIT 1;
-#----
-#
 ## suggest a stand-alone constraint
 #query II
 #FROM sql_auto_complete('create table tbl(i INTEGER, PRI') LIMIT 1;