Add math functions

jakubknejzlik · Jan 31, 2024 · 0502a0b · 0502a0b
1 parent ad0e2d7
commit 0502a0b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/Function.test.ts b/src/Function.test.ts
@@ -8,6 +8,14 @@ describe("Expression", () => {
   it("should produce valid SQL", () => {
     expect(Fn.sum("foo").toSQL(flavor)).toEqual("SUM(`foo`)");
     expect(Fn.max("foo").toSQL(flavor)).toEqual("MAX(`foo`)");
+    expect(Fn.add("foo", "blah").toSQL(flavor)).toEqual("(`foo` + `blah`)");
+    expect(Fn.subtract("foo", "blah").toSQL(flavor)).toEqual(
+      "(`foo` - `blah`)"
+    );
+    expect(Fn.multiply("foo", "blah").toSQL(flavor)).toEqual(
+      "(`foo` * `blah`)"
+    );
+    expect(Fn.divide("foo", "blah").toSQL(flavor)).toEqual("(`foo` / `blah`)");
     expect(Fn.ifnull("foo", `123`).toSQL(flavor)).toEqual("IFNULL(`foo`,123)");
     expect(Fn.ifnull("foo", Q.S`123`).toSQL(flavor)).toEqual(
       'IFNULL(`foo`,"123")'

diff --git a/src/Function.ts b/src/Function.ts
@@ -9,6 +9,26 @@ const formatDayjs = (dayjs: Dayjs) => dayjs.format("YYYY-MM-DD");
 const defaultFlavor = new MySQLFlavor();
 
 export const Function = {
+  add: (...columns: ExpressionValue[]) => {
+    return Q.expr(
+      `(${columns.map((v) => Expression.escapeExpressionValue(v)).join(" + ")})`
+    );
+  },
+  subtract: (...columns: ExpressionValue[]) => {
+    return Q.expr(
+      `(${columns.map((v) => Expression.escapeExpressionValue(v)).join(" - ")})`
+    );
+  },
+  divide: (...columns: ExpressionValue[]) => {
+    return Q.expr(
+      `(${columns.map((v) => Expression.escapeExpressionValue(v)).join(" / ")})`
+    );
+  },
+  multiply: (...columns: ExpressionValue[]) => {
+    return Q.expr(
+      `(${columns.map((v) => Expression.escapeExpressionValue(v)).join(" * ")})`
+    );
+  },
   sum: (column: ExpressionValue) => {
     return Q.expr(`SUM(${Expression.escapeExpressionValue(column)})`);
   },