final fixes for #139

hiddentao · Sep 9, 2015 · 48b3fb8 · 48b3fb8
1 parent 3ad3a40
commit 48b3fb8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "squel",
     "description": "SQL query string builder",
-    "version": "4.1.1",
+    "version": "4.2.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
@@ -2116,7 +2116,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
     })(cls.QueryBuilder);
     _squel = {
-      VERSION: '4.1.1',
+      VERSION: '4.2.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
@@ -2116,7 +2116,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
     })(cls.QueryBuilder);
     _squel = {
-      VERSION: '4.1.1',
+      VERSION: '4.2.0',
       expr: function() {
         return new cls.Expression;
       },

diff --git a/squel.min.js b/squel.min.js
diff --git a/test/baseclasses.test.coffee b/test/baseclasses.test.coffee
@@ -945,6 +945,13 @@ test['QueryBuilder base class'] =
   'is nestable': ->
     assert.same false, @inst.isNestable()
 
+  'get block':
+    'valid': ->
+      block = new squel.cls.FunctionBlock()
+      @inst.blocks.push(block)
+      assert.same block, @inst.getBlock(squel.cls.FunctionBlock)
+    'invalid': ->
+      assert.throws (-> @inst.getBlock(squel.cls.FunctionBlock) )