From cd23b435686872ea0abd59568be5bd2bd1994858 Mon Sep 17 00:00:00 2001
From: James Ahlborn <jtahlborn@yahoo.com>
Date: Thu, 28 May 2009 02:57:33 +0000
Subject: [PATCH] add initial test for reading queries; add support for
 multicolumn joins

git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@393 f203690c-595d-4dc9-a70b-905162fa7fd2
---
 .../jackcess/query/Query.java                 |  58 +++++++++++++++++-
 test/data/queryTest.mdb                       | Bin 0 -> 163840 bytes
 .../jackcess/DatabaseTest.java                |  14 +++--
 .../jackcess/query/QueryTest.java             |  48 +++++++++++++++
 4 files changed, 111 insertions(+), 9 deletions(-)
 create mode 100755 test/data/queryTest.mdb

diff --git a/src/java/com/healthmarketscience/jackcess/query/Query.java b/src/java/com/healthmarketscience/jackcess/query/Query.java
index 7853859..08f6f48 100644
--- a/src/java/com/healthmarketscience/jackcess/query/Query.java
+++ b/src/java/com/healthmarketscience/jackcess/query/Query.java
@@ -28,10 +28,12 @@ King of Prussia, PA 19406
 package com.healthmarketscience.jackcess.query;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -224,7 +226,31 @@ public abstract class Query
     List<Row> joins = getJoinRows();
     if(!joins.isEmpty()) {
 
-      for(Row join : joins) {
+      // combine any multi-column joins
+      Collection<List<Row>> comboJoins = combineJoins(joins);
+      
+      for(List<Row> comboJoin : comboJoins) {
+
+        Row join = comboJoin.get(0);
+        String joinExpr = join.expression;
+
+        if(comboJoin.size() > 1) {
+
+          // combine all the join expressions with "AND"
+          AppendableList<String> comboExprs = new AppendableList<String>() {
+            private static final long serialVersionUID = 0L;
+            @Override
+            protected String getSeparator() {
+              return ") AND (";
+            }
+          };
+          for(Row tmpJoin : comboJoin) {
+            comboExprs.add(tmpJoin.expression);
+          }
+
+          joinExpr = new StringBuilder().append("(")
+            .append(comboExprs).append(")").toString();
+        }
 
         String fromTable = join.name1;
         String toTable = join.name2;
@@ -238,7 +264,7 @@ public abstract class Query
 
         String expr = new StringBuilder().append(fromExpr)
           .append(joinType).append(toExpr).append(" ON ")
-          .append(join.expression).toString();
+          .append(joinExpr).toString();
 
         fromExpr.join(toExpr, expr);
         joinExprs.add(fromExpr);
@@ -265,6 +291,28 @@ public abstract class Query
     throw new IllegalStateException("Cannot find join table " + table);
   }
 
+  private Collection<List<Row>> combineJoins(List<Row> joins)
+  {
+    // combine joins with the same to/from tables
+    Map<List<String>,List<Row>> comboJoinMap = 
+      new LinkedHashMap<List<String>,List<Row>>();
+    for(Row join : joins) {
+      List<String> key = Arrays.asList(join.name1, join.name2);
+      List<Row> comboJoins = comboJoinMap.get(key);
+      if(comboJoins == null) {
+        comboJoins = new ArrayList<Row>();
+        comboJoinMap.put(key, comboJoins);
+      } else {
+        if(comboJoins.get(0).flag != join.flag) {
+          throw new IllegalStateException(
+              "Mismatched join flags for combo joins");
+        }
+      }
+      comboJoins.add(join);
+    }
+    return comboJoinMap.values();
+  }
+
   protected String getFromRemoteDbPath() 
   {
     return getRemoteDatabaseRow().name1;
@@ -610,13 +658,17 @@ public abstract class Query
       super(c);
     }
 
+    protected String getSeparator() {
+      return ", ";
+    }
+
     @Override
     public String toString() {
       StringBuilder builder = new StringBuilder();
       for(Iterator<E> iter = iterator(); iter.hasNext(); ) {
         builder.append(iter.next().toString());
         if(iter.hasNext()) {
-          builder.append(", ");
+          builder.append(getSeparator());
         }
       }
       return builder.toString();
diff --git a/test/data/queryTest.mdb b/test/data/queryTest.mdb
new file mode 100755
index 0000000000000000000000000000000000000000..5bb6b28d70adb933073c1232297387dd0c1bb0bb
GIT binary patch
literal 163840
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
EKPw4~?EnA(

literal 0
HcmV?d00001

diff --git a/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java b/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
index aedf3e7..5b5d343 100644
--- a/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/DatabaseTest.java
@@ -66,27 +66,29 @@ public class DatabaseTest extends TestCase {
     super(name);
   }
    
-  static Database open() throws Exception {
+  public static Database open() throws Exception {
     return open(new File("test/data/test.mdb"));
   }
   
-  static Database open(File file) throws Exception {
+  public static Database open(File file) throws Exception {
     return Database.open(file, true, _autoSync);
   }
   
-  static Database create() throws Exception {
+  public static Database create() throws Exception {
     return create(false);
   }
 
-  static Database create(boolean keep) throws Exception {
+  public static Database create(boolean keep) throws Exception {
     return Database.create(createTempFile(keep), _autoSync);
   }
 
-  static Database openCopy(File srcFile) throws Exception {
+  public static Database openCopy(File srcFile) throws Exception {
     return openCopy(srcFile, false);
   }
   
-  static Database openCopy(File srcFile, boolean keep) throws Exception {
+  public static Database openCopy(File srcFile, boolean keep) 
+    throws Exception 
+  {
     File tmp = createTempFile(keep);
     copyFile(srcFile, tmp);
     return Database.open(tmp, false, _autoSync);
diff --git a/test/src/java/com/healthmarketscience/jackcess/query/QueryTest.java b/test/src/java/com/healthmarketscience/jackcess/query/QueryTest.java
index 10d976c..5d24307 100644
--- a/test/src/java/com/healthmarketscience/jackcess/query/QueryTest.java
+++ b/test/src/java/com/healthmarketscience/jackcess/query/QueryTest.java
@@ -27,12 +27,17 @@ King of Prussia, PA 19406
 
 package com.healthmarketscience.jackcess.query;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import com.healthmarketscience.jackcess.DataType;
+import com.healthmarketscience.jackcess.Database;
+import com.healthmarketscience.jackcess.DatabaseTest;
 import com.healthmarketscience.jackcess.query.Query.Row;
 import junit.framework.TestCase;
 import org.apache.commons.lang.StringUtils;
@@ -192,6 +197,49 @@ public class QueryTest extends TestCase
 
   }
 
+  public void testReadQueries() throws Exception
+  {
+    Map<String,String> expectedQueries = new HashMap<String,String>();
+    expectedQueries.put(
+        "SelectQuery", multiline(
+            "SELECT Table1.*, Table2.col1, Table2.col2, Table3.col3",
+            "FROM (Table1 LEFT OUTER JOIN Table3 ON Table1.col1 = Table3.col1) INNER JOIN Table2 ON (Table3.col1 = Table2.col1) AND (Table3.col1 = Table2.col2)",
+            "WHERE (((Table2.col2)=\"foo\" Or (Table2.col2) In (\"buzz\",\"bazz\")))",
+            "ORDER BY Table2.col1;"));
+    expectedQueries.put(
+        "DeleteQuery", multiline(
+            "DELETE Table1.col1, Table1.col2, Table1.col3",
+            "FROM Table1", 
+            "WHERE (((Table1.col1)>\"blah\"));"));
+    expectedQueries.put(
+        "AppendQuery",multiline(
+            "INSERT INTO Table3",
+            "SELECT [Table1].[col2], [Table2].[col2], [Table2].[col3]",
+            "FROM Table3, Table1 INNER JOIN Table2 ON [Table1].[col1]=[Table2].[col1];"));
+    expectedQueries.put(
+        "UpdateQuery",multiline(
+            "UPDATE Table1",
+            "SET Table1.col1 = \"foo\", Table1.col2 = [Table2].[col3]",
+            "WHERE (([Table2].[col1] Is Not Null));"));
+    expectedQueries.put(
+        "MakeTableQuery",multiline(
+            "SELECT Max(Table2.col1) AS MaxOfcol1, Table2.col2, Table3.col2 INTO Table4",
+            "FROM (Table2 INNER JOIN Table1 ON Table2.col1 = Table1.col2) RIGHT OUTER JOIN Table3 ON Table1.col2 = Table3.col3",
+            "GROUP BY Table2.col2, Table3.col2",
+            "HAVING (((Max(Table2.col1))=\"buzz\") AND ((Table2.col2)<>\"blah\"));"));
+
+    Database db = DatabaseTest.open(new File("test/data/queryTest.mdb"));
+
+    Map<String,String> foundQueries = new HashMap<String,String>();
+    for(Query q : db.getQueries()) {
+      assertNull(foundQueries.put(q.getName(), q.toSQLString()));
+    }
+
+    assertEquals(expectedQueries, foundQueries);
+
+    db.close();
+  }
+
   private void doTestColumns(SelectQuery query) throws Exception
   {
     addRows(query, newRow(COLUMN_ATTRIBUTE, "Table1.id", null, null));
-- 
2.39.5