Commit b48e9155 authored by terrymanu's avatar terrymanu
Browse files

add TableMetaDataFactoryTest

parent b016c525

sharding-core/src/main/java/io/shardingsphere/core/metadata/table/ShardingTableMetaData.java

+2 −6
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public final class ShardingTableMetaData { 
     * @return contains column from table meta data or not

     */

    public boolean containsColumn(final String tableName, final String column) {

        return containsTable(tableName) && tables.get(tableName).getAllColumnNames().contains(column.toLowerCase());

        return containsTable(tableName) && tables.get(tableName).getColumns().keySet().contains(column.toLowerCase());

    }

    

    /**
@@ -93,10 +93,6 @@ public final class ShardingTableMetaData { 
     * @return column names.

     */

    public Collection<String> getAllColumnNames(final String tableName) {

        TableMetaData tableMeta = tables.get(tableName);

        if (null == tableMeta) {

            return Collections.emptyList();

        }

        return tableMeta.getAllColumnNames();

        return tables.containsKey(tableName) ? tables.get(tableName).getColumns().keySet() : Collections.<String>emptyList();

    }

}

sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaData.java

+2 −18
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
package io.shardingsphere.core.metadata.table;



import lombok.EqualsAndHashCode;

import lombok.Getter;

import lombok.ToString;



import java.util.Collection;
@@ -29,6 +30,7 @@ import java.util.Map; 
 *

 * @author panjuan

 */

@Getter

@EqualsAndHashCode

@ToString

public final class TableMetaData {
@@ -41,22 +43,4 @@ public final class TableMetaData { 
            columns.put(each.getColumnName(), each);

        }

    }

    

    /**

     * Get all column names.

     *

     * @return column names

     */

    public Collection<String> getAllColumnNames() {

        return columns.keySet();

    }

    

    /**

     * Get all column meta data.

     *

     * @return column meta data

     */

    public Collection<ColumnMetaData> getAllColumns() {

        return columns.values();

    }

}

sharding-core/src/main/java/io/shardingsphere/core/metadata/table/TableMetaDataFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public final class TableMetaDataFactory { 
    

    private static List<ColumnMetaData> createNewColumnMetaDataList(final AlterTableStatement alterTableStatement, final TableMetaData oldTableMetaData) {

        List<ColumnMetaData> result = new LinkedList<>();

        for (ColumnMetaData each : oldTableMetaData.getAllColumns()) {

        for (ColumnMetaData each : oldTableMetaData.getColumns().values()) {

            String columnName;

            String dataType;

            boolean primaryKey;

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/statement/ddl/AlterTableStatement.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public final class AlterTableStatement extends DDLStatement { 
        if (!shardingTableMetaData.containsTable(getTables().getSingleTableName())) {

            return Optional.absent();

        }

        for (ColumnMetaData each : shardingTableMetaData.get(getTables().getSingleTableName()).getAllColumns()) {

        for (ColumnMetaData each : shardingTableMetaData.get(getTables().getSingleTableName()).getColumns().values()) {

            if (columnName.equalsIgnoreCase(each.getColumnName())) {

                return Optional.of(new ColumnDefinitionSegment(columnName, each.getDataType(), each.isPrimaryKey()));

            }

sharding-core/src/test/java/io/shardingsphere/core/metadata/AllMetaDataTests.java

+9 −7
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import io.shardingsphere.core.metadata.datasource.dialect.MySQLDataSourceMetaDat 
import io.shardingsphere.core.metadata.datasource.dialect.OracleDataSourceMetaDataTest;

import io.shardingsphere.core.metadata.datasource.dialect.PostgreSQLDataSourceMetaDataTest;

import io.shardingsphere.core.metadata.datasource.dialect.SQLServerDataSourceMetaDataTest;

import io.shardingsphere.core.metadata.table.TableMetaDataFactoryTest;

import org.junit.runner.RunWith;

import org.junit.runners.Suite;

import org.junit.runners.Suite.SuiteClasses;
@@ -36,7 +37,8 @@ import org.junit.runners.Suite.SuiteClasses; 
        PostgreSQLDataSourceMetaDataTest.class, 

        SQLServerDataSourceMetaDataTest.class, 

        DataSourceMetaDataFactoryTest.class, 

        ShardingDataSourceMetaDataTest.class

        ShardingDataSourceMetaDataTest.class, 

        TableMetaDataFactoryTest.class

    })

public final class AllMetaDataTests {

}