Merge pull request #81 from Mytherin/constraintdef

Correctly define unique constraint in SQLite table definition
duckdb · Jan 23, 2024 · 9b558ed · 9b558ed
2 parents aa9be09 + e3c2a7f
commit 9b558ed
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/sqlite_db.cpp b/src/sqlite_db.cpp
@@ -166,6 +166,10 @@ void SQLiteDB::GetTableInfo(const string &table_name, ColumnList &columns, vecto
 		StringUtil::Trim(sqlite_type);
 		auto column_type = all_varchar ? LogicalType::VARCHAR : SQLiteUtils::TypeToLogicalType(sqlite_type);
 
+		if (pk) {
+			primary_key_index = cid;
+			primary_keys.push_back(sqlite_colname);
+		}
 		ColumnDefinition column(std::move(sqlite_colname), std::move(column_type));
 		if (!default_value.empty() && default_value != "\"\"") {
 			auto expressions = Parser::ParseExpressionList(default_value);
@@ -178,10 +182,6 @@ void SQLiteDB::GetTableInfo(const string &table_name, ColumnList &columns, vecto
 		if (not_null) {
 			constraints.push_back(make_uniq<NotNullConstraint>(LogicalIndex(cid)));
 		}
-		if (pk) {
-			primary_key_index = cid;
-			primary_keys.push_back(sqlite_colname);
-		}
 		found = true;
 	}
 	if (!found) {