Skip to content

Keywords2: Update whitelisted Keywords #1653

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

Merged
merged 69 commits into from
Nov 2, 2022

Conversation

manticore-projects
Copy link
Contributor

Updates the Keywords in RelObjectNameWithoutValue after PR #1649 introduced new tokens.

Workflow should be like that:

  1. Amend Tokens in the Grammar
  2. When keyword-tests fail, run gradle updateKeywords
  3. Then build via mvn package or gradle build (it does not matter)
  4. Push/Deploy

Using gradle updateKeywords task is optional, you can also add the new Tokens manually has it has always been done before.

After accepting the Keywords PR, any further PR will automatically fail acceptance tests, unless keywords are in order.

Add Keywords and document, which keywords are allowed for what purpose
Derive All Keywords from Grammar directly
Generate production for Object Names (semi-) automatically
Add parametrized Keyword Tests
Parallel Test execution
Gradle Caching
Explicitly request for latest JavaCC 7.0.10
Parallel Test execution
Gradle Caching
Explicitly request for latest JavaCC 7.0.10
# Conflicts:
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
Update keywords
# Conflicts:
#	build.gradle
# Conflicts:
#	build.gradle
#	ruleset.xml
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
#	src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java
#	src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java
# Conflicts:
#	README.md
#	build.gradle
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
#	src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java
Show the Statement's Java Objects in a tree hierarchy
Temporarily reduce the Coverage checks regarding Minimum Coverage and Maximum Missed Lines in order to get the Keywords PR accepted. We should do a major Code cleanup afterwards.
# Conflicts:
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
# Conflicts:
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@wumpz
Copy link
Member

wumpz commented Oct 28, 2022

Since I have accepted those enhanced keywords, why is this pr so large?

update/cleanup dependencies in Maven and Gradle
add EXEC plugin to Maven for updating white listed keywords in the Grammaer
@manticore-projects
Copy link
Contributor Author

manticore-projects commented Oct 29, 2022

Since I have accepted those enhanced keywords, why is this pr so large?

It actually changed only 4 Files:

  1. the Grammar, fixing the RelObjectNameWithoutValue() keywords
  2. the Maven Build file, adding a Task for updating the RelObjectNameWithoutValue() keywords and dependencies.
    Run the Maven task via
mvn compile exec:java
  1. the Gradle Build file, updating dependencies
  2. Oracle Special Tests, since Keywords enabled 2 more tests

I do not know, why GIT carries all the change set since branching, after I merged MASTER.

@wumpz wumpz merged commit f3e04b3 into JSQLParser:master Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants