squel 6.2.1 → 6.3.0

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "squel",
-  version: "6.2.1",
+  version: "6.3.0",
   description: "SQL query string builder",
   keywords: [
     "sql",
@@ -1215,7 +1215,7 @@ function _buildSquel(flavour = null) {
     _toParamString(options = {}) {
       let totalStr = "";
       const totalValues = [];
-      for (const { type, table, alias, condition } of this._joins) {
+      for (const { type, table, alias, condition, isApply } of this._joins) {
         totalStr = _pad(totalStr, this.options.separator);
         let tableStr;
         if (cls.isSquelBuilder(table)) {
@@ -1228,7 +1228,11 @@ function _buildSquel(flavour = null) {
         } else {
           tableStr = this._formatTableName(table);
         }
-        totalStr += `${type} JOIN ${tableStr}`;
+        if (isApply) {
+          totalStr += `${type} ${tableStr}`;
+        } else {
+          totalStr += `${type} JOIN ${tableStr}`;
+        }
         if (alias)
           totalStr += ` ${this._formatTableAlias(alias)}`;
         if (condition) {
@@ -2029,6 +2033,29 @@ squel.flavours.mssql = (_squel) => {
       return { text: totalStr, values: [] };
     }
   };
+  cls.MssqlJoinBlock = class extends cls.JoinBlock {
+    apply(table, alias = null, type = "CROSS") {
+      table = this._sanitizeTable(table, true);
+      alias = alias ? this._sanitizeTableAlias(alias) : alias;
+      let applyType = type.toUpperCase();
+      if (!applyType.endsWith("APPLY")) {
+        applyType = `${applyType} APPLY`;
+      }
+      this._joins.push({
+        type: applyType,
+        table,
+        alias,
+        condition: null,
+        isApply: true
+      });
+    }
+    cross_apply(table, alias = null) {
+      this.apply(table, alias, "CROSS");
+    }
+    outer_apply(table, alias = null) {
+      this.apply(table, alias, "OUTER");
+    }
+  };
   cls.Select = class extends cls.QueryBuilder {
     constructor(options, blocks = null) {
       const limitOffsetTopBlock = new cls.MssqlLimitOffsetTopBlock(options);
@@ -2039,7 +2066,7 @@ squel.flavours.mssql = (_squel) => {
         limitOffsetTopBlock.TOP(),
         new cls.GetFieldBlock(options),
         new cls.FromTableBlock(options),
-        new cls.JoinBlock(options),
+        new cls.MssqlJoinBlock(options),
         new cls.WhereBlock(options),
         new cls.GroupByBlock(options),
         new cls.HavingBlock(options),
@@ -2295,4 +2322,4 @@ export {
   src_default as default
 };
 
-//# debugId=4FE4237F5E06625564756E2164756E21
+//# debugId=C3B9A8DC1888720164756E2164756E21