Merge remote-tracking branch 'origin/dev'

VirtusaPolarisGTO · Apr 14, 2017 · 5281291 · 5281291
2 parents c5f9bbb + 5897a99
commit 5281291
Show file tree

Hide file tree

Showing 45 changed files with 1,158 additions and 620 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,14 @@
 ## NyQL Changelog
 
-#### 1.1.1
+### v1.1.2
+ * [Features and Bug fixes](https://github.com/VirtusaPolarisGTO/NyQL/issues?q=is%3Aissue+milestone%3Av1.1.2+is%3Aclosed)
+
+#### v1.1.1
 
  * [Bug fixes](https://github.com/VirtusaPolarisGTO/NyQL/issues?q=is%3Aissue+milestone%3Av1.1.1+is%3Aclosed)
 
 
-#### 1.1
+#### v1.1
     All batch related operations accept its data within the map in key name of '__batch__'
     instead of previously used key 'batch'.
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.virtusa.gto.nyql</groupId>
         <artifactId>nyql-parent</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/src/main/groovy/com/virtusa/gto/nyql/QuerySelect.groovy b/core/src/main/groovy/com/virtusa/gto/nyql/QuerySelect.groovy
@@ -10,6 +10,7 @@ class QuerySelect extends Query {
 
     List<Object> orderBy = null
     List<Object> groupBy = null
+    boolean groupByRollup = false
     Where groupHaving = null
     List<Object> projection = null
     Table _intoTable = null
@@ -74,6 +75,11 @@ class QuerySelect extends Query {
         this
     }
 
+    QuerySelect ROLLUP() {
+        groupByRollup = true
+        this
+    }
+
     QuerySelect HAVING(@DelegatesTo(value = Where, strategy = Closure.DELEGATE_ONLY) Closure closure) {
         Where whr = new Where(_ctx)
 

diff --git a/core/src/main/groovy/com/virtusa/gto/nyql/Table.groovy b/core/src/main/groovy/com/virtusa/gto/nyql/Table.groovy
@@ -33,6 +33,10 @@ class Table {
         __alias != null
     }
 
+    Column COLUMN_AS(String name) {
+        COLUMN_AS(name, null)
+    }
+
     Column COLUMN_AS(String name, String alias) {
         Column column = new Column(__name: name, __alias: alias, _owner: this, _ctx: _ctx)
         __allColumns.put(name + '::' + alias, column)

diff --git a/core/src/main/groovy/com/virtusa/gto/nyql/Where.groovy b/core/src/main/groovy/com/virtusa/gto/nyql/Where.groovy
@@ -203,8 +203,14 @@ class Where implements DataTypeTraits, FunctionTraits, ScriptTraits {
         this
     }
 
+    @Deprecated
     @CompileStatic
     Where NOTIN(Object c1, Object... cs) {
+        NIN(c1, cs)
+    }
+
+    @CompileStatic
+    Where NIN(Object c1, Object... cs) {
         if (cs != null) {
             List list = new LinkedList()
             QUtils.expandToList(list, cs)
@@ -216,11 +222,6 @@ class Where implements DataTypeTraits, FunctionTraits, ScriptTraits {
         this
     }
 
-    @CompileStatic
-    Where NIN(Object c1, Object... cs) {
-        NOTIN(c1, cs)
-    }
-
     QResultProxy QUERY(@DelegatesTo(value = QuerySelect, strategy = Closure.DELEGATE_ONLY) Closure closure) {
         QuerySelect querySelect = new QuerySelect(_ctx)