Skip to content

Double dash comment fix (mostly)#669

Merged
lvca merged 3 commits intoArcadeData:mainfrom
gramian:main
Dec 15, 2022
Merged

Double dash comment fix (mostly)#669
lvca merged 3 commits intoArcadeData:mainfrom
gramian:main

Conversation

@gramian
Copy link
Collaborator

@gramian gramian commented Dec 13, 2022

What does this PR do?

This PR attempts to fix double dash comments -- .

Thank you for taking time reviewing this PR!

Motivation

Double dash comment are currently not working, this commit fixes this for most cases (see below)

Related issues

#604

Additional Notes

The following cases work (note the newlines):

SELECT '-- no comment'; -- my comment
SELECT '-- no comment'; -- my comment

SELECT '-- no comment' -- my comment

This case does still not work:

SELECT '-- no comment' -- comment

So without a semi-colon ; a single line comment requires a new line \n to be recognized.

Also I only changed SQLGrammar.jjt the other changes resulted from compiling.

Checklist

  • I have run the build using mvn clean package command
  • My unit tests cover both failure and success scenarios (I have not added unit tests)

@gramian
Copy link
Collaborator Author

gramian commented Dec 14, 2022

@lvca I think the non-working case is acceptable, as it is only relevant for sqlscript. It definitely improves the current state.

@lvca lvca merged commit 80e4701 into ArcadeData:main Dec 15, 2022
lvca added a commit that referenced this pull request Dec 15, 2022
@lvca lvca self-requested a review December 15, 2022 21:16
@lvca lvca added bug labels Dec 15, 2022
@lvca lvca added this to the 22.12.1 milestone Dec 15, 2022
@lvca
Copy link
Contributor

lvca commented Dec 15, 2022

I've added a couple of tests to test the double-dash comments syntax. Thanks @gramian !

mergify bot added a commit that referenced this pull request Feb 8, 2026
….0 to 2.7.1 [skip ci]

Bumps [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) from 2.4.0 to 2.7.1.
Release notes

*Sourced from [org.codehaus.mojo:license-maven-plugin's releases](https://github.com/mojohaus/license-maven-plugin/releases).*

> 2.7.1
> -----
>
> 💥 Breaking changes
> -----------------------
>
> * Bump LibreOffice library odfdom-java to 0.12.0, require JDK 11+ for generating Calc file ODS ([#684](https://github.com/mojohaus/license-maven-plugin/pull/684)) [`@​slawekjaranowski`](https://github.com/slawekjaranowski)
>
> 🚀 New features and improvements
> -------------------------------
>
> * Bump LibreOffice library odfdom-java to 0.12.0, require JDK 11+ for generating Calc file ODS ([#684](https://github.com/mojohaus/license-maven-plugin/pull/684)) [`@​slawekjaranowski`](https://github.com/slawekjaranowski)
> * Fix for issues/533 (dual licensed dependency with one license on whitelist and the other on blacklist) ([#670](https://github.com/mojohaus/license-maven-plugin/pull/670)) [`@​wuwu2000`](https://github.com/wuwu2000)
> * Make Mojos thread-safe and improve concurrent cache handling ([#674](https://github.com/mojohaus/license-maven-plugin/pull/674)) [`@​shaikhu`](https://github.com/shaikhu)
>
> 👻 Maintenance
> -------------
>
> * Add PR automation workflow ([#682](https://github.com/mojohaus/license-maven-plugin/pull/682)) [`@​slawekjaranowski`](https://github.com/slawekjaranowski)
>
> 📦 Dependency updates
> --------------------
>
> * Bump org.apache.commons:commons-lang3 from 3.8.1 to 3.18.0 in /src/it/ISSUE-345 ([#691](https://github.com/mojohaus/license-maven-plugin/pull/691)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.codehaus.mojo:mojo-parent from 94 to 95 ([#690](https://github.com/mojohaus/license-maven-plugin/pull/690)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.commons:commons-lang3 from 3.8.1 to 3.18.0 in /src/it/ISSUE-508 ([#677](https://github.com/mojohaus/license-maven-plugin/pull/677)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.maven:maven-archiver from 3.6.5 to 3.6.6 ([#689](https://github.com/mojohaus/license-maven-plugin/pull/689)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.logging.log4j:log4j-to-slf4j from 2.25.2 to 2.25.3 ([#688](https://github.com/mojohaus/license-maven-plugin/pull/688)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump mavenVersion from 3.9.11 to 3.9.12 ([#687](https://github.com/mojohaus/license-maven-plugin/pull/687)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.poi:poi-ooxml from 5.5.0 to 5.5.1 ([#683](https://github.com/mojohaus/license-maven-plugin/pull/683)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.commons:commons-lang3 from 3.9 to 3.18.0 in /src/it/ISSUE-312/child2 ([#681](https://github.com/mojohaus/license-maven-plugin/pull/681)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0 ([#679](https://github.com/mojohaus/license-maven-plugin/pull/679)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.poi:poi-ooxml from 5.4.1 to 5.5.0 ([#680](https://github.com/mojohaus/license-maven-plugin/pull/680)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.wiremock:wiremock-standalone from 3.13.1 to 3.13.2 ([#678](https://github.com/mojohaus/license-maven-plugin/pull/678)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump commons-io:commons-io from 2.20.0 to 2.21.0 ([#676](https://github.com/mojohaus/license-maven-plugin/pull/676)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.maven:maven-archiver from 3.6.4 to 3.6.5 ([#671](https://github.com/mojohaus/license-maven-plugin/pull/671)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.codehaus.mojo:mojo-parent from 93 to 94 ([#669](https://github.com/mojohaus/license-maven-plugin/pull/669)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.logging.log4j:log4j-to-slf4j from 2.25.1 to 2.25.2 ([#667](https://github.com/mojohaus/license-maven-plugin/pull/667)) @[dependabot[bot]](https://github.com/apps/dependabot)
> * Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0 ([#668](https://github.com/mojohaus/license-maven-plugin/pull/668)) @[dependabot[bot]](https://github.com/apps/dependabot)
>
> 2.7.0
> -----
>
> 🚀 New features and improvements
> -------------------------------
>
> * Check project license goal ([#650](https://github.com/mojohaus/license-maven-plugin/pull/650)) [`@​sewerwal`](https://github.com/sewerwal)
>
> 🐛 Bug Fixes
> -----------
>
> * Adding missing `@Inject` to LicenseListMojo class ([#656](https://github.com/mojohaus/license-maven-plugin/pull/656)) [`@​jhonnymertz`](https://github.com/jhonnymertz)
>
> 🔧 Build
> -------
>
> * Disable fail-fast build in matrix, skip download-licenses-configured IT ([#657](https://github.com/mojohaus/license-maven-plugin/pull/657)) [`@​slawekjaranowski`](https://github.com/slawekjaranowski)
>
> 📦 Dependency updates
> --------------------

... (truncated)


Commits

* [`0b4fe61`](mojohaus/license-maven-plugin@0b4fe61) [maven-release-plugin] prepare release 2.7.1
* [`53caf42`](mojohaus/license-maven-plugin@53caf42) Bump LibreOffice library odfdom-java to 0.12.0, require JDK 11+ for generatin...
* [`ee4cefd`](mojohaus/license-maven-plugin@ee4cefd) Bump org.apache.commons:commons-lang3 in /src/it/ISSUE-345
* [`d25151b`](mojohaus/license-maven-plugin@d25151b) Bump org.codehaus.mojo:mojo-parent from 94 to 95
* [`d5941c4`](mojohaus/license-maven-plugin@d5941c4) Bump org.apache.commons:commons-lang3 in /src/it/ISSUE-508 ([#677](https://github.com/mojohaus/license-maven-plugin/issues/677))
* [`448c1f6`](mojohaus/license-maven-plugin@448c1f6) Bump org.apache.maven:maven-archiver from 3.6.5 to 3.6.6
* [`c8db9e4`](mojohaus/license-maven-plugin@c8db9e4) Bump org.apache.logging.log4j:log4j-to-slf4j from 2.25.2 to 2.25.3
* [`bc9c5a6`](mojohaus/license-maven-plugin@bc9c5a6) Bump mavenVersion from 3.9.11 to 3.9.12
* [`d8cb983`](mojohaus/license-maven-plugin@d8cb983) Fix for issues/533 (dual licensed dependency with one license on whitelist an...
* [`903de29`](mojohaus/license-maven-plugin@903de29) Bump org.apache.poi:poi-ooxml from 5.5.0 to 5.5.1
* Additional commits viewable in [compare view](mojohaus/license-maven-plugin@2.4.0...2.7.1)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.codehaus.mojo:license-maven-plugin&package-manager=maven&previous-version=2.4.0&new-version=2.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
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.

2 participants