Merge pull request brianc#168 from twg/add_postgres_array_operators

brianc · brianc · commit ce51eb6d2498 · 2014-04-09T09:11:37.000-05:00
Add Postgres array operators `&lt;@`, `@&gt;`, `&amp;&amp;`.
diff --git a/lib/dialect/postgres.js b/lib/dialect/postgres.js
@@ -482,6 +482,24 @@ Postgres.prototype.visitSlice = function(slice) {
   return [text];
 };
 
+Postgres.prototype.visitContains = function(contains) {
+  var text = this.visit(contains.value);
+  text += ' @> ' + this.visit(contains.set);
+  return [text];
+};
+
+Postgres.prototype.visitContainedBy = function(containedBy) {
+  var text = this.visit(containedBy.value);
+  text += ' <@ ' + this.visit(containedBy.set);
+  return [text];
+};
+
+Postgres.prototype.visitOverlap = function(overlap) {
+  var text = this.visit(overlap.value);
+  text += ' && ' + this.visit(overlap.set);
+  return [text];
+};
+
 Postgres.prototype.visitQuery = function(queryNode) {
   this._queryNode = queryNode;
   // need to sort the top level query nodes on visitation priority
diff --git a/lib/node/valueExpression.js b/lib/node/valueExpression.js
@@ -77,6 +77,18 @@ var ValueExpressionMixin = function() {
     return new SliceNode(this.toNode(), processParams(start), processParams(end));
   };
 
+  var containsMethod = function(set) {
+    return new ContainsNode(this.toNode(), processParams(set));
+  };
+
+  var containedByMethod = function(set) {
+    return new ContainedByNode(this.toNode(), processParams(set));
+  };
+
+  var overlapMethod = function(set) {
+    return new OverlapNode(this.toNode(), processParams(set));
+  };
+
   var castMethod = function(dataType) {
     return new CastNode(this.toNode(), dataType);
   };
@@ -138,6 +150,9 @@ var ValueExpressionMixin = function() {
     notIn      : notInMethod,
     between    : ternaryMethod('BETWEEN', 'AND'),
     at         : atMethod,
+    contains   : binaryMethod('@>'),
+    containedBy : binaryMethod('<@'),
+    overlap    : binaryMethod('&&'),
     slice      : sliceMethod,
     cast       : castMethod,
     descending : orderMethod('DESC'),
diff --git a/test/dialects/array-tests.js b/test/dialects/array-tests.js
@@ -16,6 +16,39 @@ Harness.test({
   params: ['nodejs']
 });
 
+Harness.test({
+  query: post.select(
+    post.tags.contains(Sql.array('nodejs', 'js'))
+  ),
+  pg: {
+    text  : 'SELECT ("post"."tags" @> ARRAY[$1, $2]) FROM "post"',
+    string: 'SELECT ("post"."tags" @> ARRAY[\'nodejs\', \'js\']) FROM "post"'
+  },
+  params: ['nodejs', 'js']
+});
+
+Harness.test({
+  query: post.select(
+    post.tags.containedBy(Sql.array('nodejs', 'js'))
+  ),
+  pg: {
+    text  : 'SELECT ("post"."tags" <@ ARRAY[$1, $2]) FROM "post"',
+    string: 'SELECT ("post"."tags" <@ ARRAY[\'nodejs\', \'js\']) FROM "post"'
+  },
+  params: ['nodejs', 'js']
+});
+
+Harness.test({
+  query: post.select(
+    post.tags.overlap(Sql.array('nodejs', 'js'))
+  ),
+  pg: {
+    text  : 'SELECT ("post"."tags" && ARRAY[$1, $2]) FROM "post"',
+    string: 'SELECT ("post"."tags" && ARRAY[\'nodejs\', \'js\']) FROM "post"'
+  },
+  params: ['nodejs', 'js']
+});
+
 Harness.test({
   query: post.select(post.tags.slice(2,3)),
   pg: {
