@malloydata/malloy 0.0.237-dev250223010918 → 0.0.237-dev250224203840

package/dist/dialect/dialect.d.ts

@@ -1,4 +1,4 @@
-import { Expr, Sampling, AtomicTypeDef, MeasureTimeExpr, TimeTruncExpr, TimeExtractExpr, TimeDeltaExpr, TypecastExpr, RegexMatchExpr, TimeLiteralNode, RecordLiteralNode, ArrayLiteralNode, LeafAtomicTypeDef, OrderBy } from '../model/malloy_types';
+import { Expr, Sampling, AtomicTypeDef, MeasureTimeExpr, TimeTruncExpr, TimeExtractExpr, TimeDeltaExpr, TypecastExpr, RegexMatchExpr, TimeLiteralNode, RecordLiteralNode, ArrayLiteralNode, LeafAtomicTypeDef, OrderBy, BinaryExpr } from '../model/malloy_types';
 import { DialectFunctionOverloadDef } from './functions';
 type DialectFieldTypes = string | 'struct';
 interface DialectField {
@@ -65,6 +65,7 @@ export declare abstract class Dialect {
     nestedArrays: boolean;
     compoundObjectInSchema: boolean;
     booleanAsNumbers: boolean;
+    likeEscape: boolean;
     abstract getDialectFunctionOverrides(): {
         [name: string]: DialectFunctionOverloadDef[];
     };
@@ -138,5 +139,6 @@ export declare abstract class Dialect {
         dstTypeDef: LeafAtomicTypeDef | undefined;
         dstSQLType: string;
     };
+    likeExpr(expr: BinaryExpr): string;
 }
 export {};

package/dist/dialect/dialect.js

@@ -91,6 +91,8 @@ class Dialect {
         this.compoundObjectInSchema = true;
         // No true boolean type, e.g. true=1 and false=0, set this to true
         this.booleanAsNumbers = false;
+        // Like characters are escaped with ESCAPE clause
+        this.likeEscape = true;
     }
     sqlFinalStage(_lastStageName, _fields) {
         throw new Error('Dialect has no final Stage but called Anyway');
@@ -223,6 +225,22 @@ class Dialect {
             dstSQLType: this.malloyTypeToSQLType(cast.dstType),
         };
     }
+    likeExpr(expr) {
+        const isLike = expr.kids.right;
+        if (expr.node === 'like' || expr.node === '!like') {
+            const likeOp = expr.node === '!like' ? 'NOT LIKE' : 'LIKE';
+            if (this.likeEscape && isLike.node === 'stringLiteral') {
+                const likeStr = isLike.literal;
+                if (likeStr.includes('\\')) {
+                    const escapeUp = likeStr.replace(/\^/g, '^^');
+                    const newLikeStr = escapeUp.replace(/\\/g, '^');
+                    return `${expr.kids.left.sql} ${likeOp} '${newLikeStr}' ESCAPE '^'`;
+                }
+            }
+            return `${expr.kids.left.sql} ${likeOp} ${isLike.sql}`;
+        }
+        return 'false';
+    }
 }
 exports.Dialect = Dialect;
 //# sourceMappingURL=dialect.js.map

package/dist/dialect/standardsql/standardsql.d.ts

@@ -25,6 +25,7 @@ export declare class StandardSQLDialect extends Dialect {
     hasModOperator: boolean;
     nestedArrays: boolean;
     supportsHyperLogLog: boolean;
+    likeEscape: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;

package/dist/dialect/standardsql/standardsql.js

@@ -99,6 +99,7 @@ class StandardSQLDialect extends dialect_1.Dialect {
         this.hasModOperator = false;
         this.nestedArrays = false; // Can't have an array of arrays for some reason
         this.supportsHyperLogLog = true;
+        this.likeEscape = false; // Uses \ instead of ESCAPE 'X' in like clauses
     }
     quoteTablePath(tablePath) {
         return `\`${tablePath}\``;

package/dist/lang/lib/Malloy/MalloyLexer.d.ts

@@ -106,66 +106,67 @@ export declare class MalloyLexer extends Lexer {
     static readonly WITH = 101;
     static readonly YEAR = 102;
     static readonly UNGROUPED = 103;
-    static readonly STRING_ESCAPE = 104;
-    static readonly HACKY_REGEX = 105;
-    static readonly SQ_STRING = 106;
-    static readonly DQ_STRING = 107;
-    static readonly BQ_STRING = 108;
-    static readonly DOC_ANNOTATION = 109;
-    static readonly ANNOTATION = 110;
-    static readonly AMPER = 111;
-    static readonly ARROW = 112;
-    static readonly FAT_ARROW = 113;
-    static readonly OPAREN = 114;
-    static readonly CPAREN = 115;
-    static readonly OBRACK = 116;
-    static readonly CBRACK = 117;
-    static readonly OCURLY = 118;
-    static readonly CCURLY = 119;
-    static readonly DOUBLECOLON = 120;
-    static readonly TRIPLECOLON = 121;
-    static readonly EXCLAM = 122;
-    static readonly COLON = 123;
-    static readonly COMMA = 124;
-    static readonly DOT = 125;
-    static readonly LT = 126;
-    static readonly GT = 127;
-    static readonly EQ = 128;
-    static readonly NE = 129;
-    static readonly LTE = 130;
-    static readonly GTE = 131;
-    static readonly PLUS = 132;
-    static readonly MINUS = 133;
-    static readonly STAR = 134;
-    static readonly STARSTAR = 135;
-    static readonly SLASH = 136;
-    static readonly BAR = 137;
-    static readonly SEMI = 138;
-    static readonly NOT_MATCH = 139;
-    static readonly MATCH = 140;
-    static readonly PERCENT = 141;
-    static readonly DOUBLE_QMARK = 142;
-    static readonly QMARK = 143;
-    static readonly LITERAL_TIMESTAMP = 144;
-    static readonly LITERAL_HOUR = 145;
-    static readonly LITERAL_DAY = 146;
-    static readonly LITERAL_QUARTER = 147;
-    static readonly LITERAL_MONTH = 148;
-    static readonly LITERAL_WEEK = 149;
-    static readonly LITERAL_YEAR = 150;
-    static readonly IDENTIFIER = 151;
-    static readonly PERCENT_LITERAL = 152;
-    static readonly NUMERIC_LITERAL = 153;
-    static readonly INTEGER_LITERAL = 154;
-    static readonly BLOCK_COMMENT = 155;
-    static readonly COMMENT_TO_EOL = 156;
-    static readonly WHITE_SPACE = 157;
-    static readonly SQL_BEGIN = 158;
-    static readonly CLOSE_CODE = 159;
-    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 160;
-    static readonly UNEXPECTED_CHAR = 161;
-    static readonly OPEN_CODE = 162;
-    static readonly SQL_END = 163;
+    static readonly HACKY_REGEX = 104;
+    static readonly RAW_SQ = 105;
+    static readonly RAW_DQ = 106;
+    static readonly SQ_STRING = 107;
+    static readonly DQ_STRING = 108;
+    static readonly BQ_STRING = 109;
+    static readonly DOC_ANNOTATION = 110;
+    static readonly ANNOTATION = 111;
+    static readonly AMPER = 112;
+    static readonly ARROW = 113;
+    static readonly FAT_ARROW = 114;
+    static readonly OPAREN = 115;
+    static readonly CPAREN = 116;
+    static readonly OBRACK = 117;
+    static readonly CBRACK = 118;
+    static readonly OCURLY = 119;
+    static readonly CCURLY = 120;
+    static readonly DOUBLECOLON = 121;
+    static readonly TRIPLECOLON = 122;
+    static readonly EXCLAM = 123;
+    static readonly COLON = 124;
+    static readonly COMMA = 125;
+    static readonly DOT = 126;
+    static readonly LT = 127;
+    static readonly GT = 128;
+    static readonly EQ = 129;
+    static readonly NE = 130;
+    static readonly LTE = 131;
+    static readonly GTE = 132;
+    static readonly PLUS = 133;
+    static readonly MINUS = 134;
+    static readonly STAR = 135;
+    static readonly STARSTAR = 136;
+    static readonly SLASH = 137;
+    static readonly BAR = 138;
+    static readonly SEMI = 139;
+    static readonly NOT_MATCH = 140;
+    static readonly MATCH = 141;
+    static readonly PERCENT = 142;
+    static readonly DOUBLE_QMARK = 143;
+    static readonly QMARK = 144;
+    static readonly LITERAL_TIMESTAMP = 145;
+    static readonly LITERAL_HOUR = 146;
+    static readonly LITERAL_DAY = 147;
+    static readonly LITERAL_QUARTER = 148;
+    static readonly LITERAL_MONTH = 149;
+    static readonly LITERAL_WEEK = 150;
+    static readonly LITERAL_YEAR = 151;
+    static readonly IDENTIFIER = 152;
+    static readonly PERCENT_LITERAL = 153;
+    static readonly NUMERIC_LITERAL = 154;
+    static readonly INTEGER_LITERAL = 155;
+    static readonly BLOCK_COMMENT = 156;
+    static readonly COMMENT_TO_EOL = 157;
+    static readonly WHITE_SPACE = 158;
+    static readonly SQL_BEGIN = 159;
+    static readonly CLOSE_CODE = 160;
+    static readonly UNWATED_CHARS_TRAILING_NUMBERS = 161;
+    static readonly UNEXPECTED_CHAR = 162;
+    static readonly OPEN_CODE = 163;
+    static readonly SQL_END = 164;
     static readonly SQL_MODE = 1;
     static readonly channelNames: string[];
     static readonly modeNames: string[];