Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
nancyzrh committed Jan 19, 2020
1 parent 818d857 commit fe25dfc
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ...c/test/resources/META-INF/parsing-rule-definition/mysql/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,6 +17,6 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" />
</sql-statement-rule-definition>
2 changes: 1 addition & 1 deletion .../test/resources/META-INF/parsing-rule-definition/oracle/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,6 +17,6 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" />
</sql-statement-rule-definition>
2 changes: 1 addition & 1 deletion ...t/resources/META-INF/parsing-rule-definition/postgresql/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,6 +17,6 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" />
</sql-statement-rule-definition>
2 changes: 1 addition & 1 deletion ...st/resources/META-INF/parsing-rule-definition/sqlserver/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,6 +17,6 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" />
</sql-statement-rule-definition>
2 changes: 1 addition & 1 deletion ...c/main/resources/META-INF/parsing-rule-definition/mysql/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,7 +17,7 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, where, predicate, groupBy, orderBy, limit, subqueryPredicate, lock" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, where, predicate, groupBy, orderBy, limit, subqueryPredicate, lock" />
<sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement" extractor-rule-refs="table, columns, insertColumns, insertValues, setAssignments, onDuplicateKeyColumns" />
<sql-statement-rule context="update" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.UpdateStatement" extractor-rule-refs="tableReferences, columns, setAssignments, where, predicate" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" extractor-rule-refs="tables, columns, where, predicate" />
Expand Down
2 changes: 1 addition & 1 deletion .../main/resources/META-INF/parsing-rule-definition/oracle/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,7 +17,7 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, subqueryPredicate, where, predicate, groupBy, orderBy" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, subqueryPredicate, where, predicate, groupBy, orderBy" />
<sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement" extractor-rule-refs="table, columns, insertColumns, insertValues" />
<sql-statement-rule context="update" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.UpdateStatement" extractor-rule-refs="tableReferences, columns, setAssignments, where, predicate" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" extractor-rule-refs="tables, columns, where, predicate" />
Expand Down
2 changes: 1 addition & 1 deletion ...n/resources/META-INF/parsing-rule-definition/postgresql/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,7 +17,7 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, where, predicate, groupBy, orderBy, limit, subqueryPredicate" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, where, predicate, groupBy, orderBy, limit, subqueryPredicate" />
<sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement" extractor-rule-refs="table, columns, insertColumns, insertValues" />
<sql-statement-rule context="update" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.UpdateStatement" extractor-rule-refs="tableReferences, columns, setAssignments, where, predicate" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" extractor-rule-refs="tables, columns, where, predicate" />
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/resources/META-INF/parsing-rule-definition/sql92/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,7 +17,7 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, where, predicate, groupBy, orderBy, limit, subqueryPredicate" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, where, predicate, groupBy, orderBy, limit, subqueryPredicate" />
<sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement" extractor-rule-refs="table, columns, insertColumns, insertValues, setAssignments, onDuplicateKeyColumns" />
<sql-statement-rule context="update" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.UpdateStatement" extractor-rule-refs="tableReferences, columns, setAssignments, where, predicate" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" extractor-rule-refs="tables, columns, where, predicate" />
Expand Down
2 changes: 1 addition & 1 deletion ...in/resources/META-INF/parsing-rule-definition/sqlserver/sql-statement-rule-definition.xml
View file
Expand Up @@ -17,7 +17,7 @@
-->

<sql-statement-rule-definition>
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, subqueryPredicate, where, predicate, groupBy, orderBy" />
<sql-statement-rule context="select" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dql.SelectStatement" extractor-rule-refs="tableReferences, columns, projections, subqueryPredicate, where, predicate, groupBy, orderBy" />
<sql-statement-rule context="insert" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.InsertStatement" extractor-rule-refs="table, columns, insertColumns, insertValues" />
<sql-statement-rule context="update" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.UpdateStatement" extractor-rule-refs="tableReferences, columns, setAssignments, where, predicate" />
<sql-statement-rule context="delete" sql-statement-class="org.apache.shardingsphere.sql.parser.sql.statement.dml.DeleteStatement" extractor-rule-refs="tables, columns, where, predicate" />
Expand Down

0 comments on commit fe25dfc

Please sign in to comment.