Merge pull request #55 from blobcity/develop

Issue #53 resolution

Author: sanketsarang

Dockerfile

@@ -17,7 +17,7 @@
 
 FROM blobcity/java8-ubuntu
 
-ENV DB_VER=1.7.9-alpha
+ENV DB_VER=1.7.10-alpha
 
 RUN cd / && mkdir data
 

bean-manager/pom.xml

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
 
     <groupId>com.blobcity.lib</groupId>

console-end-point/pom.xml

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
 
     <groupId>com.blobcity.lib</groupId>

distribution/pom.xml

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
     <artifactId>blobcity-db</artifactId>
     <name>BlobCityDB Distribution</name>

engine/pom.xml

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
 
     <groupId>com.blobcity.lib.database</groupId>

engine/src/main/java/com/blobcity/db/sql/statements/DeleteExecutor.java

@@ -142,6 +142,10 @@ private Set<String> filter(final String appId, final String tableName,  ValueNod
                     refValue = ((NumericConstantNode) rightOperand).getValue();
                 } else if (rightOperand instanceof CharConstantNode) {
                     refValue = ((CharConstantNode) rightOperand).getValue();
+                } else if (rightOperand instanceof BooleanConstantNode) {
+                    refValue = ((BooleanConstantNode) rightOperand).getBooleanValue();
+                } else if (rightOperand instanceof BitConstantNode) {
+                    refValue = ((BitConstantNode) rightOperand).getValue();
                 }
 
                 logger.debug("selectKeysWithPattern({}, {}, {}, {}, {})",

engine/src/main/java/com/blobcity/db/sql/statements/SelectExecutor.java

@@ -285,6 +285,9 @@ else if(whereClause == null && aggOperations.isEmpty() && resultColumns.size() >
                     if(selectNode.isDistinct()) {
                         keepDistinct(resultMap);
                     }
+                    if(orderByList != null) {
+                        orderResult(appId, tableName, orderByList, resultMap);
+                    }
                     return produceResult(appId, tableName, sqlString, resultMap, limit, startTime);
                 }
 

engine/src/main/java/com/blobcity/db/sql/statements/UpdateExecutor.java

@@ -156,6 +156,10 @@ private Set<String> filter(final String appId, final String tableName, final Res
                     refValue = ((NumericConstantNode) rightOperand).getValue();
                 } else if (rightOperand instanceof CharConstantNode) {
                     refValue = ((CharConstantNode) rightOperand).getValue();
+                } else if (rightOperand instanceof BooleanConstantNode) {
+                    refValue = ((BooleanConstantNode) rightOperand).getBooleanValue();
+                } else if (rightOperand instanceof BitConstantNode) {
+                    refValue = ((BitConstantNode) rightOperand).getValue();
                 }
                 int numResultCols = columns.size();
                 List<String> resultColList = new ArrayList<>();

launcher/pom.xml

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <parent>
         <groupId>com.blobcity.pom</groupId>
         <artifactId>database</artifactId>
-        <version>1.7.9-alpha</version>
+        <version>1.7.10-alpha</version>
     </parent>
 
     <groupId>com.blobcity.lib.database</groupId>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.blobcity.pom</groupId>
     <artifactId>database</artifactId>
-    <version>1.7.9-alpha</version>
+    <version>1.7.10-alpha</version>
     <packaging>pom</packaging>
 
     <name>Kraken [POM]</name>