parse INTERVAL; add test cases

ava.config.mjs

@@ -11,7 +11,7 @@ export default {
  nonSemVerExperiments: {
  nextGenConfig: true,
  },
- files: ["packages/*/test/**/*.spec.ts"],
+ files: ["packages/analytics-engine/test/**/*.spec.ts"],
  timeout: "5m",
  nodeArguments: ["--no-warnings", "--experimental-vm-modules"],
  typescript: {

packages/analytics-engine/src/engine.ts

@@ -106,8 +106,8 @@ export class AnalyticsEngine {
  constructor(name: string, db: SqliteDB) {
  this.#name = name;
  this.#db = db;
- buildSQLFunctions(db);
  db.exec(analytics.replaceAll("{{BINDING}}", name));
+ buildSQLFunctions(db);
  }
 
  async writeDataPoint({
@@ -168,7 +168,7 @@ export class AnalyticsEngine {
  blobsValues.push(`@${key}`);
  });
 
- const insert = this.#db.prepare(
+ const input = prepare(
  `INSERT INTO ${this.#name} (dataset, index1${
  doublesKeys.length > 0 ? `, ${doublesKeys}` : ""
  }${
@@ -177,7 +177,33 @@ export class AnalyticsEngine {
  doublesValues.length > 0 ? `, ${doublesValues}` : ""
  }${blobsValues.length > 0 ? `, ${blobsValues}` : ""})`
  );
+ const insert = this.#db.prepare(input);
 
  insert.run(insertData);
  }
 }
+
+/** @internal */
+export function prepare(input: string): string {
+ // split
+ const pieces = input.split(" ");
+ // find all instances of "INTERVAL"
+ const intervalIndexes = [];
+ for (let i = 0, pl = pieces.length; i < pl; i++) {
+ if (pieces[i].toLocaleLowerCase() === "interval") {
+ intervalIndexes.push(i);
+ }
+ }
+ // for each instance, convert "INTERVAL X Y" to "INTERVAL(X, Y)"
+ for (const intervalIndex of intervalIndexes) {
+ const [interval, value, type] = pieces.slice(
+ intervalIndex,
+ intervalIndex + 3
+ );
+ pieces[intervalIndex] = `${interval}(`;
+ pieces[intervalIndex + 1] = `${value.replaceAll("'", "")},`;
+ pieces[intervalIndex + 2] = `'${type.replaceAll("'", "").toUpperCase()}')`;
+ }
+
+ return pieces.join(" ");
+}

packages/analytics-engine/src/functions.ts

@@ -1,12 +1,13 @@
 import { SqliteDB } from "@miniflare/shared";
 
-export type IntervalTypes =
- | "SECOND"
- | "MINUTE"
- | "HOUR"
- | "DAY"
- | "MONTH"
- | "YEAR";
+const TIME = {
+ SECOND: 1,
+ MINUTE: 60, // 60sec
+ HOUR: 60 * 60, // 60sec * 60min
+ DAY: 60 * 60 * 24, // 60sec * 60min * 24hours
+ MONTH: 60 * 60 * 24 * 30, // 60sec * 60min * 24hours
+ YEAR: 60 * 60 * 24 * 365,
+};
 
 export default function buildSQLFunctions(sqliteDB: SqliteDB) {
  // https://clickhouse.com/docs/en/sql-reference/aggregate-functions/reference/quantileexactweighted/
@@ -55,13 +56,15 @@ export default function buildSQLFunctions(sqliteDB: SqliteDB) {
  // https://clickhouse.com/docs/en/sql-reference/data-types/special-data-types/interval
  sqliteDB.function(
  "INTERVAL",
- (intervalValue: string | number, IntervalTypes: string): number => {
+ (
+ intervalValue: string | number,
+ IntervalType: keyof typeof TIME
+ ): number => {
  if (typeof intervalValue === "string") {
  intervalValue = parseInt(intervalValue);
  }
- console.log("NUMBER", intervalValue);
- console.log("TYPE", IntervalTypes);
- return 0;
+ const multiplier = TIME[IntervalType] ?? 0;
+ return intervalValue * multiplier;
  }
  );
 }

packages/analytics-engine/test/functions.spec.ts

@@ -1,4 +1,4 @@
-import { AnalyticsEngine } from "@miniflare/analytics-engine";
+import { AnalyticsEngine, prepare } from "@miniflare/analytics-engine";
 import { Storage } from "@miniflare/shared";
 import { testClock } from "@miniflare/shared-test";
 import { MemoryStorage } from "@miniflare/storage-memory";
@@ -90,10 +90,38 @@ test("Analytics Engine: Test each function to ensure they work.", async (t) => {
  const res8 = stmt8.get("a3cd45");
  t.true(isDate(res8.answer));
 
- // // test INTERVAL
- // const stmt9 = sqliteDB.prepare(
- // "SELECT INTERVAL 42 DAY AS answer FROM TEST_BINDING WHERE index1 = ?"
- // );
- // const res9 = stmt9.get("a3cd45");
- // t.true(isDate(res9.answer));
+ // test INTERVAL
+ const stmt9Input = prepare(
+ "SELECT INTERVAL 42 DAY AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt9 = sqliteDB.prepare(stmt9Input);
+ const res9 = stmt9.get("a3cd45");
+ t.is(res9.answer, 42 * 60 * 60 * 24);
+
+ // test INTERVAL with comments
+ const stmt10Input = prepare(
+ "SELECT INTERVAL '42' DAY AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt10 = sqliteDB.prepare(stmt10Input);
+ const res10 = stmt10.get("a3cd45");
+ t.is(res10.answer, 42 * 60 * 60 * 24);
+
+ // test INTERVAL with comments 2
+ const stmt11Input = prepare(
+ "SELECT INTERVAL 42 'DAY' AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt11 = sqliteDB.prepare(stmt11Input);
+ const res11 = stmt11.get("a3cd45");
+ t.is(res11.answer, 42 * 60 * 60 * 24);
+
+ // test INTERVAL with comments 3
+ const stmt12Input = prepare(
+ "SELECT INTERVAL '42 DAY' AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt12 = sqliteDB.prepare(stmt12Input);
+ const res12 = stmt12.get("a3cd45");
+ t.is(res12.answer, 42 * 60 * 60 * 24);
+
+ // TODO: test SECOND, MINUTE, ...
+ // TODO: test if not the right word
 });