a few less snowlake errors

malloydata · Nov 20, 2024 · 0c03f46 · 0c03f46
1 parent 9a0ae97
commit 0c03f46
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 9 deletions.
diff --git a/packages/malloy/src/dialect/snowflake/snowflake.ts b/packages/malloy/src/dialect/snowflake/snowflake.ts
@@ -458,10 +458,34 @@ ${indent(sql)}
   malloyTypeToSQLType(malloyType: AtomicTypeDef): string {
     if (malloyType.type === 'number') {
       if (malloyType.numberType === 'integer') {
-        return 'integer';
+        return 'INTEGER';
       } else {
-        return 'double';
+        return 'DOUBLE';
       }
+    } else if (
+      malloyType.type === 'record' ||
+      (malloyType.type === 'array' &&
+        malloyType.elementTypeDef.type === 'record_element')
+    ) {
+      const sqlFields = malloyType.fields.reduce((ret, f) => {
+        if (isAtomic(f)) {
+          const name = f.as ?? f.name;
+          const oneSchema = `${this.sqlMaybeQuoteIdentifier(
+            name
+          )} ${this.malloyTypeToSQLType(f)}`;
+          ret.push(oneSchema);
+        }
+        return ret;
+      }, [] as string[]);
+      const recordScehma = `OBJECT(${sqlFields.join(',')})`;
+      return malloyType.type === 'record'
+        ? recordScehma
+        : `ARRAY(${recordScehma})`;
+    } else if (
+      malloyType.type === 'array' &&
+      malloyType.elementTypeDef.type !== 'record_element'
+    ) {
+      return `ARRAY(${this.malloyTypeToSQLType(malloyType.elementTypeDef)})`;
     }
     return malloyType.type;
   }
@@ -496,23 +520,22 @@ ${indent(sql)}
 
   sqlLiteralRecord(lit: RecordLiteralNode): string {
     const rowVals: string[] = [];
-    const rowTypes: string[] = [];
     for (const f of lit.typeDef.fields) {
       if (isAtomic(f)) {
         const name = f.as ?? f.name;
         const propName = `'${name}'`;
         const propVal = lit.kids[name].sql ?? 'internal-error-record-literal';
         rowVals.push(`${propName}:${propVal}`);
-        rowTypes.push(
-          `${this.sqlMaybeQuoteIdentifier(name)} ${this.malloyTypeToSQLType(f)}`
-        );
       }
     }
-    return `{${rowVals.join(',')}}::OBJECT(${rowTypes.join(',')})`;
+    return `{${rowVals.join(',')}}::${this.malloyTypeToSQLType(lit.typeDef)}`;
   }
 
   sqlLiteralArray(lit: ArrayLiteralNode): string {
     const array = lit.kids.values.map(val => val.sql);
-    return `[${array.join(',')}]`;
+    const arraySchema = `[${array.join(',')}]`;
+    return lit.typeDef.elementTypeDef.type === 'record_element'
+      ? `${arraySchema}::${this.malloyTypeToSQLType(lit.typeDef)}`
+      : arraySchema;
   }
 }
diff --git a/test/src/databases/all/compound-atomic.spec.ts b/test/src/databases/all/compound-atomic.spec.ts
@@ -45,7 +45,7 @@ describe.each(runtimes.runtimeList)(
       'mysql': 'JSON_LENGTH',
       'snowflake': 'ARRAY_SIZE',
     };
-    const empty = `${databaseName}.sql("SELECT 0")`;
+    const empty = `${databaseName}.sql("SELECT 0 as z")`;
     function arraySelectVal(...val: Number[]): string {
       const literal: ArrayLiteralNode = {
         node: 'arrayLiteral',
@@ -408,3 +408,7 @@ describe.each(runtimes.runtimeList)(
     });
   }
 );
+
+afterAll(async () => {
+  await runtimes.closeAll();
+});