This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d42b3c8 Remove ColumnMetaData.dataTypeName
new 572219c Merge pull request #9639 from terrymanu/dev
d42b3c8 is described below
commit d42b3c82183ae809297a557edd0388bc01a630d3
Author: terrymanu <[email protected]>
AuthorDate: Thu Mar 11 20:41:37 2021 +0800
Remove ColumnMetaData.dataTypeName
---
.../metadata/EncryptTableMetaDataBuilder.java | 3 +--
.../metadata/EncryptTableMetaDataBuilderTest.java | 4 ++--
.../metadata/ShardingTableMetaDataBuilder.java | 3 +--
.../merge/dql/ShardingDQLResultMergerTest.java | 6 ++---
.../dql/groupby/GroupByStreamMergedResultTest.java | 6 ++---
.../dql/orderby/OrderByStreamMergedResultTest.java | 4 ++--
.../MixSQLRewriterParameterizedTest.java | 2 +-
.../ShardingSQLRewriterParameterizedTest.java | 2 +-
.../engine/type/standard/AbstractSQLRouteTest.java | 18 +++++++--------
.../core/yaml/swapper/SchemaYamlSwapper.java | 2 +-
.../engine/GeneratedKeyContextEngineTest.java | 2 +-
.../orderby/engine/OrderByContextEngineTest.java | 14 ++++++------
.../builder/loader/ColumnMetaDataLoader.java | 2 +-
.../loader/dialect/MySQLTableMetaDataLoader.java | 2 +-
.../metadata/schema/model/ColumnMetaData.java | 2 --
.../metadata/schema/ShardingSphereSchemaTest.java | 6 ++---
.../builder/loader/ColumnMetaDataLoaderTest.java | 7 +++---
.../builder/loader/TableMetaDataLoaderTest.java | 7 +++---
...tainedFixtureRuleBasedTableMetaDataBuilder.java | 2 +-
.../metadata/schema/model/TableMetaDataTest.java | 3 +--
.../type/ShardingSphereSchemaBuildUtil.java | 4 ++--
.../sql/context/ExecutionContextBuilderTest.java | 26 +++++++++++-----------
.../DatabaseCommunicationEngineTest.java | 2 +-
.../header/query/impl/QueryHeaderBuilderTest.java | 2 +-
.../common/datasource/MetaDataManagerTest.java | 9 ++++----
25 files changed, 66 insertions(+), 74 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilder.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilder.java
index 9130bf7..1e0265c 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilder.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilder.java
@@ -70,8 +70,7 @@ public final class EncryptTableMetaDataBuilder implements
RuleBasedTableMetaData
}
private ColumnMetaData createColumnMetaData(final String columnName, final
ColumnMetaData columnMetaData) {
- return new ColumnMetaData(columnName,
- columnMetaData.getDataType(),
columnMetaData.getDataTypeName(), columnMetaData.isPrimaryKey(),
columnMetaData.isGenerated(), columnMetaData.isCaseSensitive());
+ return new ColumnMetaData(columnName, columnMetaData.getDataType(),
columnMetaData.isPrimaryKey(), columnMetaData.isGenerated(),
columnMetaData.isCaseSensitive());
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilderTest.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilderTest.java
index dd7580d..2613e73 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilderTest.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-common/src/test/java/org/apache/shardingsphere/encrypt/metadata/EncryptTableMetaDataBuilderTest.java
@@ -138,8 +138,8 @@ public final class EncryptTableMetaDataBuilderTest {
}
private TableMetaData createTableMetaData() {
- Collection<ColumnMetaData> columns = Arrays.asList(new
ColumnMetaData("id", 1, "int", true, true, true),
- new ColumnMetaData("pwd_cipher", 2, "varchar", false, false,
true), new ColumnMetaData("pwd_plain", 2, "varchar", false, false, true));
+ Collection<ColumnMetaData> columns = Arrays.asList(new
ColumnMetaData("id", 1, true, true, true),
+ new ColumnMetaData("pwd_cipher", 2, false, false, true), new
ColumnMetaData("pwd_plain", 2, false, false, true));
return new TableMetaData(columns, Collections.emptyList());
}
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingTableMetaDataBuilder.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingTableMetaDataBuilder.java
index 48c34a1..a3f508c 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingTableMetaDataBuilder.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-common/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingTableMetaDataBuilder.java
@@ -150,8 +150,7 @@ public final class ShardingTableMetaDataBuilder implements
RuleBasedTableMetaDat
Collection<ColumnMetaData> result = new LinkedList<>();
for (Entry<String, ColumnMetaData> entry :
tableMetaData.getColumns().entrySet()) {
if (entry.getKey().equalsIgnoreCase(generateKeyColumn.get())) {
- result.add(new ColumnMetaData(
- entry.getValue().getName(),
entry.getValue().getDataType(), entry.getValue().getDataTypeName(),
entry.getValue().isPrimaryKey(), true, entry.getValue().isCaseSensitive()));
+ result.add(new ColumnMetaData(entry.getValue().getName(),
entry.getValue().getDataType(), entry.getValue().isPrimaryKey(), true,
entry.getValue().isCaseSensitive()));
} else {
result.add(entry.getValue());
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
index 6916d50..9ea516f3 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
@@ -337,9 +337,9 @@ public final class ShardingDQLResultMergerTest {
}
private ShardingSphereSchema buildSchema() {
- ColumnMetaData columnMetaData1 = new ColumnMetaData("col1", 0,
"dataType", false, false, false);
- ColumnMetaData columnMetaData2 = new ColumnMetaData("col2", 0,
"dataType", false, false, false);
- ColumnMetaData columnMetaData3 = new ColumnMetaData("col3", 0,
"dataType", false, false, false);
+ ColumnMetaData columnMetaData1 = new ColumnMetaData("col1", 0, false,
false, false);
+ ColumnMetaData columnMetaData2 = new ColumnMetaData("col2", 0, false,
false, false);
+ ColumnMetaData columnMetaData3 = new ColumnMetaData("col3", 0, false,
false, false);
TableMetaData tableMetaData = new
TableMetaData(Arrays.asList(columnMetaData1, columnMetaData2, columnMetaData3),
Collections.emptyList());
return new ShardingSphereSchema(ImmutableMap.of("tbl", tableMetaData));
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
index 4afbca8..225c2c8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
@@ -179,9 +179,9 @@ public final class GroupByStreamMergedResultTest {
}
private ShardingSphereSchema buildSchema() {
- ColumnMetaData columnMetaData1 = new ColumnMetaData("col1", 0,
"dataType", false, false, false);
- ColumnMetaData columnMetaData2 = new ColumnMetaData("col2", 0,
"dataType", false, false, false);
- ColumnMetaData columnMetaData3 = new ColumnMetaData("col3", 0,
"dataType", false, false, false);
+ ColumnMetaData columnMetaData1 = new ColumnMetaData("col1", 0, false,
false, false);
+ ColumnMetaData columnMetaData2 = new ColumnMetaData("col2", 0, false,
false, false);
+ ColumnMetaData columnMetaData3 = new ColumnMetaData("col3", 0, false,
false, false);
TableMetaData tableMetaData = new
TableMetaData(Arrays.asList(columnMetaData1, columnMetaData2, columnMetaData3),
Collections.emptyList());
return new ShardingSphereSchema(ImmutableMap.of("tbl", tableMetaData));
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
index 57ebb3c..48d58a9 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
@@ -193,8 +193,8 @@ public final class OrderByStreamMergedResultTest {
}
private ShardingSphereSchema buildSchema() {
- ColumnMetaData columnMetaData1 = new ColumnMetaData("col1", 0,
"dataType", false, false, true);
- ColumnMetaData columnMetaData2 = new ColumnMetaData("col2", 0,
"dataType", false, false, false);
+ ColumnMetaData columnMetaData1 = new ColumnMetaData("col1", 0, false,
false, true);
+ ColumnMetaData columnMetaData2 = new ColumnMetaData("col2", 0, false,
false, false);
TableMetaData tableMetaData = new
TableMetaData(Arrays.asList(columnMetaData1, columnMetaData2),
Collections.emptyList());
return new ShardingSphereSchema(ImmutableMap.of("tbl", tableMetaData));
}
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
index bc53ffe..206c1e1 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
@@ -125,7 +125,7 @@ public final class MixSQLRewriterParameterizedTest extends
AbstractSQLRewriterPa
private Map<String, ColumnMetaData> createColumnMetaDataMap() {
Map<String, ColumnMetaData> result = new LinkedHashMap<>(4, 1);
- result.put("account_id", new ColumnMetaData("account_id",
Types.INTEGER, "INT", true, true, false));
+ result.put("account_id", new ColumnMetaData("account_id",
Types.INTEGER, true, true, false));
result.put("password", mock(ColumnMetaData.class));
result.put("amount", mock(ColumnMetaData.class));
result.put("status", mock(ColumnMetaData.class));
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
index 2dd1aff..e071233 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
@@ -120,7 +120,7 @@ public final class ShardingSQLRewriterParameterizedTest
extends AbstractSQLRewri
private Map<String, ColumnMetaData> createColumnMetaDataMap() {
Map<String, ColumnMetaData> result = new LinkedHashMap<>(3, 1);
- result.put("account_id", new ColumnMetaData("account_id",
Types.INTEGER, "INT", true, true, false));
+ result.put("account_id", new ColumnMetaData("account_id",
Types.INTEGER, true, true, false));
result.put("amount", mock(ColumnMetaData.class));
result.put("status", mock(ColumnMetaData.class));
return result;
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index c09380f..d3f4334 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -64,15 +64,15 @@ public abstract class AbstractSQLRouteTest extends
AbstractRoutingEngineTest {
private ShardingSphereSchema buildSchema() {
Map<String, TableMetaData> tableMetaDataMap = new HashMap<>(3, 1);
- tableMetaDataMap.put("t_order", new TableMetaData(Arrays.asList(new
ColumnMetaData("order_id", Types.INTEGER, "int", true, false, false),
- new ColumnMetaData("user_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("status", Types.INTEGER, "int", false,
false, false)), Collections.emptySet()));
- tableMetaDataMap.put("t_order_item", new
TableMetaData(Arrays.asList(new ColumnMetaData("item_id", Types.INTEGER, "int",
true, false, false),
- new ColumnMetaData("order_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("user_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("status", Types.VARCHAR, "varchar", false,
false, false),
- new ColumnMetaData("c_date", Types.TIMESTAMP, "timestamp",
false, false, false)), Collections.emptySet()));
- tableMetaDataMap.put("t_other", new
TableMetaData(Collections.singletonList(new ColumnMetaData("order_id",
Types.INTEGER, "int", true, false, false)), Collections.emptySet()));
+ tableMetaDataMap.put("t_order", new TableMetaData(Arrays.asList(new
ColumnMetaData("order_id", Types.INTEGER, true, false, false),
+ new ColumnMetaData("user_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("status", Types.INTEGER, false, false,
false)), Collections.emptySet()));
+ tableMetaDataMap.put("t_order_item", new
TableMetaData(Arrays.asList(new ColumnMetaData("item_id", Types.INTEGER, true,
false, false),
+ new ColumnMetaData("order_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("user_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("status", Types.VARCHAR, false, false,
false),
+ new ColumnMetaData("c_date", Types.TIMESTAMP, false, false,
false)), Collections.emptySet()));
+ tableMetaDataMap.put("t_other", new
TableMetaData(Collections.singletonList(new ColumnMetaData("order_id",
Types.INTEGER, true, false, false)), Collections.emptySet()));
tableMetaDataMap.put("t_category", new TableMetaData());
return new ShardingSphereSchema(tableMetaDataMap);
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/SchemaYamlSwapper.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/SchemaYamlSwapper.java
index 164d675..864ed2c 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/SchemaYamlSwapper.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/yaml/swapper/SchemaYamlSwapper.java
@@ -78,7 +78,7 @@ public final class SchemaYamlSwapper implements
YamlConfigurationSwapper<YamlSch
}
private ColumnMetaData convertColumn(final YamlColumnMetaData column) {
- return new ColumnMetaData(column.getName(), column.getDataType(),
column.getDataTypeName(), column.isPrimaryKey(), column.isGenerated(),
column.isCaseSensitive());
+ return new ColumnMetaData(column.getName(), column.getDataType(),
column.isPrimaryKey(), column.isGenerated(), column.isCaseSensitive());
}
private YamlTableMetaData convertYamlTable(final TableMetaData table) {
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngineTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngineTest.java
index 265ca8e..b1404fb 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngineTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngineTest.java
@@ -62,7 +62,7 @@ public final class GeneratedKeyContextEngineTest {
@Before
public void setUp() {
- TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("id", Types.INTEGER,
"INT", true, true, false)), Collections.emptyList());
+ TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("id", Types.INTEGER,
true, true, false)), Collections.emptyList());
Map<String, TableMetaData> tableMetaDataMap = new HashMap<>(1, 1);
tableMetaDataMap.put("tbl", tableMetaData);
schema = new ShardingSphereSchema(tableMetaDataMap);
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
index d567c9f..541e53b 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/orderby/engine/OrderByContextEngineTest.java
@@ -17,10 +17,6 @@
package org.apache.shardingsphere.infra.binder.segment.select.orderby.engine;
-import java.sql.Types;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
import
org.apache.shardingsphere.infra.binder.segment.select.groupby.GroupByContext;
import
org.apache.shardingsphere.infra.binder.segment.select.groupby.engine.GroupByContextEngine;
import
org.apache.shardingsphere.infra.binder.segment.select.orderby.OrderByContext;
@@ -51,10 +47,14 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sql92.dml.SQL9
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dml.SQLServerSelectStatement;
import org.junit.Test;
+import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
@@ -246,9 +246,9 @@ public final class OrderByContextEngineTest {
private ShardingSphereSchema
getShardingSphereSchemaForMySQLSelectWithoutOrderBy() {
Map<String, TableMetaData> tables = new HashMap<>();
TableMetaData orderTable = new TableMetaData(Arrays.asList(
- new ColumnMetaData("order_id", Types.INTEGER, "INT", true, true,
false),
- new ColumnMetaData("user_id", Types.INTEGER, "INT", false, false,
false),
- new ColumnMetaData("status", Types.VARCHAR, "VARCHAR", false,
false, false)
+ new ColumnMetaData("order_id", Types.INTEGER, true, true, false),
+ new ColumnMetaData("user_id", Types.INTEGER, false, false, false),
+ new ColumnMetaData("status", Types.VARCHAR, false, false, false)
), Collections.emptyList());
tables.put("t_order", orderTable);
return new ShardingSphereSchema(tables);
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoader.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoader.java
index e979184..f5f3a41 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoader.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoader.java
@@ -82,7 +82,7 @@ public final class ColumnMetaDataLoader {
}
for (int i = 0; i < columnNames.size(); i++) {
// TODO load auto generated from database meta data
- result.add(new ColumnMetaData(columnNames.get(i),
columnTypes.get(i), columnTypeNames.get(i), isPrimaryKeys.get(i), false,
isCaseSensitives.get(i)));
+ result.add(new ColumnMetaData(columnNames.get(i),
columnTypes.get(i), isPrimaryKeys.get(i), false, isCaseSensitives.get(i)));
}
return result;
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
index 845a4a2..fad620a 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/dialect/MySQLTableMetaDataLoader.java
@@ -75,7 +75,7 @@ public final class MySQLTableMetaDataLoader implements
DialectTableMetaDataLoade
boolean primaryKey = "PRI".equals(resultSet.getString("COLUMN_KEY"));
boolean generated =
"auto_increment".equals(resultSet.getString("EXTRA"));
boolean caseSensitive = null != resultSet.getString("COLLATION_NAME")
&& resultSet.getString("COLLATION_NAME").endsWith("_ci");
- return new ColumnMetaData(columnName, dataTypeMap.get(dataType),
dataType, primaryKey, generated, caseSensitive);
+ return new ColumnMetaData(columnName, dataTypeMap.get(dataType),
primaryKey, generated, caseSensitive);
}
@Override
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/ColumnMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/ColumnMetaData.java
index 37f7236..72542bc 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/ColumnMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/model/ColumnMetaData.java
@@ -35,8 +35,6 @@ public final class ColumnMetaData {
private final int dataType;
- private final String dataTypeName;
-
private final boolean primaryKey;
private final boolean generated;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchemaTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchemaTest.java
index 40639e9..0b459f9 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchemaTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/ShardingSphereSchemaTest.java
@@ -66,19 +66,19 @@ public final class ShardingSphereSchemaTest {
@Test
public void assertContainsColumn() {
- TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("col", 0,
"dataType", false, false, false)), Collections.emptyList());
+ TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("col", 0, false,
false, false)), Collections.emptyList());
assertTrue(new ShardingSphereSchema(ImmutableMap.of("tbl",
tableMetaData)).containsColumn("tbl", "col"));
}
@Test
public void assertGetAllColumnNamesWhenContainsKey() {
- TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("col", 0,
"dataType", false, false, false)), Collections.emptyList());
+ TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("col", 0, false,
false, false)), Collections.emptyList());
assertThat(new ShardingSphereSchema(ImmutableMap.of("tbl",
tableMetaData)).getAllColumnNames("tbl"), is(Collections.singletonList("col")));
}
@Test
public void assertGetAllColumnNamesWhenNotContainsKey() {
- TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("col", 0,
"dataType", false, false, false)), Collections.emptyList());
+ TableMetaData tableMetaData = new
TableMetaData(Collections.singletonList(new ColumnMetaData("col", 0, false,
false, false)), Collections.emptyList());
assertThat(new ShardingSphereSchema(ImmutableMap.of("tbl1",
tableMetaData)).getAllColumnNames("tbl2"), is(Collections.<String>emptyList()));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoaderTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoaderTest.java
index d703c6c..74e0892 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoaderTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/ColumnMetaDataLoaderTest.java
@@ -83,14 +83,13 @@ public final class ColumnMetaDataLoaderTest {
Collection<ColumnMetaData> actual =
ColumnMetaDataLoader.load(connection, "tbl", mock(DatabaseType.class,
RETURNS_DEEP_STUBS));
assertThat(actual.size(), is(2));
Iterator<ColumnMetaData> columnMetaDataIterator = actual.iterator();
- assertColumnMetaData(columnMetaDataIterator.next(), "pk_col",
Types.INTEGER, "INT", true, true);
- assertColumnMetaData(columnMetaDataIterator.next(), "col",
Types.VARCHAR, "VARCHAR", false, false);
+ assertColumnMetaData(columnMetaDataIterator.next(), "pk_col",
Types.INTEGER, true, true);
+ assertColumnMetaData(columnMetaDataIterator.next(), "col",
Types.VARCHAR, false, false);
}
- private void assertColumnMetaData(final ColumnMetaData actual, final
String name, final int dataType, final String typeName, final boolean
primaryKey, final boolean caseSensitive) {
+ private void assertColumnMetaData(final ColumnMetaData actual, final
String name, final int dataType, final boolean primaryKey, final boolean
caseSensitive) {
assertThat(actual.getName(), is(name));
assertThat(actual.getDataType(), is(dataType));
- assertThat(actual.getDataTypeName(), is(typeName));
assertThat(actual.isPrimaryKey(), is(primaryKey));
assertThat(actual.isCaseSensitive(), is(caseSensitive));
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/TableMetaDataLoaderTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/TableMetaDataLoaderTest.java
index bfaba2f..5cb6ba3 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/TableMetaDataLoaderTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/TableMetaDataLoaderTest.java
@@ -108,17 +108,16 @@ public final class TableMetaDataLoaderTest {
assertTrue(actual.isPresent());
Map<String, ColumnMetaData> columnMetaDataMap =
actual.get().getColumns();
assertThat(columnMetaDataMap.size(), is(2));
- assertColumnMetaData(columnMetaDataMap.get("pk_col"), "pk_col",
Types.INTEGER, "INT", true, true);
- assertColumnMetaData(columnMetaDataMap.get("col"), "col",
Types.VARCHAR, "VARCHAR", false, false);
+ assertColumnMetaData(columnMetaDataMap.get("pk_col"), "pk_col",
Types.INTEGER, true, true);
+ assertColumnMetaData(columnMetaDataMap.get("col"), "col",
Types.VARCHAR, false, false);
Map<String, IndexMetaData> indexMetaDataMap =
actual.get().getIndexes();
assertThat(indexMetaDataMap.size(), is(1));
assertTrue(indexMetaDataMap.containsKey("my_index"));
}
- private void assertColumnMetaData(final ColumnMetaData actual, final
String name, final int dataType, final String typeName, final boolean
primaryKey, final boolean caseSensitive) {
+ private void assertColumnMetaData(final ColumnMetaData actual, final
String name, final int dataType, final boolean primaryKey, final boolean
caseSensitive) {
assertThat(actual.getName(), is(name));
assertThat(actual.getDataType(), is(dataType));
- assertThat(actual.getDataTypeName(), is(typeName));
assertThat(actual.isPrimaryKey(), is(primaryKey));
assertThat(actual.isCaseSensitive(), is(caseSensitive));
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/fixture/loader/DataNodeContainedFixtureRuleBasedTableMetaDataBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/fixture/loader/DataNodeContainedFixtureRuleBasedTableMetaDataBuilder.java
index bc1ccdb..c2f29b0 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/fixture/loader/DataNodeContainedFixtureRuleBasedTableMetaDataBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/fixture/loader/DataNodeContainedFixtureRuleBasedTableMetaDataBuilder.java
@@ -41,7 +41,7 @@ public final class
DataNodeContainedFixtureRuleBasedTableMetaDataBuilder impleme
@Override
public TableMetaData decorate(final String tableName, final TableMetaData
tableMetaData, final DataNodeContainedFixtureRule rule) {
- ColumnMetaData columnMetaData = new ColumnMetaData("id", 1, "INT",
true, true, false);
+ ColumnMetaData columnMetaData = new ColumnMetaData("id", 1, true,
true, false);
return new TableMetaData(Collections.singletonList(columnMetaData),
Collections.emptyList());
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaDataTest.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaDataTest.java
index dd73de7..b927506 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaDataTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/model/TableMetaDataTest.java
@@ -34,7 +34,7 @@ public final class TableMetaDataTest {
@Before
public void setUp() {
- tableMetaData = new TableMetaData(Collections.singletonList(new
ColumnMetaData("test", Types.INTEGER, "INT", true, false, true)),
Collections.emptyList());
+ tableMetaData = new TableMetaData(Collections.singletonList(new
ColumnMetaData("test", Types.INTEGER, true, false, true)),
Collections.emptyList());
}
@Test
@@ -42,7 +42,6 @@ public final class TableMetaDataTest {
ColumnMetaData actual = tableMetaData.getColumnMetaData(0);
assertThat(actual.getName(), is("test"));
assertThat(actual.getDataType(), is(Types.INTEGER));
- assertThat(actual.getDataTypeName(), is("INT"));
assertTrue(actual.isPrimaryKey());
assertFalse(actual.isGenerated());
assertTrue(actual.isCaseSensitive());
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/ShardingSphereSchemaBuildUtil.java
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/ShardingSphereSchemaBuildUtil.java
index 34db801..b6b0b60 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/ShardingSphereSchemaBuildUtil.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/schema/refresher/type/ShardingSphereSchemaBuildUtil.java
@@ -36,7 +36,7 @@ public final class ShardingSphereSchemaBuildUtil {
* @return ShardingSphere schema
*/
public static ShardingSphereSchema buildSchema() {
- return new ShardingSphereSchema(ImmutableMap.of("t_order", new
TableMetaData(
- Collections.singletonList(new ColumnMetaData("order_id", 1,
"String", false, false, false)), Collections.singletonList(new
IndexMetaData("index")))));
+ return new ShardingSphereSchema(ImmutableMap.of("t_order",
+ new TableMetaData(Collections.singletonList(new
ColumnMetaData("order_id", 1, false, false, false)),
Collections.singletonList(new IndexMetaData("index")))));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
index c582abf..4fd9c93 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
@@ -105,24 +105,24 @@ public final class ExecutionContextBuilderTest {
private ShardingSphereSchema buildSchemaWithoutPrimaryKey() {
Map<String, TableMetaData> tableMetaDataMap = new HashMap<>(3, 1);
- tableMetaDataMap.put("logicName1", new TableMetaData(Arrays.asList(new
ColumnMetaData("order_id", Types.INTEGER, "int", true, false, false),
- new ColumnMetaData("user_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("status", Types.INTEGER, "int", false,
false, false)), Collections.emptySet()));
- tableMetaDataMap.put("t_other", new
TableMetaData(Collections.singletonList(new ColumnMetaData("order_id",
Types.INTEGER, "int", true, false, false)), Collections.emptySet()));
+ tableMetaDataMap.put("logicName1", new TableMetaData(Arrays.asList(new
ColumnMetaData("order_id", Types.INTEGER, true, false, false),
+ new ColumnMetaData("user_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("status", Types.INTEGER, false, false,
false)), Collections.emptySet()));
+ tableMetaDataMap.put("t_other", new
TableMetaData(Collections.singletonList(new ColumnMetaData("order_id",
Types.INTEGER, true, false, false)), Collections.emptySet()));
return new ShardingSphereSchema(tableMetaDataMap);
}
private ShardingSphereSchema buildSchema() {
Map<String, TableMetaData> tableMetaDataMap = new HashMap<>(3, 1);
- tableMetaDataMap.put("logicName1", new TableMetaData(Arrays.asList(new
ColumnMetaData("order_id", Types.INTEGER, "int", true, false, false),
- new ColumnMetaData("user_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("status", Types.INTEGER, "int", false,
false, false)), Collections.emptySet()));
- tableMetaDataMap.put("logicName2", new TableMetaData(Arrays.asList(new
ColumnMetaData("item_id", Types.INTEGER, "int", true, false, false),
- new ColumnMetaData("order_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("user_id", Types.INTEGER, "int", false,
false, false),
- new ColumnMetaData("status", Types.VARCHAR, "varchar", false,
false, false),
- new ColumnMetaData("c_date", Types.TIMESTAMP, "timestamp",
false, false, false)), Collections.emptySet()));
- tableMetaDataMap.put("t_other", new
TableMetaData(Collections.singletonList(new ColumnMetaData("order_id",
Types.INTEGER, "int", true, false, false)), Collections.emptySet()));
+ tableMetaDataMap.put("logicName1", new TableMetaData(Arrays.asList(new
ColumnMetaData("order_id", Types.INTEGER, true, false, false),
+ new ColumnMetaData("user_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("status", Types.INTEGER, false, false,
false)), Collections.emptySet()));
+ tableMetaDataMap.put("logicName2", new TableMetaData(Arrays.asList(new
ColumnMetaData("item_id", Types.INTEGER, true, false, false),
+ new ColumnMetaData("order_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("user_id", Types.INTEGER, false, false,
false),
+ new ColumnMetaData("status", Types.VARCHAR, false, false,
false),
+ new ColumnMetaData("c_date", Types.TIMESTAMP, false, false,
false)), Collections.emptySet()));
+ tableMetaDataMap.put("t_other", new
TableMetaData(Collections.singletonList(new ColumnMetaData("order_id",
Types.INTEGER, true, false, false)), Collections.emptySet()));
return new ShardingSphereSchema(tableMetaDataMap);
}
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
index 98c8846..7e8c144 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngineTest.java
@@ -112,7 +112,7 @@ public final class DatabaseCommunicationEngineTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereMetaData result = mock(ShardingSphereMetaData.class,
RETURNS_DEEP_STUBS);
- ColumnMetaData columnMetaData = new ColumnMetaData("order_id",
Types.INTEGER, "int", true, false, false);
+ ColumnMetaData columnMetaData = new ColumnMetaData("order_id",
Types.INTEGER, true, false, false);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.get("t_logic_order")).thenReturn(new
TableMetaData(Collections.singletonList(columnMetaData),
Collections.singletonList(new IndexMetaData("order_id"))));
DataSourcesMetaData dataSourcesMetaData =
mock(DataSourcesMetaData.class);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
index 8cc5339..40b90f1 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/query/impl/QueryHeaderBuilderTest.java
@@ -126,7 +126,7 @@ public final class QueryHeaderBuilderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereMetaData result = mock(ShardingSphereMetaData.class,
RETURNS_DEEP_STUBS);
- ColumnMetaData columnMetaData = new ColumnMetaData("order_id",
Types.INTEGER, "int", true, false, false);
+ ColumnMetaData columnMetaData = new ColumnMetaData("order_id",
Types.INTEGER, true, false, false);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.get("t_logic_order")).thenReturn(new
TableMetaData(Collections.singletonList(columnMetaData),
Collections.singletonList(new IndexMetaData("order_id"))));
DataSourcesMetaData dataSourcesMetaData =
mock(DataSourcesMetaData.class);
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/MetaDataManagerTest.java
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/MetaDataManagerTest.java
index b331960..1fb1537 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/MetaDataManagerTest.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/common/datasource/MetaDataManagerTest.java
@@ -120,15 +120,14 @@ public final class MetaDataManagerTest {
private void assertColumnMetaData(final TableMetaData actual) {
assertThat(actual.getColumns().size(), is(3));
- assertColumnMetaData(actual.getColumnMetaData(0), "id", Types.BIGINT,
"BIGINT");
- assertColumnMetaData(actual.getColumnMetaData(1), "name",
Types.VARCHAR, "VARCHAR");
- assertColumnMetaData(actual.getColumnMetaData(2), "age",
Types.INTEGER, "INTEGER");
+ assertColumnMetaData(actual.getColumnMetaData(0), "id", Types.BIGINT);
+ assertColumnMetaData(actual.getColumnMetaData(1), "name",
Types.VARCHAR);
+ assertColumnMetaData(actual.getColumnMetaData(2), "age",
Types.INTEGER);
}
- private void assertColumnMetaData(final ColumnMetaData actual, final
String expectedName, final int expectedType, final String expectedTypeName) {
+ private void assertColumnMetaData(final ColumnMetaData actual, final
String expectedName, final int expectedType) {
assertThat(actual.getName(), is(expectedName));
assertThat(actual.getDataType(), is(expectedType));
- assertThat(actual.getDataTypeName(), is(expectedTypeName));
}
@Test(expected = RuntimeException.class)
