Fix for #105

hiddentao · Nov 24, 2014 · 42b2b85 · 42b2b85
1 parent fcd413e
commit 42b2b85
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 7 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "squel",
-    "version": "3.9.1",
+    "version": "3.10.0",
     "main": "squel.js",
     "ignore": [
         "**/.*",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "squel",
     "description": "SQL query string builder",
-    "version": "3.9.1",
+    "version": "3.10.0",
     "author": "Ramesh Nair <ram@hiddentao.com> (http://www.hiddentao.com/)",
     "contributors": [
         "Ramesh Nair <ram@hiddentao.com> (http://www.hiddentao.com/)",

diff --git a/squel-basic.js b/squel-basic.js
@@ -793,6 +793,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
     function GetFieldBlock(options) {
       GetFieldBlock.__super__.constructor.call(this, options);
+      this._fieldAliases = {};
       this._fields = [];
     }
 
@@ -829,6 +830,10 @@ OTHER DEALINGS IN THE SOFTWARE.
       if (alias) {
         alias = this._sanitizeFieldAlias(alias);
       }
+      if (this._fieldAliases[field] === alias) {
+        return;
+      }
+      this._fieldAliases[field] = alias;
       return this._fields.push({
         name: field,
         alias: alias
@@ -1958,7 +1963,7 @@ OTHER DEALINGS IN THE SOFTWARE.
   })(cls.QueryBuilder);
 
   squel = {
-    VERSION: '3.9.1',
+    VERSION: '3.10.0',
     expr: function() {
       return new cls.Expression;
     },

diff --git a/squel-basic.min.js b/squel-basic.min.js
diff --git a/squel.js b/squel.js
@@ -794,6 +794,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
     function GetFieldBlock(options) {
       GetFieldBlock.__super__.constructor.call(this, options);
+      this._fieldAliases = {};
       this._fields = [];
     }
 
@@ -830,6 +831,10 @@ OTHER DEALINGS IN THE SOFTWARE.
       if (alias) {
         alias = this._sanitizeFieldAlias(alias);
       }
+      if (this._fieldAliases[field] === alias) {
+        return;
+      }
+      this._fieldAliases[field] = alias;
       return this._fields.push({
         name: field,
         alias: alias
@@ -1959,7 +1964,7 @@ OTHER DEALINGS IN THE SOFTWARE.
   })(cls.QueryBuilder);
 
   squel = {
-    VERSION: '3.9.1',
+    VERSION: '3.10.0',
     expr: function() {
       return new cls.Expression;
     },

diff --git a/squel.min.js b/squel.min.js
diff --git a/src/squel.coffee b/src/squel.coffee
@@ -682,6 +682,7 @@ class cls.IntoTableBlock extends cls.Block
 class cls.GetFieldBlock extends cls.Block
   constructor: (options) ->
     super options
+    @_fieldAliases = {}
     @_fields = []
 
 
@@ -714,6 +715,11 @@ class cls.GetFieldBlock extends cls.Block
     field = @_sanitizeField(field, options)
     alias = @_sanitizeFieldAlias(alias) if alias
 
+    # if field-alias already present then don't add
+    return if @_fieldAliases[field] is alias
+
+    @_fieldAliases[field] = alias
+
     @_fields.push
       name: field
       alias: alias

diff --git a/test/blocks.test.coffee b/test/blocks.test.coffee
@@ -513,6 +513,30 @@ test['Blocks'] =
 
         assert.same expected, @inst._fields
 
+    'field() - discard duplicates':
+      'saves inputs': ->
+        @inst.field('field1')
+        @inst.field('field2', 'alias2')
+        @inst.field('field2', 'alias2')
+        @inst.field('field1', 'alias1')
+
+        expected = [
+          {
+          name: 'field1',
+          alias: null
+          },
+          {
+          name: 'field2',
+          alias: '"alias2"'
+          },
+          {
+          name: 'field1',
+          alias: '"alias1"'
+          }
+        ]
+
+        assert.same expected, @inst._fields
+
       'sanitizes inputs': ->
         sanitizeFieldSpy = test.mocker.stub @cls.prototype, '_sanitizeField', -> return '_f'
         sanitizeAliasSpy = test.mocker.stub @cls.prototype, '_sanitizeFieldAlias', -> return '_a'