-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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.
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
Support parsing SQL Server SELECT name, sql #29627
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
dbf6a86
draft
yydeng626 654b79f
Merge branch 'master' into 29174
yydeng626 ae82871
Merge branch 'master' into 29174
yydeng626 56d9c72
Support parsing SQL Server SELECT name, sql
yydeng626 1d511da
remove test parser
yydeng626 bb1c172
fix test error
yydeng626 5ad1e56
fix code style check
yydeng626 a0d15dd
Merge branch 'master' into 29174
yydeng626 b6e5082
Merge branch 'master' into 29174
yydeng626 01b628b
Merge branch 'master' into 29174
yydeng626 76a01d6
fix code style
yydeng626 9e9caa7
Merge branch 'master' into 29174
yydeng626 f87c60a
fix code style
yydeng626 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -692,3 +692,6 @@ WITHOUT | |
: W I T H O U T | ||
; | ||
|
||
APPLY | ||
: A P P L Y | ||
; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
.../org/apache/shardingsphere/sql/parser/sql/dialect/segment/sqlserver/exec/ExecSegment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.shardingsphere.sql.parser.sql.dialect.segment.sqlserver.exec; | ||
|
||
import lombok.Getter; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.Setter; | ||
import org.apache.shardingsphere.sql.parser.sql.common.segment.SQLSegment; | ||
import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.routine.FunctionNameSegment; | ||
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment; | ||
|
||
import java.util.Collection; | ||
import java.util.LinkedList; | ||
|
||
/** | ||
* Execute segment. | ||
*/ | ||
@RequiredArgsConstructor | ||
@Getter | ||
public final class ExecSegment implements SQLSegment { | ||
|
||
private final int startIndex; | ||
|
||
private final int stopIndex; | ||
|
||
@Setter | ||
private FunctionNameSegment procedureName; | ||
|
||
private final Collection<ExpressionSegment> expressionSegments = new LinkedList<>(); | ||
} |
40 changes: 40 additions & 0 deletions
40
...shardingsphere/sql/parser/sql/dialect/statement/sqlserver/dml/SQLServerCallStatement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.dml; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment; | ||
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.CallStatement; | ||
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLServerStatement; | ||
|
||
import java.util.List; | ||
|
||
/** | ||
* SQLServer call statement. | ||
*/ | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
@Getter | ||
public final class SQLServerCallStatement extends CallStatement implements SQLServerStatement { | ||
|
||
private String procedureName; | ||
|
||
private List<ExpressionSegment> parameters; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...dingsphere/test/it/sql/parser/internal/asserts/segment/insert/InsertExecClauseAssert.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.insert; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.NoArgsConstructor; | ||
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment; | ||
import org.apache.shardingsphere.sql.parser.sql.dialect.segment.sqlserver.exec.ExecSegment; | ||
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext; | ||
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.SQLSegmentAssert; | ||
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.expression.ExpressionAssert; | ||
import org.apache.shardingsphere.test.it.sql.parser.internal.asserts.segment.owner.OwnerAssert; | ||
import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.impl.exec.ExpectedExecClause; | ||
import org.hamcrest.CoreMatchers; | ||
|
||
import static org.hamcrest.MatcherAssert.assertThat; | ||
import static org.junit.jupiter.api.Assertions.assertFalse; | ||
import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
||
/** | ||
* Insert execute clause assert. | ||
**/ | ||
@NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
public class InsertExecClauseAssert { | ||
|
||
/** | ||
* Assert actual execute segment is correct with expected execute clause. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add new line after java doc. |
||
* | ||
* @param assertContext assert context | ||
* @param actual actual execute segment | ||
* @param expected expected execute clause | ||
*/ | ||
public static void assertIs(final SQLCaseAssertContext assertContext, final ExecSegment actual, final ExpectedExecClause expected) { | ||
assertThat(assertContext.getText("exec procedure name assertion error: "), actual.getProcedureName().getIdentifier().getValue(), CoreMatchers.is(expected.getName())); | ||
if (null == expected.getOwner()) { | ||
assertFalse(actual.getProcedureName().getOwner().isPresent(), assertContext.getText("Actual owner should not exist.")); | ||
} else { | ||
assertTrue(actual.getProcedureName().getOwner().isPresent(), assertContext.getText("Actual owner should exist.")); | ||
OwnerAssert.assertIs(assertContext, actual.getProcedureName().getOwner().get(), expected.getOwner()); | ||
} | ||
if (null == expected.getParameters()) { | ||
assertThat(assertContext.getText("exec procedure parameters assertion error: "), actual.getExpressionSegments().size(), CoreMatchers.is(expected.getParameters().size())); | ||
} else { | ||
int count = 0; | ||
for (ExpressionSegment expressionSegment : actual.getExpressionSegments()) { | ||
ExpressionAssert.assertExpression(assertContext, expressionSegment, expected.getParameters().get(count)); | ||
count++; | ||
} | ||
} | ||
SQLSegmentAssert.assertIs(assertContext, actual, expected); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add new line after javadoc and param.