Merge pull request #50 from KvSrg31sq/master

add array operators

Author: anton-makarov

lib/dialects/postgresql/blocks.js

@@ -9,9 +9,13 @@ module.exports = function(dialect) {
 
 		var result;
 		if (_.isArray(value)) {
-			result = 'array[' + _(value).map(function(item) {
-				return dialect.builder._pushValue(item);
-			}).join(', ') + ']';
+			if (value.length) {
+				result = 'array[' + _(value).map(function(item) {
+					return dialect.builder._pushValue(item);
+				}).join(', ') + ']';
+			} else {
+				result = dialect.builder._pushValue('{}');
+			}
 		} else if (_.isObject(value)) {
 			result = dialect.builder._pushValue(JSON.stringify(value));
 		} else {

lib/dialects/postgresql/operators/comparison.js

@@ -55,4 +55,25 @@ module.exports = function(dialect) {
 			return buildComparisonCondition(field, 'not ilike', value);
 		}
 	});
+
+	dialect.operators.comparison.add('$arrayContains', {
+		defaultFetchingOperator: '$array',
+		fn: function(field, value) {
+			return buildComparisonCondition(field, '@>', value);
+		}
+	});
+
+	dialect.operators.comparison.add('$arrayIn', {
+		defaultFetchingOperator: '$array',
+		fn: function(field, value) {
+			return buildComparisonCondition(field, '<@', value);
+		}
+	});
+
+	dialect.operators.comparison.add('$arrayOverlap', {
+		defaultFetchingOperator: '$array',
+		fn: function(field, value) {
+			return buildComparisonCondition(field, '&&', value);
+		}
+	});
 };

lib/dialects/postgresql/operators/fetching.js

@@ -1,10 +1,21 @@
 'use strict';
 
+var _ = require('underscore');
+
 module.exports = function(dialect) {
 	dialect.operators.fetching.add('$json', {
 		fn: function(value, end) {
 			if (end) value = {value: value};
 			return dialect.buildBlock('term', {term: value, type: 'value'});
 		}
 	});
+
+	dialect.operators.fetching.add('$array', {
+		fn: function(value) {
+			if (!_.isArray(value)) {
+				value = [value];
+			}
+			return dialect.buildBlock('term', {term: value, type: 'value'});
+		}
+	});
 };

tests/6_dialects/0_postgresql.js

@@ -169,6 +169,141 @@ describe('PostgreSQL dialect', function() {
 		});
 	});
 
+	describe('array', function() {
+		it('should replace empty array to {}', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					'params': []
+				}
+			});
+
+			expect(result.query).to.be.equal(
+				'select * from "test" where "params" = $1;'
+			);
+			expect(result.values).to.be.eql(['{}']);
+		});
+
+		it('should be ok with empty array in modification', function() {
+			var result = jsonSql.build({
+				type: 'update',
+				table: 'test',
+				modifier: {
+					'params': []
+				}
+			});
+
+			expect(result.query).to.be.equal('update "test" set "params" = $1;');
+			expect(result.values).to.be.eql(['{}']);
+		});
+
+		it('should be ok with empty array in values', function() {
+			var result = jsonSql.build({
+				type: 'insert',
+				table: 'test',
+				values: {
+					'params': []
+				}
+			});
+
+			expect(result.query).to.be.equal('insert into "test" ("params") values ($1);');
+			expect(result.values).to.be.eql(['{}']);
+		});
+
+		it('should be ok with `$arrayContains` conditional operator', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					'params': {
+						$arrayContains: ['a']
+					}
+				}
+			});
+
+			expect(result.query).to.be.equal(
+				'select * from "test" where "params" @> array[$1];'
+			);
+			expect(result.values).to.be.eql(['a']);
+		});
+
+		it('should correctly wrap `$arrayContains` parameters to array', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					'params': {
+						$arrayContains: 'a'
+					}
+				}
+			});
+
+			expect(result.query).to.be.equal(
+				'select * from "test" where "params" @> array[$1];'
+			);
+			expect(result.values).to.be.eql(['a']);
+		});
+
+		it('should be ok with `$arrayIn` conditional operator', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					'params': {
+						$arrayIn: ['a']
+					}
+				}
+			});
+
+			expect(result.query).to.be.equal(
+				'select * from "test" where "params" <@ array[$1];'
+			);
+			expect(result.values).to.be.eql(['a']);
+		});
+
+		it('should correctly wrap `$arrayIn` parameters to array', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					'params': {
+						$arrayIn: 'a'
+					}
+				}
+			});
+
+			expect(result.query).to.be.equal(
+				'select * from "test" where "params" <@ array[$1];'
+			);
+			expect(result.values).to.be.eql(['a']);
+		});
+
+		it('should be ok with `$arrayOverlap` conditional operator', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					params: {
+						$arrayOverlap: ['a']
+					}
+				}
+			});
+
+			expect(result.query).to.be.equal('select * from "test" where "params" && array[$1];');
+			expect(result.values).to.be.eql(['a']);
+		});
+
+		it('should correctly wrap `$arrayOverlap` parameters to array', function() {
+			var result = jsonSql.build({
+				table: 'test',
+				condition: {
+					params: {
+						$arrayOverlap: 'a'
+					}
+				}
+			});
+
+			expect(result.query).to.be.equal('select * from "test" where "params" && array[$1];');
+			expect(result.values).to.be.eql(['a']);
+		});
+	});
+
+
 	describe('explain', function() {
 		it('should throw error without `query`, `select` and `expression` properties',
 			function() {