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

Refactor create schema statement parse logic #17703

Merged
merged 5 commits into from
May 16, 2022
Merged

Refactor create schema statement parse logic #17703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
190cdbc
Fix npe when execute drop schema if exist statement
strongduanmu May 16, 2022
7a9f127
Refactor create schema statement parse logic
strongduanmu May 16, 2022
0fc1283
Merge branch 'dev-new' into dev
strongduanmu May 16, 2022
031aa44
update sql parse test case
strongduanmu May 16, 2022
df0666c
update sql parse test case
strongduanmu May 16, 2022
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
64 changes: 0 additions & 64 deletions ...ect/shardingsphere-sql-parser-opengauss/src/main/antlr4/imports/opengauss/DCLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,73 +27,10 @@ revoke
: REVOKE optionForClause? (privilegeClause | roleClause) (CASCADE | RESTRICT)?
;

privilegeClause
: privilegeTypes ON onObjectClause (FROM | TO) granteeList (WITH GRANT OPTION)?
;

roleClause
: privilegeList (FROM | TO) roleList (WITH ADMIN OPTION)? (GRANTED BY roleSpec)?
;

optionForClause
: (GRANT | ADMIN) OPTION FOR
;

privilegeTypes
: privilegeType columnNames? (COMMA_ privilegeType columnNames?)*
;

privilegeType
: SELECT
| INSERT
| UPDATE
| DELETE
| TRUNCATE
| REFERENCES
| TRIGGER
| CREATE
| CONNECT
| TEMPORARY
| TEMP
| EXECUTE
| USAGE
| ALL PRIVILEGES?
;

onObjectClause
: DATABASE nameList
| SCHEMA nameList
| DOMAIN anyNameList
| FUNCTION functionWithArgtypesList
| PROCEDURE functionWithArgtypesList
| ROUTINE functionWithArgtypesList
| LANGUAGE nameList
| LARGE OBJECT numericOnlyList
| TABLESPACE nameList
| TYPE anyNameList
| SEQUENCE qualifiedNameList
| TABLE? privilegeLevel
| FOREIGN DATA WRAPPER nameList
| FOREIGN SERVER nameList
| ALL TABLES IN SCHEMA nameList
| ALL SEQUENCES IN SCHEMA nameList
| ALL FUNCTIONS IN SCHEMA nameList
| ALL PROCEDURES IN SCHEMA nameList
| ALL ROUTINES IN SCHEMA nameList
;

privilegeLevel
: ASTERISK_ | ASTERISK_ DOT_ASTERISK_ | identifier DOT_ASTERISK_ | tableNames | schemaName DOT_ routineName
;

routineName
: identifier
;

numericOnlyList
: numericOnly (COMMA_ numericOnly)*
;

createUser
: CREATE USER roleSpec WITH? createOptRoleElem*
;
Expand Down Expand Up @@ -161,4 +98,3 @@ dropDroup
reassignOwned
: REASSIGN OWNED BY roleList TO roleSpec
;

69 changes: 68 additions & 1 deletion ...ect/shardingsphere-sql-parser-opengauss/src/main/antlr4/imports/opengauss/DDLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,7 +1869,74 @@ schemaEltList

schemaStmt
: createTable | createIndex | createSequence | createTrigger | grant | createView
;
;

grant
: GRANT (privilegeClause | roleClause)
;

privilegeClause
: privilegeTypes ON onObjectClause (FROM | TO) granteeList (WITH GRANT OPTION)?
;

roleClause
: privilegeList (FROM | TO) roleList (WITH ADMIN OPTION)? (GRANTED BY roleSpec)?
;

privilegeTypes
: privilegeType columnNames? (COMMA_ privilegeType columnNames?)*
;

onObjectClause
: DATABASE nameList
| SCHEMA nameList
| DOMAIN anyNameList
| FUNCTION functionWithArgtypesList
| PROCEDURE functionWithArgtypesList
| ROUTINE functionWithArgtypesList
| LANGUAGE nameList
| LARGE OBJECT numericOnlyList
| TABLESPACE nameList
| TYPE anyNameList
| SEQUENCE qualifiedNameList
| TABLE? privilegeLevel
| FOREIGN DATA WRAPPER nameList
| FOREIGN SERVER nameList
| ALL TABLES IN SCHEMA nameList
| ALL SEQUENCES IN SCHEMA nameList
| ALL FUNCTIONS IN SCHEMA nameList
| ALL PROCEDURES IN SCHEMA nameList
| ALL ROUTINES IN SCHEMA nameList
;

numericOnlyList
: numericOnly (COMMA_ numericOnly)*
;

privilegeLevel
: ASTERISK_ | ASTERISK_ DOT_ASTERISK_ | identifier DOT_ASTERISK_ | tableNames | schemaName DOT_ routineName
;

routineName
: identifier
;

privilegeType
: SELECT
| INSERT
| UPDATE
| DELETE
| TRUNCATE
| REFERENCES
| TRIGGER
| CREATE
| CONNECT
| TEMPORARY
| TEMP
| EXECUTE
| USAGE
| ALL PRIVILEGES?
;

alterSchema
: ALTER SCHEMA name (RENAME TO name | OWNER TO roleSpec)
Expand Down
63 changes: 0 additions & 63 deletions ...t/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DCLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,73 +29,10 @@ revoke
: REVOKE optionForClause? (privilegeClause | roleClause) (CASCADE | RESTRICT)?
;

privilegeClause
: privilegeTypes ON onObjectClause (FROM | TO) granteeList (WITH GRANT OPTION)?
;

roleClause
: privilegeList (FROM | TO) roleList (WITH ADMIN OPTION)? (GRANTED BY roleSpec)?
;

optionForClause
: (GRANT | ADMIN) OPTION FOR
;

privilegeTypes
: privilegeType columnNames? (COMMA_ privilegeType columnNames?)*
;

privilegeType
: SELECT
| INSERT
| UPDATE
| DELETE
| TRUNCATE
| REFERENCES
| TRIGGER
| CREATE
| CONNECT
| TEMPORARY
| TEMP
| EXECUTE
| USAGE
| ALL PRIVILEGES?
;

onObjectClause
: DATABASE nameList
| SCHEMA nameList
| DOMAIN anyNameList
| FUNCTION functionWithArgtypesList
| PROCEDURE functionWithArgtypesList
| ROUTINE functionWithArgtypesList
| LANGUAGE nameList
| LARGE OBJECT numericOnlyList
| TABLESPACE nameList
| TYPE anyNameList
| SEQUENCE qualifiedNameList
| TABLE? privilegeLevel
| FOREIGN DATA WRAPPER nameList
| FOREIGN SERVER nameList
| ALL TABLES IN SCHEMA nameList
| ALL SEQUENCES IN SCHEMA nameList
| ALL FUNCTIONS IN SCHEMA nameList
| ALL PROCEDURES IN SCHEMA nameList
| ALL ROUTINES IN SCHEMA nameList
;

privilegeLevel
: ASTERISK_ | ASTERISK_ DOT_ASTERISK_ | identifier DOT_ASTERISK_ | tableNames | schemaName DOT_ routineName
;

routineName
: identifier
;

numericOnlyList
: numericOnly (COMMA_ numericOnly)*
;

createUser
: CREATE USER roleSpec WITH? createOptRoleElem*
;
Expand Down
67 changes: 67 additions & 0 deletions ...t/shardingsphere-sql-parser-postgresql/src/main/antlr4/imports/postgresql/DDLStatement.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1883,6 +1883,73 @@ schemaStmt
: createTable | createIndex | createSequence | createTrigger | grant | createView
;

grant
: GRANT (privilegeClause | roleClause)
;

privilegeClause
: privilegeTypes ON onObjectClause (FROM | TO) granteeList (WITH GRANT OPTION)?
;

roleClause
: privilegeList (FROM | TO) roleList (WITH ADMIN OPTION)? (GRANTED BY roleSpec)?
;

privilegeTypes
: privilegeType columnNames? (COMMA_ privilegeType columnNames?)*
;

onObjectClause
: DATABASE nameList
| SCHEMA nameList
| DOMAIN anyNameList
| FUNCTION functionWithArgtypesList
| PROCEDURE functionWithArgtypesList
| ROUTINE functionWithArgtypesList
| LANGUAGE nameList
| LARGE OBJECT numericOnlyList
| TABLESPACE nameList
| TYPE anyNameList
| SEQUENCE qualifiedNameList
| TABLE? privilegeLevel
| FOREIGN DATA WRAPPER nameList
| FOREIGN SERVER nameList
| ALL TABLES IN SCHEMA nameList
| ALL SEQUENCES IN SCHEMA nameList
| ALL FUNCTIONS IN SCHEMA nameList
| ALL PROCEDURES IN SCHEMA nameList
| ALL ROUTINES IN SCHEMA nameList
;

numericOnlyList
: numericOnly (COMMA_ numericOnly)*
;

privilegeLevel
: ASTERISK_ | ASTERISK_ DOT_ASTERISK_ | identifier DOT_ASTERISK_ | tableNames | schemaName DOT_ routineName
;

routineName
: identifier
;

privilegeType
: SELECT
| INSERT
| UPDATE
| DELETE
| TRUNCATE
| REFERENCES
| TRIGGER
| CREATE
| CONNECT
| TEMPORARY
| TEMP
| EXECUTE
| USAGE
| ALL PRIVILEGES?
;

alterSchema
: ALTER SCHEMA name (RENAME TO name | OWNER TO roleSpec)
;
Expand Down
3 changes: 2 additions & 1 deletion shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/create-schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
-->

<sql-parser-test-cases>
<create-schema sql-case-id="create_schema_grant_permissions" />
<create-schema sql-case-id="create_schema" />
<create-schema sql-case-id="create_schema_with_grant_permissions" />
<create-schema sql-case-id="create_schema_with_if_not_exists" />
</sql-parser-test-cases>
5 changes: 3 additions & 2 deletions ...re-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/create-schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
-->

<sql-cases>
<sql-case id="create_schema_grant_permissions" value="CREATE SCHEMA Sprockets AUTHORIZATION Annik
<sql-case id="create_schema" value="CREATE SCHEMA test_schema" db-types="SQLServer,PostgreSQL,openGauss"/>
<sql-case id="create_schema_with_grant_permissions" value="CREATE SCHEMA test_schema AUTHORIZATION Annik
CREATE TABLE NineProngs (source int, cost int, partnumber int)
GRANT SELECT ON SCHEMA::Sprockets TO Mandar
DENY SELECT ON SCHEMA::Sprockets TO Prasanna" db-types="SQLServer" />
<sql-case id="create_schema" value="CREATE SCHEMA alt_nsp1" db-types="SQLServer,PostgreSQL,openGauss"/>
<sql-case id="create_schema_with_if_not_exists" value="CREATE SCHEMA IF NOT EXISTS test_schema" db-types="PostgreSQL"/>
</sql-cases>