hasura · BenoitRanque · Jun 20, 2024 · Jun 20, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clickhouse_gdc"
-version = "2.37.2"
+version = "2.40.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 2.40.0
+
+- Support all table types (previously only supported BASE TABLE and VIEW)
+
 ## 2.37.2
 
 - fix breaking change: don't use schema qualification for the `default` schema.

diff --git a/src/server/routes/introspection/basic_info_filtered.sql b/src/server/routes/introspection/basic_info_filtered.sql
@@ -4,6 +4,5 @@ SELECT
     tables.table_type AS "table_type"
 FROM INFORMATION_SCHEMA.TABLES AS tables
 WHERE tables.table_catalog NOT IN ('system', 'INFORMATION_SCHEMA', 'information_schema')
-AND tables.table_type IN ('BASE TABLE', 'VIEW')
 AND tables.table_name IN {table_names:Array(String)}
 FORMAT JSON;
diff --git a/src/server/routes/introspection/basic_info_unfiltered.sql b/src/server/routes/introspection/basic_info_unfiltered.sql
@@ -4,5 +4,4 @@ SELECT
     tables.table_type AS "table_type"
 FROM INFORMATION_SCHEMA.TABLES AS tables
 WHERE tables.table_catalog NOT IN ('system', 'INFORMATION_SCHEMA', 'information_schema')
-AND tables.table_type IN ('BASE TABLE', 'VIEW')
 FORMAT JSON;
diff --git a/src/server/routes/introspection/everything_filtered.sql b/src/server/routes/introspection/everything_filtered.sql
@@ -34,6 +34,5 @@ LEFT JOIN (
 ) AS system_columns ON system_columns.database = tables.table_schema
 AND system_columns.table = tables.table_name
 WHERE tables.table_catalog NOT IN ('system', 'INFORMATION_SCHEMA', 'information_schema')
-AND tables.table_type IN ('BASE TABLE', 'VIEW')
 AND tables.table_name IN {table_names:Array(String)}
 FORMAT JSON;
diff --git a/src/server/routes/introspection/everything_unfiltered.sql b/src/server/routes/introspection/everything_unfiltered.sql
@@ -34,5 +34,4 @@ LEFT JOIN (
 ) AS system_columns ON system_columns.database = tables.table_schema
 AND system_columns.table = tables.table_name
 WHERE tables.table_catalog NOT IN ('system', 'INFORMATION_SCHEMA', 'information_schema')
-AND tables.table_type IN ('BASE TABLE', 'VIEW')
-FORMAT JSON;
+FORMAT JSON;
diff --git a/src/server/routes/post_schema.rs b/src/server/routes/post_schema.rs
@@ -38,9 +38,13 @@ pub async fn post_schema(
 
 #[derive(Debug, Serialize, Deserialize)]
 enum IntrospectionTableType {
-    #[serde(rename = "BASE TABLE")]
+    #[serde(
+        rename = "BASE TABLE",
+        alias = "FOREIGN TABLE",
+        alias = "LOCAL TEMPORARY"
+    )]
     BaseTable,
-    #[serde(rename = "VIEW")]
+    #[serde(rename = "VIEW", alias = "SYSTEM VIEW")]
     View,
 }