Commit 20157769 authored by codefairy08's avatar codefairy08
Browse files

Merge branch 'dev' of https://github.com/sharding-sphere/sharding-sphere into dev 

# Conflicts:
#	sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/definition/column/RenameColumnDefinitionExtractor.java
#	sharding-core/src/test/resources/antlr_parser/mysql/ddl/alter.xml
#	sharding-core/src/test/resources/antlr_parser/postgre/ddl/alter.xml
parents 753a5439 a5c82539

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public final class ColumnMetaData { 
    

    private final String columnName;

    

    private final String columnType;

    private final String dataType;

    

    private final boolean primaryKey;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import java.util.LinkedList; 
@ToString

public final class TableMetaData {

    

    private final Collection<ColumnMetaData> columnMetaData;

    private final Collection<ColumnMetaData> columnMetaDataList;

    

    /**

     * Get all column names.
@@ -45,7 +45,7 @@ public final class TableMetaData { 
     */

    public Collection<String> getAllColumnNames() {

        Collection<String> result = new LinkedList<>();

        for (ColumnMetaData each : columnMetaData) {

        for (ColumnMetaData each : columnMetaDataList) {

            result.add(each.getColumnName().toLowerCase());

        }

        return result;

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/AddColumnDefinitionExtractor.java→sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/definition/column/AddColumnDefinitionExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingsphere.core.parsing.antlr.extractor.impl;

package io.shardingsphere.core.parsing.antlr.extractor.impl.definition.column;



import com.google.common.base.Optional;

import io.shardingsphere.core.parsing.antlr.extractor.CollectionSQLSegmentExtractor;

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/ColumnDefinitionExtractor.java→sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/definition/column/ColumnDefinitionExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingsphere.core.parsing.antlr.extractor.impl;

package io.shardingsphere.core.parsing.antlr.extractor.impl.definition.column;



import com.google.common.base.Optional;

import io.shardingsphere.core.parsing.antlr.extractor.OptionalSQLSegmentExtractor;

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/ColumnDefinitionsExtractor.java→sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/extractor/impl/definition/column/ColumnDefinitionsExtractor.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * </p>

 */



package io.shardingsphere.core.parsing.antlr.extractor.impl;

package io.shardingsphere.core.parsing.antlr.extractor.impl.definition.column;



import com.google.common.base.Optional;

import io.shardingsphere.core.parsing.antlr.extractor.CollectionSQLSegmentExtractor;