Fix (MSSQL): end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION #5756

MalloD12 · 2024-04-02T21:45:49Z

Impact

Bug fix (non-breaking change which fixes expected existing functionality)
Enhancement/New feature (adds functionality without impacting existing logic)
Breaking change (fix or feature that would cause existing functionality to change)

Description

There were some endDelimiter blocks failing because of a few different not-recognized tokens which can come after a BEGIN, and that was causing some to be broken and syntax errors to pop up.

Fixes #4268

Things to be aware of

Things to worry about

Additional Context

- Renamed Mssql groovy integration test class. - Added integration test with a few begin block scenarios.

- SQL file path fixed.

- Test added.

…enario.

github-actions · 2024-04-23T17:53:24Z

FOSSA Snippets Detection 🤖`success`

Snippets Detection Output


Running FOSSA snippets
 INFO main{target=/home/runner/work/liquibase/liquibase/}: Analyzing local snippet matches
 INFO main{target=/home/runner/work/liquibase/liquibase/}: Finished matching 0 snippets out of 4438 files to 0 matches

Pusher: @rberezen, Action: pull_request, Working Directory: /home/runner/work/liquibase/liquibase, Workflow: FOSSA AI License Compliance and Security Check

github-actions · 2024-04-23T17:53:24Z

FOSSA Test 🧪`success`

Test Output



Using project name: `https://github.com/liquibase/liquibase`
Using revision: `6f17ae75a20a34cc887d3accb516865fbe2e11f6`

[ Checking build completion for 6f17ae75a20a34cc887d3accb516865fbe2e11f6... ]
[ Waiting for build completion (revision 6f17ae75a20a34cc887d3accb516865fbe2e11f6)... last status: StatusCreated ]
[ Waiting for build completion (revision 6f17ae75a20a34cc887d3accb516865fbe2e11f6)... last status: StatusRunning ]
[ Waiting for issue scan completion... ]


[ERROR] 

  ========================================================================
  Tested Following Project:
  ========================================================================


  Project Title: https://github.com/liquibase/liquibase
  Project Revision: 6f17ae75a20a34cc887d3accb516865fbe2e11f6
  Project Visibility: private
  Project Targets:
  - maven: [pom.xml]


  COMPLIANCE ISSUES (Total 28)

  ========================================================================
  Unlicensed Dependency (Total 2)
  ========================================================================
  ⚑ Unlicensed dependency detected in aopalliance:aopalliance@1.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934914

  ⚑ Unlicensed dependency detected in com.ibm.db2:jcc@11.5.9.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4319140


  ========================================================================
  Flagged by Policy (Total 26)
  ========================================================================
  ⚑ LGPL-3.0-only license detected in com.github.javaparser:javaparser-core@3.25.9
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5053794

  ⚑ LGPL-3.0-or-later license detected in com.github.javaparser:javaparser-core@3.25.9
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5053793

  ⚑ LGPL-3.0-or-later license detected in com.h2database:h2@2.2.224
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4850918

  ⚑ GPL-2.0-with-classpath-exception license detected in com.sun.istack:istack-commons-runtime@4.1.2
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934920

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.activation:jakarta.activation-api@2.1.3
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173516

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.annotation:jakarta.annotation-api@2.1.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934922

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.el:jakarta.el-api@5.0.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934924

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.enterprise:jakarta.enterprise.cdi-api@4.0.1
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934916

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.enterprise:jakarta.enterprise.lang-model@4.0.1
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934919

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.interceptor:jakarta.interceptor-api@2.1.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934928

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.servlet:jakarta.servlet-api@5.0.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934931

  ⚑ GPL-2.0-with-classpath-exception license detected in jakarta.xml.bind:jakarta.xml.bind-api@4.0.2
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173517

  ⚑ GPL-2.0-only license detected in javax.activation:javax.activation-api@1.2.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4414991

  ⚑ GPL-2.0-with-classpath-exception license detected in javax.activation:javax.activation-api@1.2.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4414990

  ⚑ GPL-2.0-with-classpath-exception license detected in javax.servlet:javax.servlet-api@3.1.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934935

  ⚑ GPL-2.0-only license detected in javax.xml.bind:jaxb-api@2.3.1
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4414993

  ⚑ GPL-2.0-with-classpath-exception license detected in javax.xml.bind:jaxb-api@2.3.1
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4414992

  ⚑ LGPL-2.1-or-later license detected in net.java.dev.jna:jna@5.13.0
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/4934934

  ⚑ GPL-2.0-with-classpath-exception license detected in org.eclipse.angus:angus-activation@2.0.2
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173515

  ⚑ LGPL-2.1-only license detected in org.firebirdsql.jdbc:jaybird@5.0.4.java8
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173521

  ⚑ LGPL-3.0-only license detected in org.firebirdsql.jdbc:jaybird@5.0.4.java8
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173520

  ⚑ GPL-2.0-with-classpath-exception license detected in org.glassfish.jaxb:jaxb-core@4.0.5
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173518

  ⚑ GPL-2.0-with-classpath-exception license detected in org.glassfish.jaxb:jaxb-runtime@4.0.5
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173519

  ⚑ GPL-2.0-with-classpath-exception license detected in org.glassfish.jaxb:txw2@4.0.5
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/5173522

  ⚑ GPL-2.0-or-later license detected in org.yaml:snakeyaml@2.2
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/3779967

  ⚑ LGPL-2.1-or-later license detected in org.yaml:snakeyaml@2.2
  More information: https://app.fossa.com/projects/custom%2B40163%2Fgithub.com%2Fliquibase%2Fliquibase/refs/branch/master/6f17ae75a20a34cc887d3accb516865fbe2e11f6/issues/licensing/3779966


[ERROR] An issue occurred

  *** Relevant Errors ***

      �[0;91mError: �[0mThe scan has revealed issues. Number of issues found: 28

Pusher: @rberezen, Action: pull_request, Working Directory: /home/runner/work/liquibase/liquibase, Workflow: FOSSA AI License Compliance and Security Check

# Conflicts: # liquibase-integration-tests/src/test/groovy/liquibase/command/core/MssqlIntegrationTest.groovy

… into fix-issue-4268

- Resolved begin block issue.

d987928

- Renamed Mssql groovy integration test class. - Added integration test with a few begin block scenarios.

MalloD12 added the TypeBug label Apr 2, 2024

MalloD12 requested a review from filipelautert as a code owner April 2, 2024 21:45

MalloD12 temporarily deployed to internal April 2, 2024 21:45 — with GitHub Actions Inactive

- Test name updated.

d985189

- SQL file path fixed.

MalloD12 temporarily deployed to internal April 2, 2024 22:19 — with GitHub Actions Inactive

- Schema name updated on test.

53fd47e

- Test added.

MalloD12 temporarily deployed to internal April 2, 2024 23:11 — with GitHub Actions Inactive

Test updated.

4e4b225

MalloD12 temporarily deployed to internal April 3, 2024 03:52 — with GitHub Actions Inactive

Add @dialog_handle declaration.

6554b72

MalloD12 temporarily deployed to internal April 3, 2024 04:11 — with GitHub Actions Inactive

Initialization of declared variable for Begin conversation example sc…

081dc7e

…enario.

MalloD12 temporarily deployed to internal April 3, 2024 16:28 — with GitHub Actions Inactive

Remove test.

b85d64c

MalloD12 temporarily deployed to internal April 3, 2024 17:38 — with GitHub Actions Inactive

Create table added for a BEGIN TRANSACTION test.

f730c2a

MalloD12 temporarily deployed to internal April 3, 2024 18:00 — with GitHub Actions Inactive

Merge branch 'master' into fix-issue-4268

dfdb858

MalloD12 temporarily deployed to internal April 3, 2024 19:38 — with GitHub Actions Inactive

MalloD12 mentioned this pull request Apr 5, 2024

End delimiter logic broken by BEGIN TRANSACTION #3356

Closed

filipelautert approved these changes Apr 18, 2024

View reviewed changes

filipelautert requested review from rberezen and suryaaki2 April 18, 2024 16:24

Merge branch 'master' into fix-issue-4268

f1a477b

rberezen temporarily deployed to internal April 19, 2024 20:51 — with GitHub Actions Inactive

filipelautert changed the title ~~Fix #4268~~ Fix end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION Apr 22, 2024

Merge branch 'master' into fix-issue-4268

e0bb8ab

rberezen temporarily deployed to internal April 23, 2024 17:51 — with GitHub Actions Inactive

rberezen approved these changes Apr 24, 2024

View reviewed changes

filipelautert changed the title ~~Fix end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION~~ Fix (MSSQL): end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION May 8, 2024

MalloD12 added 2 commits May 8, 2024 12:45

Merge branch 'master' into fix-issue-4268

60f7410

# Conflicts: # liquibase-integration-tests/src/test/groovy/liquibase/command/core/MssqlIntegrationTest.groovy

Merge branch 'fix-issue-4268' of https://github.com/liquibase/liquibase…

74bd093

… into fix-issue-4268

MalloD12 temporarily deployed to internal May 8, 2024 16:00 — with GitHub Actions Inactive

filipelautert merged commit 3c69dbb into master May 8, 2024
29 checks passed

filipelautert deleted the fix-issue-4268 branch May 8, 2024 16:25

filipelautert added this to the 1NEXT milestone May 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix (MSSQL): end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION #5756

Fix (MSSQL): end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION #5756

MalloD12 commented Apr 2, 2024 •

edited

github-actions bot commented Apr 23, 2024

github-actions bot commented Apr 23, 2024

Fix (MSSQL): end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION #5756

Fix (MSSQL): end delimiter logic broken by BEGIN DIALOG/BEGIN CONVERSATION #5756

Conversation

MalloD12 commented Apr 2, 2024 • edited

Impact

Description

Things to be aware of

Things to worry about

Additional Context

github-actions bot commented Apr 23, 2024

FOSSA Snippets Detection 🤖success

github-actions bot commented Apr 23, 2024

FOSSA Test 🧪success

MalloD12 commented Apr 2, 2024 •

edited

FOSSA Snippets Detection 🤖`success`

FOSSA Test 🧪`success`