interval, complete test cases

packages/analytics-engine/src/functions.ts

@@ -1,12 +1,13 @@
 import { SqliteDB } from "@miniflare/shared";
 
+// https://github.com/ClickHouse/ClickHouse/blob/master/src/Common/IntervalKind.cpp#L13
 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,
+ HOUR: 3600, // 60sec * 60min
+ DAY: 86400, // 60sec * 60min * 24hours
+ MONTH: 2_629_746, // Exactly 1/12 of a year
+ YEAR: 31_556_952, // The average length of a Gregorian year is equal to 365.2425 days
 };
 
 export default function buildSQLFunctions(sqliteDB: SqliteDB) {
@@ -58,12 +59,13 @@ export default function buildSQLFunctions(sqliteDB: SqliteDB) {
  "INTERVAL",
  (
  intervalValue: string | number,
- IntervalType: keyof typeof TIME
- ): number => {
+ intervalType: keyof typeof TIME
+ ): number | null => {
  if (typeof intervalValue === "string") {
  intervalValue = parseInt(intervalValue);
  }
- const multiplier = TIME[IntervalType] ?? 0;
+ const multiplier = TIME[intervalType];
+ if (multiplier === undefined) return null;
  return intervalValue * multiplier;
  }
  );

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

@@ -122,6 +122,51 @@ test("Analytics Engine: Test each function to ensure they work.", async (t) => {
  const res12 = stmt12.get("a3cd45");
  t.is(res12.answer, 42 * 60 * 60 * 24);
 
- // TODO: test SECOND, MINUTE, ...
- // TODO: test if not the right word
+ // test INTERVAL SECOND
+ const stmt13Input = prepare(
+ "SELECT INTERVAL 42 SECOND AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt13 = sqliteDB.prepare(stmt13Input);
+ const res13 = stmt13.get("a3cd45");
+ t.is(res13.answer, 42);
+
+ // test INTERVAL MINUTE
+ const stmt14Input = prepare(
+ "SELECT INTERVAL 42 MINUTE AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt14 = sqliteDB.prepare(stmt14Input);
+ const res14 = stmt14.get("a3cd45");
+ t.is(res14.answer, 42 * 60);
+
+ // test INTERVAL HOUR
+ const stmt15Input = prepare(
+ "SELECT INTERVAL 42 HOUR AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt15 = sqliteDB.prepare(stmt15Input);
+ const res15 = stmt15.get("a3cd45");
+ t.is(res15.answer, 42 * 60 * 60);
+
+ // test INTERVAL MONTH
+ const stmt16Input = prepare(
+ "SELECT INTERVAL 2 MONTH AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt16 = sqliteDB.prepare(stmt16Input);
+ const res16 = stmt16.get("a3cd45");
+ t.is(res16.answer, 2 * 2_629_746);
+
+ // test INTERVAL YEAR
+ const stmt17Input = prepare(
+ "SELECT INTERVAL 2 YEAR AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt17 = sqliteDB.prepare(stmt17Input);
+ const res17 = stmt17.get("a3cd45");
+ t.is(res17.answer, 2 * 31_556_952);
+
+ // test INTERVAL BAD INPUT
+ const stmt18Input = prepare(
+ "SELECT INTERVAL 1 UNKNOWN AS answer FROM TEST_BINDING WHERE index1 = ?"
+ );
+ const stmt18 = sqliteDB.prepare(stmt18Input);
+ const res18 = stmt18.get("a3cd45");
+ t.is(res18.answer, null);
 });