Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename xmlNamespacesClause define #29292

Merged
merged 1 commit into from
Dec 7, 2023
Merged

Rename xmlNamespacesClause define #29292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2042,18 +2042,18 @@ xmlSerializeFunction
;

xmlTableFunction
: XMLTABLE LP_ (xmlNameSpacesClause COMMA_)? STRING_ xmlTableOptions RP_
: XMLTABLE LP_ (xmlNamespacesClause COMMA_)? STRING_ xmlTableOptions RP_
;

xmlIsSchemaValidFunction
: (owner DOT_)* name DOT_ ISSCHEMAVALID LP_ expr (COMMA_ expr)* RP_
;

xmlNameSpacesClause
: XMLNAMESPACES LP_ (defaultString COMMA_)? (xmlNameSpaceStringAsIdentifier | defaultString) (COMMA_ (xmlNameSpaceStringAsIdentifier | defaultString))* RP_
xmlNamespacesClause
: XMLNAMESPACES LP_ (defaultString COMMA_)? (xmlNamespaceStringAsIdentifier | defaultString) (COMMA_ (xmlNamespaceStringAsIdentifier | defaultString))* RP_
;

xmlNameSpaceStringAsIdentifier
xmlNamespaceStringAsIdentifier
: STRING_ AS identifier
;

Expand Down
4 changes: 2 additions & 2 deletions parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ groupsClause

xmlIndexXmltableClause
: XMLTABLE identifier (LP_ segmentAttributesClause tableCompression? inmemoryTableClause? tableProperties RP_)?
( xmlNameSpacesClause COMMA_)? xQueryString=STRING_ (PASSING identifier)? COLUMNS columnClause (COMMA_ columnClause)*
( xmlNamespacesClause COMMA_)? xQueryString=STRING_ (PASSING identifier)? COLUMNS columnClause (COMMA_ columnClause)*
;

columnClause
Expand All @@ -534,7 +534,7 @@ alterIndexGroupClause
;

addColumnOptions
: (GROUP identifier)? XMLTABLE identifier (xmlNameSpacesClause COMMA_)? COLUMNS columnClause (COMMA_ columnClause)*
: (GROUP identifier)? XMLTABLE identifier (xmlNamespacesClause COMMA_)? COLUMNS columnClause (COMMA_ columnClause)*
;

dropColumnOptions
Expand Down
26 changes: 13 additions & 13 deletions ...org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlForestFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlIsSchemaValidFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNameSpaceStringAsIdentifierContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNameSpacesClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNamespaceStringAsIdentifierContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlNamespacesClauseContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlParseFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlPiFunctionContext;
import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.XmlQueryFunctionContext;
Expand Down Expand Up @@ -127,8 +127,8 @@
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.multiset.MultisetExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.NotExpression;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlElementFunctionSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNameSpaceStringAsIdentifierSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNameSpacesClauseSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNamespaceStringAsIdentifierSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlNamespacesClauseSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlPiFunctionSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlQueryAndExistsFunctionSegment;
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.oracle.xml.XmlSerializeFunctionSegment;
Expand Down Expand Up @@ -874,25 +874,25 @@ public ASTNode visitXmlSerializeFunction(final XmlSerializeFunctionContext ctx)

@Override
public ASTNode visitXmlTableFunction(final XmlTableFunctionContext ctx) {
XmlNameSpacesClauseSegment xmlNameSpacesClause = null == ctx.xmlNameSpacesClause() ? null : (XmlNameSpacesClauseSegment) visit(ctx.xmlNameSpacesClause());
XmlNamespacesClauseSegment xmlNamespacesClause = null == ctx.xmlNamespacesClause() ? null : (XmlNamespacesClauseSegment) visit(ctx.xmlNamespacesClause());
return new XmlTableFunctionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.XMLTABLE().getText(),
xmlNameSpacesClause, ctx.STRING_().getText(), (XmlTableOptionsSegment) visit(ctx.xmlTableOptions()), getOriginalText(ctx));
xmlNamespacesClause, ctx.STRING_().getText(), (XmlTableOptionsSegment) visit(ctx.xmlTableOptions()), getOriginalText(ctx));
}

@Override
public ASTNode visitXmlNameSpacesClause(final XmlNameSpacesClauseContext ctx) {
public ASTNode visitXmlNamespacesClause(final XmlNamespacesClauseContext ctx) {
// TODO : throw exception if more than one defaultString exists in a xml name space clause
String defaultString = null == ctx.defaultString() ? null : ctx.defaultString(0).STRING_().getText();
Collection<XmlNameSpaceStringAsIdentifierSegment> xmlNameSpaceStringAsIdentifierSegments = null == ctx.xmlNameSpaceStringAsIdentifier() ? Collections.emptyList()
: ctx.xmlNameSpaceStringAsIdentifier().stream().map(each -> (XmlNameSpaceStringAsIdentifierSegment) visit(each)).collect(Collectors.toList());
XmlNameSpacesClauseSegment result = new XmlNameSpacesClauseSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), defaultString, getOriginalText(ctx));
result.getStringAsIdentifier().addAll(xmlNameSpaceStringAsIdentifierSegments);
Collection<XmlNamespaceStringAsIdentifierSegment> xmlNamespaceStringAsIdentifierSegments = null == ctx.xmlNamespaceStringAsIdentifier() ? Collections.emptyList()
: ctx.xmlNamespaceStringAsIdentifier().stream().map(each -> (XmlNamespaceStringAsIdentifierSegment) visit(each)).collect(Collectors.toList());
XmlNamespacesClauseSegment result = new XmlNamespacesClauseSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), defaultString, getOriginalText(ctx));
result.getStringAsIdentifier().addAll(xmlNamespaceStringAsIdentifierSegments);
return result;
}

@Override
public ASTNode visitXmlNameSpaceStringAsIdentifier(final XmlNameSpaceStringAsIdentifierContext ctx) {
return new XmlNameSpaceStringAsIdentifierSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.STRING_().getText(), ctx.identifier().getText(), getOriginalText(ctx));
public ASTNode visitXmlNamespaceStringAsIdentifier(final XmlNamespaceStringAsIdentifierContext ctx) {
return new XmlNamespaceStringAsIdentifierSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ctx.STRING_().getText(), ctx.identifier().getText(), getOriginalText(ctx));
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions ...mlNameSpaceStringAsIdentifierSegment.java → ...mlNamespaceStringAsIdentifierSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.complex.ComplexExpressionSegment;

/**
* Xml name spaces string as identifier segment.
* Xml namespaces string as identifier segment.
*/
@RequiredArgsConstructor
@Getter
public final class XmlNameSpaceStringAsIdentifierSegment implements ComplexExpressionSegment {
public final class XmlNamespaceStringAsIdentifierSegment implements ComplexExpressionSegment {

private final int startIndex;

private final int stopIndex;

private final String xmlNameSpaceString;
private final String xmlNamespaceString;

private final String xmlNameSpaceIdentifier;
private final String xmlNamespaceIdentifier;

private final String text;
}
6 changes: 3 additions & 3 deletions ...racle/xml/XmlNameSpacesClauseSegment.java → ...racle/xml/XmlNamespacesClauseSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
import java.util.LinkedList;

/**
* Xml name spaces segment.
* Xml namespaces segment.
*/
@RequiredArgsConstructor
@Getter
public final class XmlNameSpacesClauseSegment implements ComplexExpressionSegment {
public final class XmlNamespacesClauseSegment implements ComplexExpressionSegment {

private final int startIndex;

private final int stopIndex;

private final String defaultString;

private final Collection<XmlNameSpaceStringAsIdentifierSegment> stringAsIdentifier = new LinkedList<>();
private final Collection<XmlNamespaceStringAsIdentifierSegment> stringAsIdentifier = new LinkedList<>();

private final String text;
}
2 changes: 1 addition & 1 deletion ...che/shardingsphere/sql/parser/sql/dialect/segment/oracle/xml/XmlTableFunctionSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public final class XmlTableFunctionSegment implements ComplexExpressionSegment,

private final String functionName;

private final XmlNameSpacesClauseSegment xmlNameSpacesClause;
private final XmlNamespacesClauseSegment xmlNamespacesClause;

private final String xQueryString;

Expand Down