@malloydata/malloy 0.0.143-dev240418162623 → 0.0.143-dev240419025427

package/dist/dialect/dialect.d.ts

@@ -55,6 +55,7 @@ export declare abstract class Dialect {
     supportsSelectReplace: boolean;
     supportsComplexFilteredSources: boolean;
     supportsTempTables: boolean;
+    hasModOperator: boolean;
     abstract getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
     abstract quoteTablePath(tablePath: string): string;
     abstract sqlGroupSetTable(groupSetCount: number): string;

package/dist/dialect/dialect.js

@@ -78,6 +78,7 @@ class Dialect {
         this.supportsComplexFilteredSources = true;
         // can create temp tables
         this.supportsTempTables = true;
+        this.hasModOperator = true;
     }
     sqlFinalStage(_lastStageName, _fields) {
         throw new Error('Dialect has no final Stage but called Anyway');
@@ -116,6 +117,12 @@ class Dialect {
                 }
                 return (0, malloy_types_1.mkExpr) `${df.numerator}/${df.denominator}`;
             }
+            case 'mod': {
+                if (this.hasModOperator) {
+                    return (0, malloy_types_1.mkExpr) `${df.numerator}%${df.denominator}`;
+                }
+                return (0, malloy_types_1.mkExpr) `mod(${df.numerator},${df.denominator})`;
+            }
             case 'timeLiteral': {
                 return [
                     this.sqlLiteralTime(qi, df.literal, df.literalType, df.timezone),

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

@@ -21,6 +21,7 @@ export declare class StandardSQLDialect extends Dialect {
     supportsSafeCast: boolean;
     supportsNesting: boolean;
     cantPartitionWindowFunctionsOnExpressions: boolean;
+    hasModOperator: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     sqlAnyValue(groupSet: number, fieldName: string): string;

package/dist/dialect/standardsql/standardsql.js

@@ -93,6 +93,7 @@ class StandardSQLDialect extends dialect_1.Dialect {
         this.supportsSafeCast = true;
         this.supportsNesting = true;
         this.cantPartitionWindowFunctionsOnExpressions = true;
+        this.hasModOperator = false;
         this.keywords = `
   ALL
   AND

package/dist/lang/ast/types/expression-def.js

@@ -399,10 +399,10 @@ function applyBinary(fs, left, op, right) {
     if (oneOf(op, '+', '-')) {
         return delta(fs, left, op, right);
     }
-    if (oneOf(op, '*', '%')) {
+    if (op === '*') {
         return numeric(fs, left, op, right);
     }
-    if (oneOf(op, '/')) {
+    if (oneOf(op, '/', '%')) {
         const num = left.getExpression(fs);
         const denom = right.getExpression(fs);
         const noGo = unsupportError(left, num, right, denom);
@@ -414,15 +414,15 @@ function applyBinary(fs, left, op, right) {
         if (err)
             return err;
         if (num.dataType !== 'number') {
-            left.log('Numerator for division must be a number');
+            left.log('Numerator must be a number');
         }
         else if (denom.dataType !== 'number') {
-            right.log('Denominator for division must be a number');
+            right.log('Denominator must be a number');
         }
         else {
             const div = {
                 type: 'dialect',
-                function: 'div',
+                function: op === '/' ? 'div' : 'mod',
                 numerator: num.value,
                 denominator: denom.value,
             };

package/dist/model/malloy_query.js

@@ -1591,6 +1591,7 @@ class QueryQuery extends QueryField {
                     case 'now':
                         break;
                     case 'div':
+                    case 'mod':
                         expressions.push(expr.denominator);
                         expressions.push(expr.numerator);
                         break;

package/dist/model/malloy_types.d.ts

@@ -230,8 +230,8 @@ export interface RegexpMatchFragment extends DialectFragmentBase {
     expr: Expr;
     regexp: Expr;
 }
-export interface DivFragment extends DialectFragmentBase {
-    function: 'div';
+export interface DivModFragment extends DialectFragmentBase {
+    function: 'div' | 'mod';
     numerator: Expr;
     denominator: Expr;
 }
@@ -253,7 +253,7 @@ export interface NumberLiteralFragment extends DialectFragmentBase {
     function: 'numberLiteral';
     literal: string;
 }
-export type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | StringLiteralFragment | RegexpLiteralFragment | NumberLiteralFragment | RegexpMatchFragment;
+export type DialectFragment = DivModFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | StringLiteralFragment | RegexpLiteralFragment | NumberLiteralFragment | RegexpMatchFragment;
 export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | SourceReferenceFragment | SqlStringFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | AggregateOrderByFragment | AggregateLimitFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
 export type Expr = Fragment[];
 export interface TypedValue {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.143-dev240418162623",
+  "version": "0.0.143-dev240419025427",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",