Add CROSS JOIN functionality (issue #124)

hiddentao · Jan 29, 2015 · d7cb984 · d7cb984
1 parent c5e6e13
commit d7cb984
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/squel-basic.js b/squel-basic.js
@@ -1605,6 +1605,16 @@ OTHER DEALINGS IN THE SOFTWARE.
       return this.join(table, alias, condition, 'FULL');
     };
 
+    JoinBlock.prototype.cross_join = function(table, alias, condition) {
+      if (alias == null) {
+        alias = null;
+      }
+      if (condition == null) {
+        condition = null;
+      }
+      return this.join(table, alias, condition, 'CROSS');
+    };
+
     JoinBlock.prototype.buildStr = function(queryBuilder) {
       var j, joins, _i, _len, _ref5;
       joins = "";

diff --git a/squel-basic.min.js b/squel-basic.min.js
diff --git a/squel.js b/squel.js
@@ -1605,6 +1605,16 @@ OTHER DEALINGS IN THE SOFTWARE.
       return this.join(table, alias, condition, 'FULL');
     };
 
+    JoinBlock.prototype.cross_join = function(table, alias, condition) {
+      if (alias == null) {
+        alias = null;
+      }
+      if (condition == null) {
+        condition = null;
+      }
+      return this.join(table, alias, condition, 'CROSS');
+    };
+
     JoinBlock.prototype.buildStr = function(queryBuilder) {
       var j, joins, _i, _len, _ref5;
       joins = "";

diff --git a/squel.min.js b/squel.min.js
diff --git a/src/squel.coffee b/src/squel.coffee
@@ -199,7 +199,7 @@ class cls.BaseBuilder extends cls.Cloneable
     if allowNested
       if "string" is typeof item
         sanitized = item
-      else 
+      else
         try
           sanitized = @_sanitizeNestableQuery(item)
         catch e
@@ -1222,12 +1222,10 @@ class cls.JoinBlock extends cls.Block
   left_join: (table, alias = null, condition = null) ->
     @join table, alias, condition, 'LEFT'
 
-
   # Add a RIGHT JOIN with the given table.
   right_join: (table, alias = null, condition = null) ->
     @join table, alias, condition, 'RIGHT'
 
-
   # Add an OUTER JOIN with the given table.
   outer_join: (table, alias = null, condition = null) ->
     @join table, alias, condition, 'OUTER'
@@ -1240,6 +1238,10 @@ class cls.JoinBlock extends cls.Block
   full_join: (table, alias = null, condition = null) ->
     @join table, alias, condition, 'FULL'
 
+  # Add an CROSS JOIN with the given table.
+  cross_join: (table, alias = null, condition = null) ->
+    @join table, alias, condition, 'CROSS'
+
   buildStr: (queryBuilder) ->
     joins = ""