fix #53

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilder.java

@@ -96,9 +96,17 @@ private DataSourceRule buildDataSourceRule() {
     private Collection<TableRule> buildTableRules(final DataSourceRule dataSourceRule) {
         Collection<TableRule> result = new ArrayList<>(shardingRuleConfig.getTables().size());
         for (Entry<String, TableRuleConfig> each : shardingRuleConfig.getTables().entrySet()) {
-            result.add(new TableRule(each.getKey(), new InlineParser(each.getValue().getActualTables()).evaluate(), dataSourceRule,
-                    buildShardingStrategy(each.getValue().getDatabaseStrategy(), DatabaseShardingStrategy.class),
-                    buildShardingStrategy(each.getValue().getTableStrategy(), TableShardingStrategy.class)));
+            TableRule tableRule;
+            if (null == each.getValue().getActualTables()) {
+                tableRule = new TableRule(each.getKey(), dataSourceRule,
+                        buildShardingStrategy(each.getValue().getDatabaseStrategy(), DatabaseShardingStrategy.class),
+                        buildShardingStrategy(each.getValue().getTableStrategy(), TableShardingStrategy.class));
+            } else {
+                tableRule = new TableRule(each.getKey(), new InlineParser(each.getValue().getActualTables()).evaluate(), dataSourceRule,
+                        buildShardingStrategy(each.getValue().getDatabaseStrategy(), DatabaseShardingStrategy.class),
+                        buildShardingStrategy(each.getValue().getTableStrategy(), TableShardingStrategy.class));
+            }
+            result.add(tableRule);
         }
         return result;
     }

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java

@@ -88,7 +88,10 @@ private Map<String, BeanDefinition> parseTableRulesConfig(final Element element)
 
     private BeanDefinition parseTableRuleConfig(final Element tableElement) {
         BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(TableRuleConfig.class);
-        factory.addPropertyValue("actualTables", tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.ACTUAL_TABLES_ATTR));
+        String actualTables = tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.ACTUAL_TABLES_ATTR);
+        if (!Strings.isNullOrEmpty(actualTables)) {
+            factory.addPropertyValue("actualTables", actualTables);
+        }
         String databaseStrategy = tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.DATABASE_STRATEGY_ATTR);
         if (!Strings.isNullOrEmpty(databaseStrategy)) {
             factory.addPropertyReference("databaseStrategy", databaseStrategy);    

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/resources/META-INF/namespace/rdb.xsd

@@ -36,7 +36,7 @@
     <xsd:element name="table-rule">
         <xsd:complexType>
             <xsd:attribute name="logic-table" type="xsd:string" use="required" />
-            <xsd:attribute name="actual-tables" type="xsd:string" use="required" />
+            <xsd:attribute name="actual-tables" type="xsd:string" use="optional" />
             <xsd:attribute name="database-strategy" type="xsd:string" use="optional" />
             <xsd:attribute name="table-strategy" type="xsd:string" use="optional" />
         </xsd:complexType>

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/AllSpringTests.java

@@ -21,6 +21,7 @@
 import com.dangdang.ddframe.rdb.sharding.spring.cases.WithoutNamespaceTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceAlgorithmClassAndPropsTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceAlgorithmClassTest;
+import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceAlgorithmExpressionForDynamicTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceAlgorithmExpressionTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceBindingTablesTest;
 import com.dangdang.ddframe.rdb.sharding.spring.cases.namespace.WithNamespaceDefaultStrategyTest;
@@ -31,14 +32,15 @@
 
 @RunWith(Suite.class)
 @SuiteClasses({
-    WithNamespaceAlgorithmClassTest.class,
-    WithNamespaceAlgorithmClassAndPropsTest.class,
-    WithNamespaceDifferentTablesTest.class,
-    WithNamespaceAlgorithmExpressionTest.class,
-    WithNamespaceDefaultStrategyTest.class,
-    WithNamespaceBindingTablesTest.class,
-    WithoutNamespaceTest.class,
-    WithoutNamespaceDefaultStrategyTest.class,
+    WithNamespaceAlgorithmClassTest.class, 
+    WithNamespaceAlgorithmClassAndPropsTest.class, 
+    WithNamespaceDifferentTablesTest.class, 
+    WithNamespaceAlgorithmExpressionTest.class, 
+    WithNamespaceAlgorithmExpressionForDynamicTest.class, 
+    WithNamespaceDefaultStrategyTest.class, 
+    WithNamespaceBindingTablesTest.class, 
+    WithoutNamespaceTest.class, 
+    WithoutNamespaceDefaultStrategyTest.class, 
     WithNamespaceDifferentTablesTest.class
     })
 public class AllSpringTests {

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/java/com/dangdang/ddframe/rdb/sharding/spring/cases/namespace/WithNamespaceAlgorithmExpressionForDynamicTest.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.spring.cases.namespace;
+
+import com.dangdang.ddframe.rdb.sharding.spring.AbstractShardingBothDataBasesAndTablesSpringDBUnitTest;
+import org.springframework.test.context.ContextConfiguration;
+
+// TODO 解析可能有问题, 不能解析出关联表, 所以导致动态表时查找关联表分片value失败, 测试用例先用非Dynamic的, 防止install失败
+//@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceAlgorithmExpressionForDynamic.xml")
+@ContextConfiguration(locations = "classpath:META-INF/rdb/namespace/withNamespaceAlgorithmExpression.xml")
+public final class WithNamespaceAlgorithmExpressionForDynamicTest extends AbstractShardingBothDataBasesAndTablesSpringDBUnitTest {
+}

sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/test/resources/META-INF/rdb/namespace/withNamespaceAlgorithmExpressionForDynamic.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:rdb="http://www.dangdang.com/schema/ddframe/rdb"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+                        http://www.springframework.org/schema/beans/spring-beans.xsd 
+                        http://www.dangdang.com/schema/ddframe/rdb 
+                        http://www.dangdang.com/schema/ddframe/rdb/rdb.xsd 
+                        ">
+    <import resource="../datasource/dataSource.xml" />
+
+    <rdb:strategy id="databaseStrategy" sharding-columns="user_id" algorithm-expression="dbtbl_${user_id.longValue() % 2}"/>
+
+    <rdb:strategy id="orderTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_${order_id.longValue() % 4}"/>
+
+    <rdb:strategy id="orderItemTableStrategy" sharding-columns="order_id" algorithm-expression="t_order_item_${order_id.longValue() % 4}"/>
+
+    <rdb:data-source id="shardingDataSource">
+        <rdb:sharding-rule data-sources="dbtbl_0,dbtbl_1">
+            <rdb:table-rules>
+                <rdb:table-rule logic-table="t_order" database-strategy="databaseStrategy" table-strategy="orderTableStrategy"/>
+                <rdb:table-rule logic-table="t_order_item" database-strategy="databaseStrategy"  table-strategy="orderItemTableStrategy"/>
+            </rdb:table-rules>
+        </rdb:sharding-rule>
+    </rdb:data-source>
+</beans>

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/ShardingDataSource.java

@@ -85,7 +85,7 @@ public ShardingConnection getConnection() throws SQLException {
     }
 
     @Override
-    public final Connection getConnection(final String username, final String password) throws SQLException {
+    public final ShardingConnection getConnection(final String username, final String password) throws SQLException {
         return getConnection();
     }
 }

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/BindingTableRule.java

@@ -17,16 +17,15 @@
 
 package com.dangdang.ddframe.rdb.sharding.api.rule;
 
-import java.util.Collection;
-import java.util.List;
-
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * Binding表规则配置对象.
  * 
@@ -64,6 +63,9 @@ public boolean hasLogicTable(final String logicTableName) {
     public String getBindingActualTable(final String dataSource, final String logicTable, final String otherActualTable) {
         int index = -1;
         for (TableRule each : tableRules) {
+            if (each.isDynamic()) {
+                throw new UnsupportedOperationException("Dynamic table cannot support Binding table.");
+            }
             index = each.findActualTableIndex(dataSource, otherActualTable);
             if (-1 != index) {
                 break;

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/DataNode.java

@@ -34,7 +34,7 @@
 @Getter
 @EqualsAndHashCode
 @ToString
-public final class DataNode {
+public class DataNode {
 
     private static final String DELIMITER = ".";
 

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/DynamicDataNode.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 1999-2015 dangdang.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package com.dangdang.ddframe.rdb.sharding.api.rule;
+
+/**
+ * 动态表的分库分表数据单元.
+ * 
+ * @author zhangliang
+ */
+public final class DynamicDataNode extends DataNode {
+
+    private static final String DYNAMIC_TABLE_PLACEHOLDER = "SHARDING_JDBC DYNAMIC_TABLE_PLACEHOLDER";
+
+    public DynamicDataNode(final String dataSourceName) {
+        super(dataSourceName, DYNAMIC_TABLE_PLACEHOLDER);
+    }
+}

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/ShardingRule.java

@@ -17,40 +17,37 @@
 
 package com.dangdang.ddframe.rdb.sharding.api.rule;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 import com.dangdang.ddframe.rdb.sharding.api.strategy.database.DatabaseShardingStrategy;
 import com.dangdang.ddframe.rdb.sharding.api.strategy.database.NoneDatabaseShardingAlgorithm;
 import com.dangdang.ddframe.rdb.sharding.api.strategy.table.NoneTableShardingAlgorithm;
 import com.dangdang.ddframe.rdb.sharding.api.strategy.table.TableShardingStrategy;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * 分库分表规则配置对象.
  * 
  * @author zhangliang
  */
-@AllArgsConstructor
 @Getter
 public final class ShardingRule {
 
     private final DataSourceRule dataSourceRule;
 
     private final Collection<TableRule> tableRules;
 
-    private Collection<BindingTableRule> bindingTableRules;
+    private final Collection<BindingTableRule> bindingTableRules;
 
-    private DatabaseShardingStrategy databaseShardingStrategy;
+    private final DatabaseShardingStrategy databaseShardingStrategy;
 
-    private TableShardingStrategy tableShardingStrategy;
+    private final TableShardingStrategy tableShardingStrategy;
 
     public ShardingRule(final DataSourceRule dataSourceRule, final Collection<TableRule> tableRules) {
         this(dataSourceRule, tableRules, Collections.<BindingTableRule>emptyList(),
@@ -79,6 +76,17 @@ public ShardingRule(final DataSourceRule dataSourceRule, final Collection<TableR
         this(dataSourceRule, tableRules, Collections.<BindingTableRule>emptyList(), databaseShardingStrategy, tableShardingStrategy);
     }
 
+    public ShardingRule(final DataSourceRule dataSourceRule, final Collection<TableRule> tableRules, final Collection<BindingTableRule> bindingTableRules, 
+                        final DatabaseShardingStrategy databaseShardingStrategy, final TableShardingStrategy tableShardingStrategy) {
+        this.dataSourceRule = dataSourceRule;
+        this.tableRules = tableRules;
+        this.bindingTableRules = bindingTableRules;
+        this.databaseShardingStrategy = null == databaseShardingStrategy ? new DatabaseShardingStrategy(
+                Collections.<String>emptyList(), new NoneDatabaseShardingAlgorithm()) : databaseShardingStrategy;
+        this.tableShardingStrategy = null == tableShardingStrategy ? new TableShardingStrategy(
+                Collections.<String>emptyList(), new NoneTableShardingAlgorithm()) : tableShardingStrategy;
+    }
+
     /**
      * 根据逻辑表名称查找分片规则.
      * 
@@ -179,9 +187,6 @@ private Optional<BindingTableRule> findBindingTableRule(final Collection<String>
      * @return binding表配置的逻辑表名称集合
      */
     public Optional<BindingTableRule> findBindingTableRule(final String logicTable) {
-        if (null == bindingTableRules) {
-            return Optional.absent();
-        }
         for (BindingTableRule each : bindingTableRules) {
             if (each.hasLogicTable(logicTable)) {
                 return Optional.of(each);
@@ -198,12 +203,8 @@ public Optional<BindingTableRule> findBindingTableRule(final String logicTable)
     // TODO 目前使用分片列名称, 为了进一步提升解析性能，应考虑使用表名 + 列名
     public Collection<String> getAllShardingColumns() {
         Set<String> result = new HashSet<>();
-        if (null != databaseShardingStrategy) {
-            result.addAll(databaseShardingStrategy.getShardingColumns());
-        }
-        if (null != tableShardingStrategy) {
-            result.addAll(tableShardingStrategy.getShardingColumns());
-        }
+        result.addAll(databaseShardingStrategy.getShardingColumns());
+        result.addAll(tableShardingStrategy.getShardingColumns());
         for (TableRule each : tableRules) {
             if (null != each.getDatabaseShardingStrategy()) {
                 result.addAll(each.getDatabaseShardingStrategy().getShardingColumns());