@steedos/odata-v4-typeorm 1.20.0 → 2.2.27

package/{build/lib → lib}/visitor.js

@@ -1,303 +1,309 @@
-"use strict";
-const odata_v4_literal_1 = require("odata-v4-literal");
-const visitor_1 = require("odata-v4-sql/lib/visitor");
-class TypeOrmVisitor extends visitor_1.Visitor {
-    constructor(options) {
-        super(options);
-        //parameters:any[] = [];
-        this.includes = [];
-        this.alias = ''; // 'typeorm_query';
-        if (!options.type) {
-            this.type = visitor_1.SQLLang.Oracle;
-        }
-        else {
-            this.type = options.type;
-        }
-        this.alias = options.alias || this.alias;
-    }
-    from(table) {
-        let sql = `SELECT ${this.select} FROM [${table}] WHERE ${this.where} ORDER BY ${this.orderby}`;
-        switch (this.type) {
-            case visitor_1.SQLLang.Oracle:
-                if (typeof this.skip == "number")
-                    sql += ` OFFSET ${this.skip} ROWS`;
-                if (typeof this.limit == "number") {
-                    if (typeof this.skip != "number")
-                        sql += " OFFSET 0 ROWS";
-                    sql += ` FETCH NEXT ${this.limit} ROWS ONLY`;
-                }
-            case visitor_1.SQLLang.MsSql:
-                if (typeof this.orderby !== "string" || this.orderby === "1") {
-                    this.orderby = "(select null) ASC";
-                }
-                let start = this.skip ? this.skip : 0;
-                let end = start + this.limit;
-                sql = `SELECT * from (SELECT ${this.select}, ROW_NUMBER() OVER(ORDER BY ${this.orderby}) AS RowId 
-          FROM [${table}] WHERE ${this.where}) as a WHERE RowId BETWEEN ${start} + 1 and ${end}`;
-                break;
-            case visitor_1.SQLLang.MySql:
-            case visitor_1.SQLLang.PostgreSql:
-            default:
-                if (typeof this.limit == "number")
-                    sql += ` LIMIT ${this.limit}`;
-                if (typeof this.skip == "number")
-                    sql += ` OFFSET ${this.skip}`;
-                break;
-        }
-        // 给sql语句中字段名称增加中括号，防止字段名称使用了数据库的关键字
-        sql = sql.replace(/(\b\w+\b)\.(\b\w+\b)/g, '[$1].[$2]');
-        return sql;
-    }
-    asMsSql() {
-        this.type = visitor_1.SQLLang.MsSql;
-        let rx = new RegExp("\\?", "g");
-        let keys = this.parameters.keys();
-        this.originalWhere = this.where;
-        this.where = this.where.replace(rx, () => `:${keys.next().value}`);
-        this.includes.forEach((item) => item.asMsSql());
-        return this;
-    }
-    asPostgreSql() {
-        this.type = visitor_1.SQLLang.ANSI;
-        let rx = new RegExp("\\?", "g");
-        let keys = this.parameters.keys();
-        this.originalWhere = this.where;
-        this.where = this.where.replace(rx, () => `:${keys.next().value}`);
-        this.includes.forEach((item) => item.asPostgreSql());
-        return this;
-    }
-    asType() {
-        switch (this.type) {
-            case visitor_1.SQLLang.MsSql: return this.asMsSql();
-            case visitor_1.SQLLang.ANSI:
-            case visitor_1.SQLLang.MySql:
-            case visitor_1.SQLLang.PostgreSql: return this.asPostgreSql();
-            case visitor_1.SQLLang.Oracle: return this.asOracleSql();
-            default: return this;
-        }
-    }
-    VisitExpand(node, context) {
-        node.value.items.forEach((item) => {
-            let expandPath = item.value.path.raw;
-            let visitor = this.includes.filter(v => v.navigationProperty == expandPath)[0];
-            if (!visitor) {
-                visitor = new TypeOrmVisitor(this.options);
-                visitor.parameterSeed = this.parameterSeed;
-                this.includes.push(visitor);
-            }
-            visitor.Visit(item);
-            this.parameterSeed = visitor.parameterSeed;
-        });
-    }
-    VisitSelectItem(node, context) {
-        let item = node.raw.replace(/\//g, '.');
-        this.select += this.getIdentifier(item, context.identifier); //`${this.alias}.${item}`;
-    }
-    VisitODataIdentifier(node, context) {
-        if (context.identifier && context.identifier.endsWith('.')) {
-            this[context.target] += '.';
-        }
-        if (node.value.name === 'NULL') {
-            this[context.target] += node.value.name;
-        }
-        else {
-            const ident = this.getIdentifier(node.value.name, context); //`${this.alias ? this.alias + '.' : ''}${node.value.name}`;
-            this[context.target] += ident;
-        }
-        context.identifier = node.value.name;
-    }
-    getIdentifier(originalIdentifier, context) {
-        let alias = '';
-        if (!context || !context.identifier || !context.identifier.endsWith('.')) {
-            alias = this.alias + '.';
-        }
-        else {
-            this[context.target] = this[context.target].replace(new RegExp(this.alias + '.' + context.identifier, 'g'), context.identifier);
-        }
-        return `${alias}${originalIdentifier}`;
-    }
-    ;
-    VisitEqualsExpression(node, context) {
-        this.Visit(node.value.left, context);
-        this.where += ' = ';
-        this.Visit(node.value.right, context);
-        if (this.options.useParameters && context.literal == null) {
-            this.where = this.where.replace(/= :p\d*$/, 'IS NULL')
-                .replace(new RegExp(`\\:p\\d* = ${context.identifier}$`), `${context.identifier} IS NULL`);
-        }
-        else if (context.literal == 'NULL') {
-            this.where = this.where.replace(/= NULL$/, 'IS NULL')
-                .replace(new RegExp(`NULL = ${context.identifier}$`), `${context.identifier} IS NULL`);
-        }
-    }
-    VisitNotEqualsExpression(node, context) {
-        this.Visit(node.value.left, context);
-        this.where += ' <> ';
-        this.Visit(node.value.right, context);
-        if (this.options.useParameters && context.literal == null) {
-            this.where = this.where.replace(/<> :p\d*$/, 'IS NOT NULL')
-                .replace(new RegExp(`\\:p\\d* <> ${context.identifier}$`), `${context.identifier} IS NOT NULL`);
-        }
-        else if (context.literal == 'NULL') {
-            this.where = this.where.replace(/<> NULL$/, 'IS NOT NULL')
-                .replace(new RegExp(`NULL <> ${context.identifier}$`), `${context.identifier} IS NOT NULL`);
-        }
-    }
-    VisitLiteral(node, context) {
-        if (this.options.useParameters) {
-            let name = `p${this.parameterSeed++}`;
-            let value = odata_v4_literal_1.Literal.convert(node.value, node.raw);
-            context.literal = value;
-            if (context.literal != null) {
-                this.parameters.set(name, value);
-            }
-            this.where += `:${name}`;
-        }
-        else
-            this.where += (context.literal = visitor_1.SQLLiteral.convert(node.value, node.raw));
-    }
-    VisitNotExpression(node, context) {
-        if (node.value && node.value.type === "MethodCallExpression" && node.value.value.method) {
-            node.value.value.method = `not ${node.value.value.method}`;
-            this.VisitMethodCallExpression(node.value, context);
-        }
-    }
-    VisitMethodCallExpression(node, context) {
-        var method = node.value.method;
-        var params = node.value.parameters || [];
-        switch (method) {
-            case "contains":
-                this.Visit(params[0], context);
-                if (this.options.useParameters) {
-                    let name = `p${this.parameterSeed++}`;
-                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
-                    this.parameters.set(name, `%${value}%`);
-                    this.where += " like ?";
-                }
-                else
-                    this.where += ` like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-                break;
-            case "not contains":
-                this.Visit(params[0], context);
-                if (this.options.useParameters) {
-                    let name = `p${this.parameterSeed++}`;
-                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
-                    this.parameters.set(name, `%${value}%`);
-                    this.where += " not like ?";
-                }
-                else
-                    this.where += ` not like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-                break;
-            case "endswith":
-                this.Visit(params[0], context);
-                if (this.options.useParameters) {
-                    let name = `p${this.parameterSeed++}`;
-                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
-                    this.parameters.set(name, `%${value}`);
-                    this.where += " like ?";
-                }
-                else
-                    this.where += ` like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}'`;
-                break;
-            case "not endswith":
-                this.Visit(params[0], context);
-                if (this.options.useParameters) {
-                    let name = `p${this.parameterSeed++}`;
-                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
-                    this.parameters.set(name, `%${value}`);
-                    this.where += " not like ?";
-                }
-                else
-                    this.where += ` not like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}'`;
-                break;
-            case "startswith":
-                this.Visit(params[0], context);
-                if (this.options.useParameters) {
-                    let name = `p${this.parameterSeed++}`;
-                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
-                    this.parameters.set(name, `${value}%`);
-                    this.where += " like ?";
-                }
-                else
-                    this.where += ` like '${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-                break;
-            case "not startswith":
-                this.Visit(params[0], context);
-                if (this.options.useParameters) {
-                    let name = `p${this.parameterSeed++}`;
-                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
-                    this.parameters.set(name, `${value}%`);
-                    this.where += " not like ?";
-                }
-                else
-                    this.where += ` not like '${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-                break;
-            case "indexof":
-                let fn = "";
-                switch (this.type) {
-                    case visitor_1.SQLLang.MsSql:
-                        fn = "CHARINDEX";
-                        break;
-                    case visitor_1.SQLLang.ANSI:
-                    case visitor_1.SQLLang.MySql:
-                    case visitor_1.SQLLang.PostgreSql:
-                    default:
-                        fn = "INSTR";
-                        break;
-                }
-                if (fn === "CHARINDEX") {
-                    const tmp = params[0];
-                    params[0] = params[1];
-                    params[1] = tmp;
-                }
-                this.where += `${fn}(`;
-                this.Visit(params[0], context);
-                this.where += ', ';
-                this.Visit(params[1], context);
-                this.where += ") - 1";
-                break;
-            case "round":
-                this.where += "ROUND(";
-                this.Visit(params[0], context);
-                this.where += ")";
-                break;
-            case "length":
-                this.where += "LEN(";
-                this.Visit(params[0], context);
-                this.where += ")";
-                break;
-            case "tolower":
-                this.where += "LOWER(";
-                this.Visit(params[0], context);
-                this.where += ")";
-                break;
-            case "toupper":
-                this.where += "UPPER(";
-                this.Visit(params[0], context);
-                this.where += ")";
-                break;
-            case "floor":
-            case "ceiling":
-            case "year":
-            case "month":
-            case "day":
-            case "hour":
-            case "minute":
-            case "second":
-                this.where += `${method.toUpperCase()}(`;
-                this.Visit(params[0], context);
-                this.where += ")";
-                break;
-            case "now":
-                this.where += "NOW()";
-                break;
-            case "trim":
-                this.where += "TRIM(' ' FROM ";
-                this.Visit(params[0], context);
-                this.where += ")";
-                break;
-        }
-    }
-}
-exports.TypeOrmVisitor = TypeOrmVisitor;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeOrmVisitor = void 0;
+const odata_v4_literal_1 = require("odata-v4-literal");
+const visitor_1 = require("odata-v4-sql/lib/visitor");
+// import {SqlOptions} from './index';
+class TypeOrmVisitor extends visitor_1.Visitor {
+    constructor(options) {
+        super(options);
+        //parameters:any[] = [];
+        this.includes = [];
+        this.alias = ''; // 'typeorm_query';
+        if (!options.type) {
+            this.type = visitor_1.SQLLang.Oracle;
+        }
+        else {
+            this.type = options.type;
+        }
+        this.alias = options.alias || this.alias;
+    }
+    from(table) {
+        let sql = `SELECT ${this.select} FROM [${table}] WHERE ${this.where} ORDER BY ${this.orderby}`;
+        switch (this.type) {
+            case visitor_1.SQLLang.Oracle:
+                if (typeof this.skip == "number")
+                    sql += ` OFFSET ${this.skip} ROWS`;
+                if (typeof this.limit == "number") {
+                    if (typeof this.skip != "number")
+                        sql += " OFFSET 0 ROWS";
+                    sql += ` FETCH NEXT ${this.limit} ROWS ONLY`;
+                }
+            case visitor_1.SQLLang.MsSql:
+                if (typeof this.orderby !== "string" || this.orderby === "1") {
+                    this.orderby = "(select null) ASC";
+                }
+                let start = this.skip ? this.skip : 0;
+                let end = start + this.limit;
+                sql = `SELECT * from (SELECT ${this.select}, ROW_NUMBER() OVER(ORDER BY ${this.orderby}) AS RowId 
+          FROM [${table}] WHERE ${this.where}) as a WHERE RowId BETWEEN ${start} + 1 and ${end}`;
+                break;
+            case visitor_1.SQLLang.MySql:
+            case visitor_1.SQLLang.PostgreSql:
+            default:
+                if (typeof this.limit == "number")
+                    sql += ` LIMIT ${this.limit}`;
+                if (typeof this.skip == "number")
+                    sql += ` OFFSET ${this.skip}`;
+                break;
+        }
+        // 给sql语句中字段名称增加中括号，防止字段名称使用了数据库的关键字
+        sql = sql.replace(/(\b\w+\b)\.(\b\w+\b)/g, '[$1].[$2]');
+        return sql;
+    }
+    asMsSql() {
+        this.type = visitor_1.SQLLang.MsSql;
+        let rx = new RegExp("\\?", "g");
+        let keys = this.parameters.keys();
+        this.originalWhere = this.where;
+        this.where = this.where.replace(rx, () => `:${keys.next().value}`);
+        this.includes.forEach((item) => item.asMsSql());
+        return this;
+    }
+    asPostgreSql() {
+        this.type = visitor_1.SQLLang.ANSI;
+        let rx = new RegExp("\\?", "g");
+        let keys = this.parameters.keys();
+        this.originalWhere = this.where;
+        this.where = this.where.replace(rx, () => `:${keys.next().value}`);
+        this.includes.forEach((item) => item.asPostgreSql());
+        return this;
+    }
+    asType() {
+        switch (this.type) {
+            case visitor_1.SQLLang.MsSql: return this.asMsSql();
+            case visitor_1.SQLLang.ANSI:
+            case visitor_1.SQLLang.MySql:
+            case visitor_1.SQLLang.PostgreSql: return this.asPostgreSql();
+            case visitor_1.SQLLang.Oracle: return this.asOracleSql();
+            default: return this;
+        }
+    }
+    VisitExpand(node, context) {
+        node.value.items.forEach((item) => {
+            let expandPath = item.value.path.raw;
+            let visitor = this.includes.filter(v => v.navigationProperty == expandPath)[0];
+            if (!visitor) {
+                visitor = new TypeOrmVisitor(this.options);
+                visitor.parameterSeed = this.parameterSeed;
+                this.includes.push(visitor);
+            }
+            visitor.Visit(item);
+            this.parameterSeed = visitor.parameterSeed;
+        });
+    }
+    VisitSelectItem(node, context) {
+        let item = node.raw.replace(/\//g, '.');
+        this.select += this.getIdentifier(item, context.identifier); //`${this.alias}.${item}`;
+    }
+    VisitODataIdentifier(node, context) {
+        if (context.identifier && context.identifier.endsWith('.')) {
+            this[context.target] += '.';
+        }
+        if (node.value.name === 'NULL') {
+            this[context.target] += node.value.name;
+        }
+        else {
+            const ident = this.getIdentifier(node.value.name, context); //`${this.alias ? this.alias + '.' : ''}${node.value.name}`;
+            this[context.target] += ident;
+        }
+        context.identifier = /*this.getIdentifier(node.value.name, context); //*/ node.value.name;
+    }
+    getIdentifier(originalIdentifier, context) {
+        let alias = '';
+        if (!context || !context.identifier || !context.identifier.endsWith('.')) {
+            alias = this.alias + '.';
+        }
+        else {
+            this[context.target] = this[context.target].replace(new RegExp(this.alias + '.' + context.identifier, 'g'), context.identifier);
+        }
+        return `${alias}${originalIdentifier}`;
+    }
+    ;
+    VisitEqualsExpression(node, context) {
+        this.Visit(node.value.left, context);
+        this.where += ' = ';
+        this.Visit(node.value.right, context);
+        if (this.options.useParameters && context.literal == null) {
+            this.where = this.where.replace(/= :p\d*$/, 'IS NULL')
+                .replace(new RegExp(`\\:p\\d* = ${context.identifier}$`), `${context.identifier} IS NULL`);
+        }
+        else if (context.literal == 'NULL') {
+            this.where = this.where.replace(/= NULL$/, 'IS NULL')
+                .replace(new RegExp(`NULL = ${context.identifier}$`), `${context.identifier} IS NULL`);
+        }
+    }
+    VisitNotEqualsExpression(node, context) {
+        this.Visit(node.value.left, context);
+        this.where += ' <> ';
+        this.Visit(node.value.right, context);
+        if (this.options.useParameters && context.literal == null) {
+            this.where = this.where.replace(/<> :p\d*$/, 'IS NOT NULL')
+                .replace(new RegExp(`\\:p\\d* <> ${context.identifier}$`), `${context.identifier} IS NOT NULL`);
+        }
+        else if (context.literal == 'NULL') {
+            this.where = this.where.replace(/<> NULL$/, 'IS NOT NULL')
+                .replace(new RegExp(`NULL <> ${context.identifier}$`), `${context.identifier} IS NOT NULL`);
+        }
+    }
+    VisitLiteral(node, context) {
+        if (this.options.useParameters) {
+            let name = `p${this.parameterSeed++}`;
+            let value = odata_v4_literal_1.Literal.convert(node.value, node.raw);
+            context.literal = value;
+            if (context.literal != null) {
+                this.parameters.set(name, value);
+            }
+            // this.where += `:${name}`;
+            // 因为useParameters为true，所以这里不可以把where追加为:p1这种格式，因为asOracleSql、asPostgreSql等用了正则替换?占位的方式重新设置:p{index}值
+            // 如果把where追加为:p1这种格式，已知的问题是VisitMethodCallExpression函数中的包括contains在内的所有method都只能写在过滤条件的最前面，而不可以写在后面的位置
+            this.where += `?`;
+        }
+        else
+            this.where += (context.literal = visitor_1.SQLLiteral.convert(node.value, node.raw));
+    }
+    VisitNotExpression(node, context) {
+        if (node.value && node.value.type === "MethodCallExpression" && node.value.value.method) {
+            node.value.value.method = `not ${node.value.value.method}`;
+            this.VisitMethodCallExpression(node.value, context);
+        }
+    }
+    VisitMethodCallExpression(node, context) {
+        var method = node.value.method;
+        var params = node.value.parameters || [];
+        switch (method) {
+            case "contains":
+                this.Visit(params[0], context);
+                if (this.options.useParameters) {
+                    let name = `p${this.parameterSeed++}`;
+                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
+                    this.parameters.set(name, `%${value}%`);
+                    this.where += " like ?";
+                }
+                else
+                    this.where += ` like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
+                break;
+            case "not contains":
+                this.Visit(params[0], context);
+                if (this.options.useParameters) {
+                    let name = `p${this.parameterSeed++}`;
+                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
+                    this.parameters.set(name, `%${value}%`);
+                    this.where += " not like ?";
+                }
+                else
+                    this.where += ` not like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
+                break;
+            case "endswith":
+                this.Visit(params[0], context);
+                if (this.options.useParameters) {
+                    let name = `p${this.parameterSeed++}`;
+                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
+                    this.parameters.set(name, `%${value}`);
+                    this.where += " like ?";
+                }
+                else
+                    this.where += ` like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}'`;
+                break;
+            case "not endswith":
+                this.Visit(params[0], context);
+                if (this.options.useParameters) {
+                    let name = `p${this.parameterSeed++}`;
+                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
+                    this.parameters.set(name, `%${value}`);
+                    this.where += " not like ?";
+                }
+                else
+                    this.where += ` not like '%${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}'`;
+                break;
+            case "startswith":
+                this.Visit(params[0], context);
+                if (this.options.useParameters) {
+                    let name = `p${this.parameterSeed++}`;
+                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
+                    this.parameters.set(name, `${value}%`);
+                    this.where += " like ?";
+                }
+                else
+                    this.where += ` like '${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
+                break;
+            case "not startswith":
+                this.Visit(params[0], context);
+                if (this.options.useParameters) {
+                    let name = `p${this.parameterSeed++}`;
+                    let value = odata_v4_literal_1.Literal.convert(params[1].value, params[1].raw);
+                    this.parameters.set(name, `${value}%`);
+                    this.where += " not like ?";
+                }
+                else
+                    this.where += ` not like '${visitor_1.SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
+                break;
+            case "indexof":
+                let fn = "";
+                switch (this.type) {
+                    case visitor_1.SQLLang.MsSql:
+                        fn = "CHARINDEX";
+                        break;
+                    case visitor_1.SQLLang.ANSI:
+                    case visitor_1.SQLLang.MySql:
+                    case visitor_1.SQLLang.PostgreSql:
+                    default:
+                        fn = "INSTR";
+                        break;
+                }
+                if (fn === "CHARINDEX") {
+                    const tmp = params[0];
+                    params[0] = params[1];
+                    params[1] = tmp;
+                }
+                this.where += `${fn}(`;
+                this.Visit(params[0], context);
+                this.where += ', ';
+                this.Visit(params[1], context);
+                this.where += ") - 1";
+                break;
+            case "round":
+                this.where += "ROUND(";
+                this.Visit(params[0], context);
+                this.where += ")";
+                break;
+            case "length":
+                this.where += "LEN(";
+                this.Visit(params[0], context);
+                this.where += ")";
+                break;
+            case "tolower":
+                this.where += "LOWER(";
+                this.Visit(params[0], context);
+                this.where += ")";
+                break;
+            case "toupper":
+                this.where += "UPPER(";
+                this.Visit(params[0], context);
+                this.where += ")";
+                break;
+            case "floor":
+            case "ceiling":
+            case "year":
+            case "month":
+            case "day":
+            case "hour":
+            case "minute":
+            case "second":
+                this.where += `${method.toUpperCase()}(`;
+                this.Visit(params[0], context);
+                this.where += ")";
+                break;
+            case "now":
+                this.where += "NOW()";
+                break;
+            case "trim":
+                this.where += "TRIM(' ' FROM ";
+                this.Visit(params[0], context);
+                this.where += ")";
+                break;
+        }
+    }
+}
+exports.TypeOrmVisitor = TypeOrmVisitor;
 //# sourceMappingURL=visitor.js.map