update config gen query to take dataset name

Author: pranshi06

crates/configuration/src/config2.sql

@@ -8,6 +8,7 @@ WITH column_data AS (
       c.column_name AS name,
       JSON_OBJECT('ScalarType', 
         case LOWER(c.data_type)
+                  when 'bool' then 'boolean'
                   when 'boolean' then 'boolean'
                   when 'int16' then 'smallint'
                   when 'smallint' then 'smallint'
@@ -26,10 +27,14 @@ WITH column_data AS (
                   when 'json' then 'json'
                   when 'jsonb' then 'jsonb'
                   when 'date' then 'date'
-                  when 'time with time zone' then 'time with time zone'
-                  when 'time without time zone' then 'time without time zone'
-                  when 'timestamp with time zone' then 'timestamp with time zone'
-                  when 'timestamp without time zone' then 'timestamp without time zone'
+                  when 'timetz' then 'timetz'
+                  when 'time' then 'time'
+                  when 'timestamptz' then 'timestamptz'
+                  when 'timestamp' then 'timestamp'
+                  when 'time with time zone' then 'timetz'
+                  when 'time without time zone' then 'time'
+                  when 'timestamp with time zone' then 'timestamptz'
+                  when 'timestamp without time zone' then 'timestamp'
                   when 'uuid' then 'uuid'
                   else 'any'
                 end
@@ -41,7 +46,7 @@ WITH column_data AS (
     ON c.table_catalog = t.table_catalog
     AND c.table_schema = t.table_schema
     AND c.table_name = t.table_name
-  WHERE t.table_schema = 'chinook_sample'
+  WHERE t.table_schema = 'HASURA_DATABASE_SCHEMA_PLACEHOLDER'
 ),
 columns_struct AS (
   SELECT
@@ -77,7 +82,7 @@ relationship_data AS (
     AND c.constraint_schema = rc.constraint_schema
     AND c.constraint_name = rc.constraint_name
   JOIN HASURA_DATABASE_NAME_PLACEHOLDER.INFORMATION_SCHEMA.KEY_COLUMN_USAGE as fc ON c.constraint_name = fc.constraint_name
-  WHERE t.table_schema = 'chinook_sample' AND c.constraint_type = 'FOREIGN KEY'
+  WHERE t.table_schema = 'HASURA_DATABASE_SCHEMA_PLACEHOLDER' AND c.constraint_type = 'FOREIGN KEY'
   GROUP BY t.table_name, table_catalog, table_schema, constraint_name, rc.table_name, fc.column_name, rc.column_name
 ),
 relationship_struct AS (
@@ -108,7 +113,7 @@ unique_constraint_data AS (
     AND c.table_name = t.table_name
   JOIN HASURA_DATABASE_NAME_PLACEHOLDER.INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE as cc
     ON c.constraint_name = cc.constraint_name
-  WHERE t.table_schema = 'chinook_sample' 
+  WHERE t.table_schema = 'HASURA_DATABASE_SCHEMA_PLACEHOLDER' 
     AND c.constraint_type in ('PRIMARY KEY', 'UNIQUE')
     AND cc.constraint_catalog = c.constraint_catalog
     AND cc.constraint_schema = c.constraint_schema

crates/configuration/src/version1.rs

@@ -133,7 +133,7 @@ pub async fn configure(
         .query(project_id, QueryRequest::new(types_query))
         .await
         .unwrap();
-    dbg!(&types_row);
+    // dbg!(&types_row);
 
     let types_query_response = types_row.query_response().clone();
     let empty_tablerow = vec![TableRow::default()];
@@ -174,7 +174,10 @@ pub async fn configure(
     let config_query_string_with_database_name: String =
         config_query_string.replace("HASURA_DATABASE_NAME_PLACEHOLDER", database_name.as_str()); //TODO(PY): what is a safe name to provide as a variable name?
 
-    let tables_query_request = QueryRequest::new(config_query_string_with_database_name);
+    let config_query_with_schema_name = config_query_string_with_database_name
+        .replace("HASURA_DATABASE_SCHEMA_PLACEHOLDER", dataset_id);
+
+    let tables_query_request = QueryRequest::new(config_query_with_schema_name);
 
     let tables_result = bigquery_client
         .job()
@@ -183,6 +186,7 @@ pub async fn configure(
         .unwrap();
 
     let table_rows = tables_result.query_response().clone();
+    // dbg!(&table_rows);
 
     let mut tables_info = TablesInfo::empty();
 
@@ -384,7 +388,7 @@ fn get_scalar_types(type_names: &Vec<TypeItem>, schema_name: String) -> database
 
     for type_item in type_names {
         let type_name = match type_item.name.as_str().to_lowercase().as_str() {
-            "boolean" => "boolean",
+            "bool" | "boolean" => "boolean",
             "int16" | "smallint" => "smallint",
             "int" | "int32" | "integer" => "integer",
             "int64" | "bigint" => "bigint",
@@ -398,10 +402,10 @@ fn get_scalar_types(type_names: &Vec<TypeItem>, schema_name: String) -> database
             "json" => "json",
             "jsonb" => "jsonb",
             "date" => "date",
-            "time with time zone" => "time with time zone",
-            "time without time zone" => "time without time zone",
-            "timestamp with time zone" => "timestamp with time zone",
-            "timestamp without time zone" => "timestamp without time zone",
+            "timetz" | "time with time zone" => "timetz",
+            "time" | "time without time zone" => "time",
+            "timestamptz" | "timestamp with time zone" => "timestamptz",
+            "timestamp" | "timestamp without time zone" => "timestamp",
             "uuid" => "uuid",
             _ => "any",
         };