Add Flavor escapeUnion method

jakubknejzlik · Apr 22, 2024 · 5c0a6c8 · 5c0a6c8
1 parent aeb4377
commit 5c0a6c8
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 85 deletions.
diff --git a/src/Flavor.ts b/src/Flavor.ts
@@ -1,5 +1,6 @@
 import { ConditionValue } from "./Condition";
 import { FunctionExpression, OperationExpression } from "./Expression";
+import { UnionType } from "./Query";
 
 export interface ISQLFlavor {
   escapeColumn(name: string, legacy?: boolean): string;
@@ -8,4 +9,5 @@ export interface ISQLFlavor {
   escapeLimitAndOffset(limit?: number, offset?: number): string;
   escapeFunction(fn: FunctionExpression): string;
   escapeOperation(fn: OperationExpression): string;
+  escapeUnion(unionType: UnionType, leftSQL: string, rightSQL: string): string;
 }
diff --git a/src/Query.ts b/src/Query.ts
@@ -414,8 +414,11 @@ export class SelectQuery extends SelectBaseQuery implements ISerializable {
     sql += flavor.escapeLimitAndOffset(this._limit, this._offset);
 
     this._unionQueries.forEach((unionQuery) => {
-      sql =
-        `(` + sql + `) ${unionQuery.type} (${unionQuery.query.toSQL(flavor)})`;
+      sql = flavor.escapeUnion(
+        unionQuery.type,
+        sql,
+        unionQuery.query.toSQL(flavor)
+      );
     });
     return sql;
   }

diff --git a/src/flavors/aws-timestream.ts b/src/flavors/aws-timestream.ts
@@ -1,6 +1,6 @@
-import { MySQLFlavor } from "./mysql";
+import { DefaultFlavor } from "./default";
 
-export class AWSTimestreamFlavor extends MySQLFlavor {
+export class AWSTimestreamFlavor extends DefaultFlavor {
   protected columnQuotes = `"`;
   protected stringQuotes = `'`;
   escapeLimitAndOffset(limit?: number, offset?: number): string {

diff --git a/src/flavors/default.ts b/src/flavors/default.ts
@@ -0,0 +1,86 @@
+import { isDayjs } from "dayjs";
+import { ConditionValue } from "../Condition";
+import {
+  Expression,
+  FunctionExpression,
+  OperationExpression,
+} from "../Expression";
+import { ISQLFlavor } from "../Flavor";
+import { UnionType } from "../Query";
+
+export class DefaultFlavor implements ISQLFlavor {
+  protected columnQuotes = "`";
+  protected stringQuotes = `"`;
+
+  escapeColumn(name: string, legacyParsing?: boolean): string {
+    if (name === "NULL") {
+      return name;
+    }
+    if (legacyParsing) {
+      const columnMatch = name.match(/^[\.a-zA-Z0-9_]+$/);
+      if (columnMatch) {
+        return `${this.columnQuotes}${name
+          .replace(
+            new RegExp(`/${this.columnQuotes}/`, "g"),
+            `${this.columnQuotes}${this.columnQuotes}`
+          )
+          .split(".")
+          .join(`${this.columnQuotes}.${this.columnQuotes}`)}${
+          this.columnQuotes
+        }`;
+      }
+      return `${name}`;
+    }
+    return `${this.columnQuotes}${name
+      .split(".")
+      .join(`${this.columnQuotes}.${this.columnQuotes}`)}${this.columnQuotes}`;
+  }
+
+  escapeTable(table: string): string {
+    if (table.indexOf("-") !== -1) {
+      return `${this.columnQuotes}${table}${this.columnQuotes}`;
+    }
+    return this.escapeColumn(table);
+  }
+
+  escapeValue(value: ConditionValue): string {
+    if (isDayjs(value)) {
+      return `${this.stringQuotes}${value.format("YYYY-MM-DD HH:mm:ss")}${
+        this.stringQuotes
+      }`;
+    }
+    if (typeof value === "string") {
+      return `${this.stringQuotes}${value}${this.stringQuotes}`;
+    }
+    return `${value}`;
+  }
+
+  escapeLimitAndOffset(limit?: number, offset?: number): string {
+    let str = "";
+    if (limit !== undefined) {
+      str += ` LIMIT ${limit}`;
+    }
+    if (offset !== undefined) {
+      str += ` OFFSET ${offset}`;
+    }
+    return str;
+  }
+  escapeFunction(fn: FunctionExpression): string {
+    const args = fn.value
+      .map((x) => Expression.deserialize(x).toSQL(this))
+      .join(",");
+    return `${fn.name}(${args})`;
+  }
+  escapeOperation(fn: OperationExpression): string {
+    return (
+      "(" +
+      fn.value
+        .map((x) => Expression.deserialize(x).toSQL(this))
+        .join(` ${fn.operation} `) +
+      ")"
+    );
+  }
+  escapeUnion(unionType: UnionType, leftSQL: string, rightSQL: string): string {
+    return `(${leftSQL}) ${unionType} (${rightSQL})`;
+  }
+}
diff --git a/src/flavors/mysql.ts b/src/flavors/mysql.ts
@@ -1,82 +1,3 @@
-import { isDayjs } from "dayjs";
-import { ConditionValue } from "../Condition";
-import {
-  Expression,
-  FunctionExpression,
-  OperationExpression,
-} from "../Expression";
-import { ISQLFlavor } from "../Flavor";
+import { DefaultFlavor } from "./default";
 
-export class MySQLFlavor implements ISQLFlavor {
-  protected columnQuotes = "`";
-  protected stringQuotes = `"`;
-
-  escapeColumn(name: string, legacyParsing?: boolean): string {
-    if (name === "NULL") {
-      return name;
-    }
-    if (legacyParsing) {
-      const columnMatch = name.match(/^[\.a-zA-Z0-9_]+$/);
-      if (columnMatch) {
-        return `${this.columnQuotes}${name
-          .replace(
-            new RegExp(`/${this.columnQuotes}/`, "g"),
-            `${this.columnQuotes}${this.columnQuotes}`
-          )
-          .split(".")
-          .join(`${this.columnQuotes}.${this.columnQuotes}`)}${
-          this.columnQuotes
-        }`;
-      }
-      return `${name}`;
-    }
-    return `${this.columnQuotes}${name
-      .split(".")
-      .join(`${this.columnQuotes}.${this.columnQuotes}`)}${this.columnQuotes}`;
-  }
-
-  escapeTable(table: string): string {
-    if (table.indexOf("-") !== -1) {
-      return `${this.columnQuotes}${table}${this.columnQuotes}`;
-    }
-    return this.escapeColumn(table);
-  }
-
-  escapeValue(value: ConditionValue): string {
-    if (isDayjs(value)) {
-      return `${this.stringQuotes}${value.format("YYYY-MM-DD HH:mm:ss")}${
-        this.stringQuotes
-      }`;
-    }
-    if (typeof value === "string") {
-      return `${this.stringQuotes}${value}${this.stringQuotes}`;
-    }
-    return `${value}`;
-  }
-
-  escapeLimitAndOffset(limit?: number, offset?: number): string {
-    let str = "";
-    if (limit !== undefined) {
-      str += ` LIMIT ${limit}`;
-    }
-    if (offset !== undefined) {
-      str += ` OFFSET ${offset}`;
-    }
-    return str;
-  }
-  escapeFunction(fn: FunctionExpression): string {
-    const args = fn.value
-      .map((x) => Expression.deserialize(x).toSQL(this))
-      .join(",");
-    return `${fn.name}(${args})`;
-  }
-  escapeOperation(fn: OperationExpression): string {
-    return (
-      "(" +
-      fn.value
-        .map((x) => Expression.deserialize(x).toSQL(this))
-        .join(` ${fn.operation} `) +
-      ")"
-    );
-  }
-}
+export class MySQLFlavor extends DefaultFlavor {}