Commit 1e444ad8 authored by terrymanu's avatar terrymanu
Browse files

refactor AddColumnDefinitionSegment & ModifyColumnDefinitionSegment

parent e9636d28

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/filler/impl/ddl/AddColumnDefinitionFiller.java

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ public final class AddColumnDefinitionFiller implements SQLStatementFiller<AddCo 
        if (!alterTableStatement.findColumnDefinitionFromMetaData(sqlSegment.getColumnDefinition().getColumnName(), shardingTableMetaData).isPresent()) {

            alterTableStatement.getAddedColumnDefinitions().add(columnDefinition);

        }

        if (null != sqlSegment.getColumnPosition()) {

            alterTableStatement.getPositionChangedColumns().add(sqlSegment.getColumnPosition());

        if (sqlSegment.getColumnPosition().isPresent()) {

            alterTableStatement.getPositionChangedColumns().add(sqlSegment.getColumnPosition().get());

        }

    }

}

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/filler/impl/ddl/ModifyColumnDefinitionFiller.java

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ public final class ModifyColumnDefinitionFiller implements SQLStatementFiller<Mo 
                    sqlSegment.getColumnDefinition().getColumnName(), sqlSegment.getColumnDefinition().getDataType(), sqlSegment.getColumnDefinition().isPrimaryKey());

            alterTableStatement.getModifiedColumnDefinitions().put(sqlSegment.getColumnDefinition().getColumnName(), columnDefinition);

        }

        if (null != sqlSegment.getColumnPosition()) {

            alterTableStatement.getPositionChangedColumns().add(sqlSegment.getColumnPosition());

        if (sqlSegment.getColumnPosition().isPresent()) {

            alterTableStatement.getPositionChangedColumns().add(sqlSegment.getColumnPosition().get());

        }

    }

}

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/definition/column/alter/AddColumnDefinitionSegment.java

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


package io.shardingsphere.core.parsing.antlr.sql.segment.definition.column.alter;



import com.google.common.base.Optional;

import io.shardingsphere.core.parsing.antlr.sql.segment.SQLSegment;

import io.shardingsphere.core.parsing.antlr.sql.segment.definition.column.ColumnDefinitionSegment;

import io.shardingsphere.core.parsing.antlr.sql.segment.definition.column.ColumnPositionSegment;
@@ -37,4 +38,13 @@ public final class AddColumnDefinitionSegment implements SQLSegment { 
    private final ColumnDefinitionSegment columnDefinition;

    

    private ColumnPositionSegment columnPosition;

    

    /**

     * Get column position.

     * 

     * @return column position

     */

    public Optional<ColumnPositionSegment> getColumnPosition() {

        return Optional.fromNullable(columnPosition);

    }

}

sharding-core/src/main/java/io/shardingsphere/core/parsing/antlr/sql/segment/definition/column/alter/ModifyColumnDefinitionSegment.java

+9 −0
Original line number Diff line number Diff line
@@ -49,4 +49,13 @@ public final class ModifyColumnDefinitionSegment implements SQLSegment { 
    public Optional<String> getOldColumnName() {

        return Optional.fromNullable(oldColumnName);

    }

    

    /**

     * Get column position.

     *

     * @return column position

     */

    public Optional<ColumnPositionSegment> getColumnPosition() {

        return Optional.fromNullable(columnPosition);

    }

}