In clause via params functional and tested.

joshmg · joshmg · commit 20c9a8827bf3 · 2020-01-15T11:04:44.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.softwareverde'
-version '3.0.1'
+version '3.1.0'
 
 apply plugin: 'java'
 apply plugin: 'java-library'
diff --git a/src/main/java/com/softwareverde/database/query/Query.java b/src/main/java/com/softwareverde/database/query/Query.java
@@ -15,21 +15,49 @@
 
 public class Query {
     public static final TypedParameter NULL = TypedParameter.NULL;
+    public static final String NULL_STRING = "NULL";
 
-    protected static String buildInClause(final Integer parameterCount) {
+    protected static StringBuilder buildParenthesisList(final Integer parameterCount) {
         final StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("IN (");
 
         if (parameterCount > 0) {
+            stringBuilder.append("(");
             String separator = "";
             for (int i = 0; i < parameterCount; ++i) {
                 stringBuilder.append(separator);
                 stringBuilder.append("?");
+                separator = ",";
+            }
+            stringBuilder.append(")");
+        }
+        else {
+            stringBuilder.append(NULL_STRING);
+        }
+
+        return stringBuilder;
+    }
+
+    protected static String buildInClause(final List<InClauseParameter> inClauseParameters) {
+        final StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("IN (");
+
+        if (inClauseParameters.getCount() > 0) {
+            String separator = "";
+            for (final InClauseParameter inClauseParameter : inClauseParameters) {
+                stringBuilder.append(separator);
+                if (inClauseParameter.getType() == InClauseParameter.Type.TUPLE) {
+                    final Integer parameterCount = inClauseParameter.getParameterCount();
+                    stringBuilder.append(Query.buildParenthesisList(parameterCount));
+                }
+                else {
+                    stringBuilder.append("?");
+                }
+
                 separator = ", ";
             }
         }
         else {
-            stringBuilder.append("NULL");
+            stringBuilder.append(NULL_STRING);
         }
 
         stringBuilder.append(")");
@@ -214,8 +242,8 @@ public String getQueryString() {
                     break;
                 }
 
-                final List<?> inClauseValues = _inClauseParameters.get(matchCount);
-                final String inClause = Query.buildInClause(inClauseValues.getCount());
+                final List<InClauseParameter> inClauseValues = _inClauseParameters.get(matchCount);
+                final String inClause = Query.buildInClause(inClauseValues);
                 matcher.appendReplacement(stringBuffer, inClause);
                 matchCount += 1;
             }
diff --git a/src/main/java/com/softwareverde/database/util/DatabaseUtil.java b/src/main/java/com/softwareverde/database/util/DatabaseUtil.java
@@ -56,11 +56,8 @@ protected DatabaseUtil() { }
 //        return _createInClause(list, keyMap);
 //    }
 
-    public static <T, V> List<V> sortMappedRows(final java.util.List<Row> rows, final List<T> rowOrder, final Map<T, V> keyMap) {
-        final Integer itemCount = rows.size();
-        if (! Util.areEqual(itemCount, rowOrder.getSize())) { return null; }
-
-        final ImmutableListBuilder<V> lockingScriptsBuilder = new ImmutableListBuilder<V>(itemCount);
+    public static <T, V> List<V> sortMappedRows(final List<T> rowOrder, final Map<T, V> keyMap) {
+        final ImmutableListBuilder<V> lockingScriptsBuilder = new ImmutableListBuilder<V>();
         for (final T key : rowOrder) {
             final V value = keyMap.get(key);
             lockingScriptsBuilder.add(value);
diff --git a/src/test/java/com/softwareverde/database/QueryTests.java b/src/test/java/com/softwareverde/database/QueryTests.java
@@ -1,9 +1,12 @@
 package com.softwareverde.database;
 
+import com.softwareverde.constable.list.mutable.MutableList;
 import com.softwareverde.database.query.Query;
 import com.softwareverde.database.query.ValueExtractor;
+import com.softwareverde.database.query.parameter.InClauseParameter;
 import com.softwareverde.database.query.parameter.ParameterType;
 import com.softwareverde.database.query.parameter.TypedParameter;
+import com.softwareverde.util.Tuple;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -140,4 +143,32 @@ public void should_create_query_with_multiple_in_clauses() {
         Assert.assertEquals("2", parameters.get(6).value);
         Assert.assertEquals("3", parameters.get(7).value);
     }
+
+    @Test
+    public void should_create_query_of_multiple_tuple_pairs() {
+        // Setup
+        final Query query = new Query("SELECT id FROM table WHERE (value0, value1) IN (?)");
+
+        final ValueExtractor<Tuple<String, String>> stringTupleExtractor = new ValueExtractor<Tuple<String, String>>() {
+            @Override
+            public InClauseParameter extractValues(final Tuple<String, String> tuple) {
+                final TypedParameter typedParameter0 = new TypedParameter(tuple.first);
+                final TypedParameter typedParameter1 = new TypedParameter(tuple.second);
+                return new InClauseParameter(typedParameter0, typedParameter1);
+            }
+        };
+
+        final MutableList<Tuple<String, String>> values = new MutableList<Tuple<String, String>>();
+        for (int i = 0; i < 3; ++i) {
+            values.add(new Tuple<String, String>("Value0-" + i, "Value1-" + i));
+        }
+
+        // Action
+        query.setInClauseParameters(values, stringTupleExtractor);
+
+        final String queryString = query.getQueryString();
+
+        // Assert
+        Assert.assertEquals("SELECT id FROM table WHERE (value0, value1) IN ((?,?), (?,?), (?,?))", queryString);
+    }
 }
