fix(ibis): fixed test models

yalexbadan · yalexbadan · commit dbff7d80d28d · 2025-03-31T12:07:29.000+02:00
diff --git a/ibis-server/app/model/metadata/bigquery.py b/ibis-server/app/model/metadata/bigquery.py
@@ -76,7 +76,7 @@ def get_table(row) -> Table:
                     catalog=row["table_catalog"],
                     table=row["table_name"],
                 ),
-                primaryKey="",
+                primaryKey=[],
             )
 
         def is_root_column(row) -> bool:
diff --git a/ibis-server/app/model/metadata/canner.py b/ibis-server/app/model/metadata/canner.py
@@ -166,7 +166,7 @@ def _build_table(cls, data: dict) -> Table:
             name=data["sqlName"],
             description=data["dataMetadata"]["metadata"]["description"],
             columns=cls._build_columns(data["columns"]),
-            primaryKey="",
+            primaryKey=[],
             properties=(
                 TableProperties(
                     catalog="canner",
diff --git a/ibis-server/app/model/metadata/snowflake.py b/ibis-server/app/model/metadata/snowflake.py
@@ -58,7 +58,7 @@ def get_table_list(self) -> list[Table]:
                         catalog=row["TABLE_CATALOG"],
                         table=row["TABLE_NAME"],
                     ),
-                    primaryKey="",
+                    primaryKey=[],
                 )
 
             # table exists, and add column to the table
diff --git a/ibis-server/tests/routers/v2/connector/test_canner.py b/ibis-server/tests/routers/v2/connector/test_canner.py
@@ -66,7 +66,7 @@
                     "type": "timestamp",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
     ],
 }
diff --git a/ibis-server/tests/routers/v2/connector/test_gcs_file.py b/ibis-server/tests/routers/v2/connector/test_gcs_file.py
@@ -41,7 +41,7 @@
                     "type": "varchar",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
@@ -66,7 +66,7 @@
                     "expression": "sum(orders.totalprice)",
                 },
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
     ],
     "relationships": [
diff --git a/ibis-server/tests/routers/v2/connector/test_local_file.py b/ibis-server/tests/routers/v2/connector/test_local_file.py
@@ -36,7 +36,7 @@
                     "type": "varchar",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
@@ -61,7 +61,7 @@
                     "expression": "sum(orders.totalprice)",
                 },
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
     ],
     "relationships": [
diff --git a/ibis-server/tests/routers/v2/connector/test_minio_file.py b/ibis-server/tests/routers/v2/connector/test_minio_file.py
@@ -39,7 +39,7 @@
                     "type": "varchar",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
@@ -64,7 +64,7 @@
                     "expression": "sum(orders.totalprice)",
                 },
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
     ],
     "relationships": [
diff --git a/ibis-server/tests/routers/v2/connector/test_mssql.py b/ibis-server/tests/routers/v2/connector/test_mssql.py
@@ -62,7 +62,7 @@
                     "type": "bytea",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
     ],
 }
diff --git a/ibis-server/tests/routers/v2/connector/test_mysql.py b/ibis-server/tests/routers/v2/connector/test_mysql.py
@@ -64,7 +64,7 @@
                     "type": "bytea",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
@@ -73,7 +73,7 @@
                 {"name": "custkey", "expression": "c_custkey", "type": "integer"},
                 {"name": "name", "expression": "c_name", "type": "varchar"},
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
     ],
 }
diff --git a/ibis-server/tests/routers/v2/connector/test_oracle.py b/ibis-server/tests/routers/v2/connector/test_oracle.py
@@ -71,7 +71,7 @@
                     "type": "blob",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         }
     ],
 }
diff --git a/ibis-server/tests/routers/v2/connector/test_postgres.py b/ibis-server/tests/routers/v2/connector/test_postgres.py
@@ -66,7 +66,7 @@
                     "type": "bytea",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
diff --git a/ibis-server/tests/routers/v2/connector/test_s3_file.py b/ibis-server/tests/routers/v2/connector/test_s3_file.py
@@ -41,7 +41,7 @@
                     "type": "varchar",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
@@ -66,7 +66,7 @@
                     "expression": "sum(orders.totalprice)",
                 },
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
     ],
     "relationships": [
diff --git a/ibis-server/tests/routers/v2/connector/test_snowflake.py b/ibis-server/tests/routers/v2/connector/test_snowflake.py
@@ -61,7 +61,7 @@
                     "type": "timestamp",
                 },
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
     ],
 }
diff --git a/ibis-server/tests/routers/v2/test_analysis.py b/ibis-server/tests/routers/v2/test_analysis.py
@@ -20,7 +20,7 @@
                 {"name": "mktsegment", "expression": "mktsegment", "type": "varchar"},
                 {"name": "comment", "expression": "comment", "type": "varchar"},
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
         {
             "name": "orders",
@@ -44,7 +44,7 @@
                 },
                 {"name": "comment", "expression": "comment", "type": "varchar"},
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "lineitem",
diff --git a/ibis-server/tests/routers/v2/test_relationship_valid.py b/ibis-server/tests/routers/v2/test_relationship_valid.py
@@ -17,7 +17,7 @@
                 {"name": "id", "type": "integer"},
                 {"name": "many_col", "type": "integer"},
             ],
-            "primaryKey": "id",
+            "primaryKey": ["id"],
         },
         {
             "name": "t2",
diff --git a/ibis-server/tests/routers/v3/connector/bigquery/test_query.py b/ibis-server/tests/routers/v3/connector/bigquery/test_query.py
@@ -53,7 +53,7 @@
                     "type": "timestamptz",
                 },
             ],
-            "primaryKey": "o_orderkey",
+            "primaryKey": ["o_orderkey"],
         },
     ],
 }
diff --git a/ibis-server/tests/routers/v3/connector/local_file/test_query.py b/ibis-server/tests/routers/v3/connector/local_file/test_query.py
@@ -29,7 +29,7 @@
                 },
                 {"name": "orderdate", "expression": "o_orderdate", "type": "date"},
             ],
-            "primaryKey": "orderkey",
+            "primaryKey": ["orderkey"],
         },
         {
             "name": "Customer",
@@ -54,7 +54,7 @@
                     "expression": 'sum("Orders".totalprice)',
                 },
             ],
-            "primaryKey": "custkey",
+            "primaryKey": ["custkey"],
         },
     ],
     "relationships": [
diff --git a/ibis-server/tests/routers/v3/connector/postgres/test_query.py b/ibis-server/tests/routers/v3/connector/postgres/test_query.py
@@ -59,7 +59,7 @@
                     "type": "timestamptz",
                 },
             ],
-            "primaryKey": "o_orderkey",
+            "primaryKey": ["o_orderkey"],
         },
         {
             "name": "customer",
@@ -78,7 +78,7 @@
                     "expression": "sum(orders.o_totalprice_double)",
                 },
             ],
-            "primaryKey": "c_custkey",
+            "primaryKey": ["c_custkey"],
         },
     ],
     "relationships": [

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def get_table(row) -> Table:`
`76`	`76`	`catalog=row["table_catalog"],`
`77`	`77`	`table=row["table_name"],`
`78`	`78`	`),`
`79`		`- primaryKey="",`
	`79`	`+ primaryKey=[],`
`80`	`80`	`)`
`81`	`81`
`82`	`82`	`def is_root_column(row) -> bool:`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ def get_table_list(self) -> list[Table]:`
`58`	`58`	`catalog=row["TABLE_CATALOG"],`
`59`	`59`	`table=row["TABLE_NAME"],`
`60`	`60`	`),`
`61`		`- primaryKey="",`
	`61`	`+ primaryKey=[],`
`62`	`62`	`)`
`63`	`63`
`64`	`64`	`# table exists, and add column to the table`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`"type": "timestamp",`
`67`	`67`	`},`
`68`	`68`	`],`
`69`		`- "primaryKey": "orderkey",`
	`69`	`+ "primaryKey": ["orderkey"],`
`70`	`70`	`},`
`71`	`71`	`],`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@`
`62`	`62`	`"type": "bytea",`
`63`	`63`	`},`
`64`	`64`	`],`
`65`		`- "primaryKey": "orderkey",`
	`65`	`+ "primaryKey": ["orderkey"],`
`66`	`66`	`},`
`67`	`67`	`],`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`	`"type": "blob",`
`72`	`72`	`},`
`73`	`73`	`],`
`74`		`- "primaryKey": "orderkey",`
	`74`	`+ "primaryKey": ["orderkey"],`
`75`	`75`	`}`
`76`	`76`	`],`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`"type": "timestamp",`
`62`	`62`	`},`
`63`	`63`	`],`
`64`		`- "primaryKey": "orderkey",`
	`64`	`+ "primaryKey": ["orderkey"],`
`65`	`65`	`},`
`66`	`66`	`],`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`{"name": "id", "type": "integer"},`
`18`	`18`	`{"name": "many_col", "type": "integer"},`
`19`	`19`	`],`
`20`		`- "primaryKey": "id",`
	`20`	`+ "primaryKey": ["id"],`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"name": "t2",`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`"type": "timestamptz",`
`54`	`54`	`},`
`55`	`55`	`],`
`56`		`- "primaryKey": "o_orderkey",`
	`56`	`+ "primaryKey": ["o_orderkey"],`
`57`	`57`	`},`
`58`	`58`	`],`
`59`	`59`	`}`