@stamhoofd/sql 2.46.0 → 2.48.0

package/src/SQLExpressions.ts

@@ -1,128 +1,128 @@
-import { isSQLExpression, joinSQLQuery, SQLExpression, SQLExpressionOptions, SQLQuery } from "./SQLExpression";
-import {Database} from "@simonbackx/simple-database"
+import { Database } from '@simonbackx/simple-database';
+import { joinSQLQuery, SQLExpression, SQLExpressionOptions, SQLQuery } from './SQLExpression';
 
-export type SQLScalarValue = string|number|boolean|Date;
-export type SQLDynamicExpression = SQLScalarValue|SQLScalarValue[]|null|SQLExpression
+export type SQLScalarValue = string | number | boolean | Date;
+export type SQLDynamicExpression = SQLScalarValue | SQLScalarValue[] | null | SQLExpression;
 
-export function scalarToSQLJSONExpression(s: SQLScalarValue|null): SQLExpression {
+export function scalarToSQLExpression(s: SQLScalarValue | null): SQLExpression {
     if (s === null) {
-        return new SQLJSONValue(null)
+        return new SQLNull();
     }
 
-    if (s === true) {
-        return new SQLJSONValue(true)
-    }
-
-    if (s === false) {
-        return new SQLJSONValue(false)
-    }
-
-    return new SQLScalar(s)
-}
-
-export function scalarToSQLExpression(s: SQLScalarValue|null): SQLExpression {
-    if (s === null) {
-        return new SQLNull()
-    }
-
-    return new SQLScalar(s)
+    return new SQLScalar(s);
 }
 
 export function readDynamicSQLExpression(s: SQLDynamicExpression): SQLExpression {
     if (Array.isArray(s)) {
-        return new SQLArray(s)
+        return new SQLArray(s);
     }
     if (s === null) {
-        return new SQLNull()
+        return new SQLNull();
     }
 
     if (typeof s === 'object' && !(s instanceof Date)) {
         return s;
     }
 
-    return new SQLScalar(s)
+    return new SQLScalar(s);
 }
 export class SQLDistinct implements SQLExpression {
-    expression: SQLExpression
+    expression: SQLExpression;
 
     constructor(expression: SQLExpression) {
-        this.expression = expression
+        this.expression = expression;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'DISTINCT',
             this.expression.getSQL(options),
-        ])
+        ]);
     }
 }
 export class SQLCount implements SQLExpression {
-    expression: SQLExpression|null
+    expression: SQLExpression | null;
 
-    constructor(expression: SQLExpression|null = null) {
-        this.expression = expression
+    constructor(expression: SQLExpression | null = null) {
+        this.expression = expression;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'COUNT(',
-                this.expression ? this.expression.getSQL(options) : '*',
-            ')'
-        ])
+            this.expression ? this.expression.getSQL(options) : '*',
+            ')',
+        ]);
+    }
+}
+
+export class SQLLower implements SQLExpression {
+    expression: SQLExpression;
+
+    constructor(expression: SQLExpression) {
+        this.expression = expression;
+    }
+
+    getSQL(options?: SQLExpressionOptions): SQLQuery {
+        return joinSQLQuery([
+            'LOWER(',
+            this.expression.getSQL(options),
+            ')',
+        ]);
     }
 }
 
 export class SQLPlusSign implements SQLExpression {
     getSQL(): SQLQuery {
-        return '+'
+        return '+';
     }
 }
 
 export class SQLMultiplicationSign implements SQLExpression {
     getSQL(): SQLQuery {
-        return '*'
+        return '*';
     }
 }
 
 export class SQLMinusSign implements SQLExpression {
     getSQL(): SQLQuery {
-        return '-'
+        return '-';
     }
 }
 
 export class SQLCalculation implements SQLExpression {
-    expressions: SQLExpression[]
+    expressions: SQLExpression[];
 
     constructor(...expressions: SQLExpression[]) {
-        this.expressions = expressions
+        this.expressions = expressions;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
-        return joinSQLQuery(this.expressions.map(e => e.getSQL(options)), ' ')
+        return joinSQLQuery(this.expressions.map(e => e.getSQL(options)), ' ');
     }
 }
 
 export class SQLSum implements SQLExpression {
-    expression: SQLExpression
+    expression: SQLExpression;
 
     constructor(expression: SQLExpression) {
-        this.expression = expression
+        this.expression = expression;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'SUM(',
-                this.expression.getSQL(options),
-            ')'
-        ])
+            this.expression.getSQL(options),
+            ')',
+        ]);
     }
 }
 export class SQLSelectAs implements SQLExpression {
-    expression: SQLExpression
-    as: SQLAlias
+    expression: SQLExpression;
+    as: SQLAlias;
 
     constructor(expression: SQLExpression, as: SQLAlias) {
-        this.expression = expression
+        this.expression = expression;
         this.as = as;
     }
 
@@ -130,17 +130,17 @@ export class SQLSelectAs implements SQLExpression {
         return joinSQLQuery([
             this.expression.getSQL(options),
             ' AS ',
-            this.as.getSQL(options)
-        ])
+            this.as.getSQL(options),
+        ]);
     }
 }
 
 export class SQLAssignment implements SQLExpression {
-    key: SQLExpression
-    value: SQLExpression
+    key: SQLExpression;
+    value: SQLExpression;
 
     constructor(key: SQLExpression, value: SQLExpression) {
-        this.key = key
+        this.key = key;
         this.value = value;
     }
 
@@ -148,61 +148,58 @@ export class SQLAssignment implements SQLExpression {
         return joinSQLQuery([
             this.key.getSQL(options),
             ' = ',
-            this.value.getSQL(options)
-        ])
+            this.value.getSQL(options),
+        ]);
     }
 }
 
-
 export class SQLAlias implements SQLExpression {
     name: string;
 
     constructor(name: string) {
-        this.name = name
+        this.name = name;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
-        return Database.escapeId(this.name) ;
+        return Database.escapeId(this.name);
     }
 }
 
-
 export class SQLConcat implements SQLExpression {
     expressions: SQLExpression[];
 
     constructor(...expressions: SQLExpression[]) {
-        this.expressions = expressions
+        this.expressions = expressions;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'CONCAT(',
             joinSQLQuery(this.expressions.map(e => e.getSQL(options)), ', '),
-            ')'
-        ])
+            ')',
+        ]);
     }
 }
 
-
 export class SQLAge implements SQLExpression {
     expression: SQLExpression;
 
     constructor(expression: SQLExpression) {
-        this.expression = expression
+        this.expression = expression;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'TIMESTAMPDIFF(YEAR, ',
             this.expression.getSQL(options),
-            ', CURDATE())'
-        ])
+            ', CURDATE())',
+        ]);
     }
 }
 
 export class SQLCast implements SQLExpression {
-    value: SQLExpression
-    as = 'CHAR'
+    value: SQLExpression;
+    as = 'CHAR';
 
     constructor(value: SQLExpression, as = 'CHAR') {
         this.value = value;
@@ -212,23 +209,23 @@ export class SQLCast implements SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'CAST( ',
-                this.value.getSQL(options),
+            this.value.getSQL(options),
             ' AS ',
-                this.as,
-            ')'
-        ])
+            this.as,
+            ')',
+        ]);
     }
 }
 
 export class SQLJSONValue implements SQLExpression {
-    value: null|true|false;
+    value: null | true | false;
 
-    constructor(value: null|true|false) {
+    constructor(value: null | true | false) {
         this.value = value;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
-        return "CAST('"+JSON.stringify(this.value)+"' AS JSON)";
+        return "CAST('" + JSON.stringify(this.value) + "' AS JSON)";
     }
 }
 
@@ -248,22 +245,22 @@ export class SQLScalar implements SQLExpression {
     value: SQLScalarValue;
 
     constructor(value: SQLScalarValue) {
-        this.value = value
+        this.value = value;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return {
             query: '?',
-            params: [this.value]
-        }
+            params: [this.value],
+        };
     }
 }
 
 export class SQLSafeValue implements SQLExpression {
-    value: string|number;
+    value: string | number;
 
-    constructor(value: string|number) {
-        this.value = value
+    constructor(value: string | number) {
+        this.value = value;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
@@ -271,19 +268,18 @@ export class SQLSafeValue implements SQLExpression {
     }
 }
 
-
 export class SQLArray implements SQLExpression {
     value: SQLScalarValue[];
 
     constructor(value: SQLScalarValue[]) {
-        this.value = value
+        this.value = value;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return {
             query: '(?)',
-            params: [this.value]
-        }
+            params: [this.value],
+        };
     }
 }
 
@@ -291,11 +287,11 @@ export class SQLWildcardSelectExpression implements SQLExpression {
     namespace?: string;
 
     constructor(namespace?: string) {
-        this.namespace = namespace
+        this.namespace = namespace;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
-        return Database.escapeId(this.namespace ?? options?.defaultNamespace ?? '') + '.*'
+        return Database.escapeId(this.namespace ?? options?.defaultNamespace ?? '') + '.*';
     }
 }
 
@@ -310,12 +306,12 @@ export class SQLColumnExpression implements SQLExpression {
             this.column = namespaceOrColumn;
             return;
         }
-        this.namespace = namespaceOrColumn
-        this.column = column
+        this.namespace = namespaceOrColumn;
+        this.column = column;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
-        return Database.escapeId(this.namespace ?? options?.defaultNamespace ?? '') + '.' + Database.escapeId(this.column)
+        return Database.escapeId(this.namespace ?? options?.defaultNamespace ?? '') + '.' + Database.escapeId(this.column);
     }
 }
 
@@ -330,14 +326,14 @@ export class SQLTableExpression implements SQLExpression {
             this.table = namespaceOrTable;
             return;
         }
-        this.namespace = namespaceOrTable
-        this.table = table
+        this.namespace = namespaceOrTable;
+        this.table = table;
     }
 
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         if (!this.namespace) {
-            return Database.escapeId(this.table)
+            return Database.escapeId(this.table);
         }
-        return Database.escapeId(this.table) + ' ' + Database.escapeId(this.namespace)
+        return Database.escapeId(this.table) + ' ' + Database.escapeId(this.namespace);
     }
 }

package/src/SQLJsonExpressions.ts

@@ -1,9 +1,25 @@
-import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from "./SQLExpression";
-import { SQLSafeValue } from "./SQLExpressions";
-import { SQLWhere } from "./SQLWhere";
+import { SQLExpression, SQLExpressionOptions, SQLQuery, joinSQLQuery } from './SQLExpression';
+import { SQLJSONValue, SQLSafeValue, SQLScalar, SQLScalarValue } from './SQLExpressions';
+import { SQLWhere } from './SQLWhere';
+
+export function scalarToSQLJSONExpression(s: SQLScalarValue | null): SQLExpression {
+    if (s === null) {
+        return new SQLJSONValue(null);
+    }
+
+    if (s === true) {
+        return new SQLJSONValue(true);
+    }
+
+    if (s === false) {
+        return new SQLJSONValue(false);
+    }
+
+    return new SQLScalar(s);
+}
 
 export class SQLJsonUnquote implements SQLExpression {
-    target: SQLExpression
+    target: SQLExpression;
 
     constructor(target: SQLExpression) {
         this.target = target;
@@ -12,9 +28,9 @@ export class SQLJsonUnquote implements SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'JSON_UNQUOTE(',
-                this.target.getSQL(options),
-            ')'
-        ])
+            this.target.getSQL(options),
+            ')',
+        ]);
     }
 }
 
@@ -22,8 +38,8 @@ export class SQLJsonUnquote implements SQLExpression {
  * Same as target->path, JSON_EXTRACT(target, path)
  */
 export class SQLJsonExtract implements SQLExpression {
-    target: SQLExpression
-    path: SQLExpression
+    target: SQLExpression;
+    path: SQLExpression;
 
     constructor(target: SQLExpression, path: SQLExpression) {
         this.target = target;
@@ -33,17 +49,17 @@ export class SQLJsonExtract implements SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'JSON_EXTRACT(',
-                this.target.getSQL(options),
-                ',',
-                this.path.getSQL(options),
-            ')'
-        ])
+            this.target.getSQL(options),
+            ',',
+            this.path.getSQL(options),
+            ')',
+        ]);
     }
 }
 
 export class SQLJsonLength implements SQLExpression {
-    target: SQLExpression
-    path?: SQLExpression
+    target: SQLExpression;
+    path?: SQLExpression;
 
     constructor(target: SQLExpression, path?: SQLExpression) {
         this.target = target;
@@ -53,25 +69,27 @@ export class SQLJsonLength implements SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'JSON_LENGTH(',
-                this.target.getSQL(options),
-                ...(this.path ? [
-                    ',',
-                    this.path.getSQL(options),
-                ] : []),
-            ')'
-        ])
+            this.target.getSQL(options),
+            ...(this.path
+                ? [
+                        ',',
+                        this.path.getSQL(options),
+                    ]
+                : []),
+            ')',
+        ]);
     }
 }
 /**
  * JSON_SEARCH(json_doc, one_or_all, search_str[, escape_char[, path] ...])
  */
 export class SQLJsonSearch implements SQLExpression {
-    target: SQLExpression
-    oneOrAll: 'one'|'all'
+    target: SQLExpression;
+    oneOrAll: 'one' | 'all';
     searchStr: SQLExpression;
-    path: SQLExpression|null;
+    path: SQLExpression | null;
 
-    constructor(target: SQLExpression, oneOrAll: 'one'|'all', searchStr: SQLExpression, path: SQLExpression|null = null) {
+    constructor(target: SQLExpression, oneOrAll: 'one' | 'all', searchStr: SQLExpression, path: SQLExpression | null = null) {
         this.target = target;
         this.oneOrAll = oneOrAll;
         this.searchStr = searchStr;
@@ -81,17 +99,19 @@ export class SQLJsonSearch implements SQLExpression {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'JSON_SEARCH(',
-                this.target.getSQL(options),
-                ',',
-                new SQLSafeValue(this.oneOrAll).getSQL(options),
-                ',',
-                this.searchStr.getSQL(options),
-                ...(this.path ? [
-                    ',', 
-                    this.path.getSQL(options)
-                ] : []),
-            ')'
-        ])
+            this.target.getSQL(options),
+            ',',
+            new SQLSafeValue(this.oneOrAll).getSQL(options),
+            ',',
+            this.searchStr.getSQL(options),
+            ...(this.path
+                ? [
+                        ',',
+                        this.path.getSQL(options),
+                    ]
+                : []),
+            ')',
+        ]);
     }
 }
 
@@ -99,12 +119,12 @@ export class SQLJsonSearch implements SQLExpression {
  * JSON_CONTAINS(target, candidate[, path])
  */
 export class SQLJsonContains extends SQLWhere {
-    target: SQLExpression
+    target: SQLExpression;
     candidate: SQLExpression;
-    path: SQLExpression|null;
+    path: SQLExpression | null;
 
-    constructor(target: SQLExpression, candidate: SQLExpression, path: SQLExpression|null = null) {
-        super()
+    constructor(target: SQLExpression, candidate: SQLExpression, path: SQLExpression | null = null) {
+        super();
         this.target = target;
         this.candidate = candidate;
         this.path = path;
@@ -113,28 +133,29 @@ export class SQLJsonContains extends SQLWhere {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'JSON_CONTAINS(',
-                this.target.getSQL(options),
-                ',',
-                this.candidate.getSQL(options),
-                ...(this.path ? [
-                    ',', 
-                    this.path.getSQL(options)
-                ] : []),
-            ')'
-        ])
+            this.target.getSQL(options),
+            ',',
+            this.candidate.getSQL(options),
+            ...(this.path
+                ? [
+                        ',',
+                        this.path.getSQL(options),
+                    ]
+                : []),
+            ')',
+        ]);
     }
 }
 
-
 /**
  * JSON_CONTAINS(json_doc1, json_doc2)
  */
 export class SQLJsonOverlaps extends SQLWhere {
-    jsonDoc1: SQLExpression
+    jsonDoc1: SQLExpression;
     jsonDoc2: SQLExpression;
 
     constructor(jsonDoc1: SQLExpression, jsonDoc2: SQLExpression) {
-        super()
+        super();
         this.jsonDoc1 = jsonDoc1;
         this.jsonDoc2 = jsonDoc2;
     }
@@ -142,10 +163,10 @@ export class SQLJsonOverlaps extends SQLWhere {
     getSQL(options?: SQLExpressionOptions): SQLQuery {
         return joinSQLQuery([
             'JSON_OVERLAPS(',
-                this.jsonDoc1.getSQL(options),
-                ',',
-                this.jsonDoc2.getSQL(options),
-            ')'
-        ])
+            this.jsonDoc1.getSQL(options),
+            ',',
+            this.jsonDoc2.getSQL(options),
+            ')',
+        ]);
     }
 }