From 502a0f0a1fb6c2a49f38982102c9f7136e394e6c Mon Sep 17 00:00:00 2001
From: gaohongtao <hanahmily@gmail.com>
Date: Tue, 24 May 2016 20:53:39 +0800
Subject: [PATCH] fix #81

---
 .../sharding/parser/visitor/or/OrVisitor.java |  6 ++++--
 .../sharding/parser/mysql/or/select_or.xml    | 19 +++++++++++++++++++
 .../content/post/release_notes.md             |  4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java
index 669b898a8dd3d..567c4fab57914 100644
--- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java
+++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/visitor/or/OrVisitor.java
@@ -41,8 +41,10 @@ public class OrVisitor extends AbstractMySQLVisitor {
     public OrVisitor(final SQLASTOutputVisitor dependencyVisitor) {
         setParameters(dependencyVisitor.getParameters());
         SQLVisitor visitor = (SQLVisitor) dependencyVisitor;
-        String currentTableName = null == visitor.getParseContext().getCurrentTable() ? "" : visitor.getParseContext().getCurrentTable().getName();
-        getParseContext().setCurrentTable(currentTableName, Optional.<String>absent());
+        if (null != visitor.getParseContext().getCurrentTable()) {
+            getParseContext().setCurrentTable(visitor.getParseContext().getCurrentTable().getName(), Optional.<String>absent());
+        }
+        getParseContext().getParsedResult().getRouteContext().getTables().addAll(visitor.getParseContext().getParsedResult().getRouteContext().getTables());
         getParseContext().setShardingColumns(visitor.getParseContext().getShardingColumns());
     }
     
diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml
index ff830d2435d16..ca84767d143a9 100644
--- a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml
+++ b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml
@@ -120,4 +120,23 @@
             <table name="travel_record" />
         </tables>
     </assert>
+
+    <assert id="assertOrJoin" sql="select u.id, i.name from user u, item i where u.id = i.id and (i.id = 1 or i.id = 2)"  expected-sql="SELECT [Token(u)].id, [Token(i)].name FROM [Token(user)] u, [Token(item)] i WHERE u.id = i.id AND (i.id = 1 OR i.id = 2)">
+        <tables>
+            <table name="user" alias="u"/>
+            <table name="item" alias="i"/>
+        </tables>
+        <condition-contexts>
+            <condition-context>
+                <condition column-name="id" table-name="item" operator="EQUAL">
+                    <value value="2" type="java.lang.Integer" />
+                </condition>
+            </condition-context>
+            <condition-context>
+                <condition column-name="id" table-name="item" operator="EQUAL">
+                    <value value="1" type="java.lang.Integer" />
+                </condition>
+            </condition-context>
+        </condition-contexts>
+    </assert>
 </asserts>
diff --git a/sharding-jdbc-doc/content/post/release_notes.md b/sharding-jdbc-doc/content/post/release_notes.md
index 9c7904baae2dd..5121ffbf07788 100644
--- a/sharding-jdbc-doc/content/post/release_notes.md
+++ b/sharding-jdbc-doc/content/post/release_notes.md
@@ -8,6 +8,10 @@ weight = 1
 
 ## 1.2.2-SNAPSHOT
 
+### 缺陷修正
+
+1. [ISSUE #63](https://github.com/dangdangdotcom/sharding-jdbc/issues/81) 关联表查询使用or查询条件解析结果异常
+
 ## 1.2.1
 
 ### 结构调整