@rex0220/kintone-sql-tools 3.71.0 → 3.72.0

package/README.md

@@ -269,6 +269,8 @@ npm パッケージは 2 つのサブパスを **semver 対象の公開 API**
 | `@rex0220/kintone-sql-tools/engine` | **read-only** のクエリ実行（ダッシュボード等）。書込 API は構造的に遮断 | `runQuery` / `runBatch` / `explainQuery` / `createReadonlyKintoneClient` / `KsqlEngineError` / `version` |
 | `@rex0220/kintone-sql-tools/flow` | **Flow dialect 1**（→ [言語リファレンス §27](docs/ksql_language_reference.md)）のスクリプト解析・検証・**文単位実行**（バッチランナー向け・書込可能） | `parseScript` / `validateScript` / `explainScript`（`asOf`/`timezone` 注入可） / `createExecutionContext`（`onChunkWritten` 書込チャンク通知） / `executeStatement` / `previewStatement`（dry-run 差分プレビュー・書込 0 回） / `disposeExecutionContext` / `createKintoneClient` / `isDmlResult`（`FlowDmlResult` 型ガード） / `version` |
 
+バッチ実行ランナー **kSQL Flow**（`/flow` API を使った公式ランナー・別リポジトリ）: https://github.com/rex0220/ksql-flow
+
 `/flow` の典型的な使い方（1 文ずつ実行して結果で継続判断する）:
 
 ```ts
@@ -289,11 +291,12 @@ try {
 
 ### エンジンバージョン × dialect 対応表
 
-| エンジン | dialect 0（既定・宣言なし） | dialect 1（`-- @ksql dialect: 1`） |
-|---|---|---|
-| 〜 v3.67.0 | ✅ | —（未実装） |
-| v3.68.0 | ✅ | 解析のみ（エンジン内部 API。実行できる出荷面なし・実験的） |
-| v3.69.0 〜 | ✅ | ✅ CLI / MCP / プラグイン / `/flow` で実行可 |
+| エンジン | dialect 0（既定・宣言なし） | dialect 1（`-- @ksql dialect: 1`） | ksql-flow |
+|---|---|---|---|
+| 〜 v3.67.0 | ✅ | —（未実装） | — |
+| v3.68.0 | ✅ | 解析のみ（エンジン内部 API。実行できる出荷面なし・実験的） | — |
+| v3.69.0 〜 v3.70.0 | ✅ | ✅ CLI / MCP / プラグイン / `/flow` で実行可 | — |
+| v3.71.0 〜 | ✅ | ✅ 同上 + `previewStatement` | **0.1.0**（要求: `^3.71.0`） |
 
 dialect は後方互換で管理します: dialect 0 のスクリプトはどのエンジン版でも挙動不変・破壊的変更は dialect 番号の繰り上げでのみ導入します。変更履歴は [CHANGELOG.md](CHANGELOG.md) を参照してください。
 

package/dist-cli/ksql.js

@@ -4161,7 +4161,7 @@ var Parser = class {
     const values = [];
     do {
       this.expect("(" /* LPAREN */);
-      const row = this.parseInsertRow(fields.length);
+      const row = this.parseInsertRow(fields.length, true);
       this.expect(")" /* RPAREN */);
       values.push(row);
     } while (this.consume("," /* COMMA */));
@@ -4222,7 +4222,7 @@ var Parser = class {
     const values = [];
     do {
       this.expect("(" /* LPAREN */);
-      values.push(this.parseInsertRow(fields.length));
+      values.push(this.parseInsertRow(fields.length, false));
       this.expect(")" /* RPAREN */);
     } while (this.consume("," /* COMMA */));
     const keyFields = this.parseOnDuplicate();
@@ -4546,7 +4546,7 @@ var Parser = class {
     this.expect("]" /* RBRACKET */);
     return { type: "ARRAY", elements };
   }
-  parseInsertRow(expectedLen) {
+  parseInsertRow(expectedLen, allowAsOf) {
     const row = [];
     do {
       if (this.peek().kind === "[" /* LBRACKET */) {
@@ -4567,8 +4567,11 @@ var Parser = class {
           row.push({ type: "STRING", value: tok.value });
         } else if (tok.kind === "NUMBER" /* NUMBER */) {
           row.push(makeNumberLiteral(tok.value));
+        } else if (allowAsOf && this.isDialect1AsOfCall(tok)) {
+          row.push(this.finishVariableReference(tok));
         } else {
-          throw new ParseError("INSERT \u306E\u5024\u306B\u306F\u6587\u5B57\u5217\u30FB\u6570\u5024\u30FB\u914D\u5217\u30EA\u30C6\u30E9\u30EB\u30FBCASE WHEN \u304C\u5FC5\u8981\u3067\u3059", tok);
+          const hint = this.isDialect1AsOfCall(tok) ? " INSERT ... VALUES \u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\u3053\u306E\u6587\u578B\u3067\u306F INSERT ... SELECT \u3067\u6CE8\u5165\u3057\u3066\u304F\u3060\u3055\u3044\u3002" : "";
+          throw new ParseError(`INSERT \u306E\u5024\u306B\u306F\u6587\u5B57\u5217\u30FB\u6570\u5024\u30FB\u914D\u5217\u30EA\u30C6\u30E9\u30EB\u30FBCASE WHEN \u304C\u5FC5\u8981\u3067\u3059${hint}`, tok);
         }
       }
     } while (this.consume("," /* COMMA */));
@@ -4580,6 +4583,9 @@ var Parser = class {
     }
     return row;
   }
+  isDialect1AsOfCall(tok) {
+    return this.capabilities.dialect1 === true && tok.kind === "VARIABLE" /* VARIABLE */ && isAsOfFunctionName(tok.value.slice(1).toUpperCase()) && this.peek().kind === "(" /* LPAREN */ && this.peekAt(1).kind === ")" /* RPAREN */;
+  }
   // ----------------------------------------------------------
   // UPDATE
   // ----------------------------------------------------------
@@ -4742,7 +4748,7 @@ var Parser = class {
       const values = [];
       do {
         this.expect("(" /* LPAREN */, "APPEND VALUES \u306E\u5404\u884C\u306F ( \u3067\u59CB\u3081\u3066\u304F\u3060\u3055\u3044");
-        values.push(this.parseInsertRow(fields.length));
+        values.push(this.parseInsertRow(fields.length, false));
         this.expect(")" /* RPAREN */);
       } while (this.consume("," /* COMMA */));
       return { kind: "APPEND", fields, values };
@@ -19266,18 +19272,12 @@ async function executeBatchStatement(context) {
           cacheContext,
           tempTables
         );
-        const first = resolvedStmt2.expr.query.columns[0];
-        let numeric = first?.type === "ARITH_COL" || first?.type === "ARITH_AGG_COL" || first?.type === "WINDOW_COL" && (first.windowKind === void 0 || first.windowKind === "RANKING" || first.windowKind === "AGGREGATE" && (first.aggFunc === "COUNT" || first.aggFunc === "SUM" || first.aggFunc === "AVG")) || first?.type === "AGGREGATE" && (first.func === "COUNT" || first.func === "SUM" || first.func === "AVG" || first.func === "STDDEV_POP" || first.func === "STDDEV_SAMP" || first.func === "VAR_POP" || first.func === "VAR_SAMP" || first.func === "MEDIAN");
-        if (first?.type === "AGGREGATE" && first.func === "MODE" || first?.type === "WINDOW_COL" && first.windowKind === "VALUE" || first?.type === "WINDOW_COL" && first.windowKind === "AGGREGATE" && (first.aggFunc === "MIN" || first.aggFunc === "MAX")) {
-          const meta = (await inferSelectColumnMeta(
-            resolvedStmt2.expr.query,
-            ["__scalar__"],
-            client,
-            cacheContext,
-            tempTables
-          )).get("__scalar__");
-          numeric = meta?.semantics?.compareMode === "number" || meta?.sortKind === "number";
-        }
+        const numeric = await scalarSubqueryHasNumericResult(
+          resolvedStmt2.expr.query,
+          client,
+          cacheContext,
+          tempTables
+        );
         const numberValue = numeric ? Number(value) : Number.NaN;
         variables.set(stmt.name, numeric && Number.isFinite(numberValue) ? { type: "number", value: numberValue, raw: value } : { type: "string", value });
       } catch (e) {
@@ -19762,7 +19762,6 @@ async function executeExit(stmt, client, options, cacheContext, tempTables) {
 }
 async function evaluateAssertCondition(stmt, client, options, cacheContext, tempTables) {
   const left = await evalAssertOperand(stmt.left, client, options, cacheContext, tempTables);
-  const semantics = stmt.left.type === "NUMBER" || stmt.left.type === "ARITH" ? syntheticSemantics("number") : syntheticSemantics("string");
   if (stmt.op === "BETWEEN") {
     if (stmt.low === null || stmt.high === null) {
       throw new Error("ArgumentError: malformed ASSERT statement.");
@@ -19770,35 +19769,49 @@ async function evaluateAssertCondition(stmt, client, options, cacheContext, temp
     const low = await evalAssertOperand(stmt.low, client, options, cacheContext, tempTables);
     const high = await evalAssertOperand(stmt.high, client, options, cacheContext, tempTables);
     return {
-      passed: compareScalarValues(">=", left, low, semantics) && compareScalarValues("<=", left, high, semantics),
-      actual: left
+      passed: compareScalarValues(">=", left.value, low.value, assertComparisonSemantics(left, low)) && compareScalarValues("<=", left.value, high.value, assertComparisonSemantics(left, high)),
+      actual: left.value
     };
   }
   if (stmt.right === null) {
     throw new Error("ArgumentError: malformed ASSERT statement.");
   }
   const right = await evalAssertOperand(stmt.right, client, options, cacheContext, tempTables);
-  return { passed: compareScalarValues(stmt.op, left, right, semantics), actual: left };
+  const semantics = stmt.op === "=" || stmt.op === "!=" || stmt.op === "<>" ? stmt.left.type === "NUMBER" || stmt.left.type === "ARITH" ? syntheticSemantics("number") : syntheticSemantics("string") : assertComparisonSemantics(left, right);
+  return {
+    passed: compareScalarValues(stmt.op, left.value, right.value, semantics),
+    actual: left.value
+  };
+}
+function assertComparisonSemantics(left, right) {
+  return syntheticSemantics(left.semantics === "number" && right.semantics === "number" ? "number" : "string");
 }
 async function evalAssertOperand(operand, client, options, cacheContext, tempTables) {
   switch (operand.type) {
     case "VARIABLE":
       throw new Error(`ParseError: unresolved batch variable @${operand.name}.`);
     case "NUMBER":
-      return numberLiteralText(operand);
+      return { value: numberLiteralText(operand), semantics: "number" };
     case "STRING":
-      return operand.value;
+      return { value: operand.value, semantics: "string" };
     case "ARITH":
-      return String(evalAssertArith(operand));
+      return { value: String(evalAssertArith(operand)), semantics: "number" };
     case "SCALAR_SUBQUERY": {
       try {
-        return await evaluateScalarSubquery(
+        const value = await evaluateScalarSubquery(
           operand.query,
           client,
           options,
           cacheContext,
           tempTables
         );
+        const numeric = await scalarSubqueryHasNumericResult(
+          operand.query,
+          client,
+          cacheContext,
+          tempTables
+        );
+        return { value, semantics: numeric ? "number" : "string" };
       } catch (e) {
         if (e instanceof ScalarSubqueryError) throw new AssertError(e.message);
         throw e;
@@ -19806,6 +19819,21 @@ async function evalAssertOperand(operand, client, options, cacheContext, tempTab
     }
   }
 }
+async function scalarSubqueryHasNumericResult(query, client, cacheContext, tempTables) {
+  const first = query.columns[0];
+  let numeric = first?.type === "ARITH_COL" || first?.type === "ARITH_AGG_COL" || first?.type === "WINDOW_COL" && (first.windowKind === void 0 || first.windowKind === "RANKING" || first.windowKind === "AGGREGATE" && (first.aggFunc === "COUNT" || first.aggFunc === "SUM" || first.aggFunc === "AVG")) || first?.type === "AGGREGATE" && (first.func === "COUNT" || first.func === "SUM" || first.func === "AVG" || first.func === "STDDEV_POP" || first.func === "STDDEV_SAMP" || first.func === "VAR_POP" || first.func === "VAR_SAMP" || first.func === "MEDIAN");
+  if (first?.type === "AGGREGATE" && first.func === "MODE" || first?.type === "WINDOW_COL" && first.windowKind === "VALUE" || first?.type === "WINDOW_COL" && first.windowKind === "AGGREGATE" && (first.aggFunc === "MIN" || first.aggFunc === "MAX")) {
+    const meta = (await inferSelectColumnMeta(
+      query,
+      ["__scalar__"],
+      client,
+      cacheContext,
+      tempTables
+    )).get("__scalar__");
+    numeric = meta?.semantics?.compareMode === "number" || meta?.sortKind === "number";
+  }
+  return numeric;
+}
 async function evaluateScalarSubquery(sourceQuery, client, options, cacheContext, tempTables) {
   const { query, probed } = withScalarProbeLimit(sourceQuery);
   const result = await runSubquery(query, client, options, cacheContext, tempTables);
@@ -25905,6 +25933,9 @@ function buildSubtableReorderPutParams(appId, parentId, revision, subtableCode,
   };
 }
 function valueToString(value) {
+  if (value.type === "VARIABLE") {
+    throw new Error(`InternalError: unresolved variable @${value.name} reached INSERT evaluation.`);
+  }
   if (value.type === "STRING") return value.value;
   if (value.type === "NUMBER") return numberLiteralText(value);
   if (value.type === "CASE_VALUE") return evalCaseWhen(value.expr, {});