From 19356238396c83a96d17806392fb02879ae15630 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:25:02 +0000 Subject: [PATCH 1/2] chore(deps): update dependency sqlfluff to v3.3.0 --- Dockerfile | 2 +- flavors/c_cpp/Dockerfile | 2 +- flavors/cupcake/Dockerfile | 2 +- flavors/documentation/Dockerfile | 2 +- flavors/dotnet/Dockerfile | 2 +- flavors/dotnetweb/Dockerfile | 2 +- flavors/go/Dockerfile | 2 +- flavors/java/Dockerfile | 2 +- flavors/javascript/Dockerfile | 2 +- flavors/php/Dockerfile | 2 +- flavors/python/Dockerfile | 2 +- flavors/ruby/Dockerfile | 2 +- flavors/rust/Dockerfile | 2 +- flavors/salesforce/Dockerfile | 2 +- flavors/swift/Dockerfile | 2 +- flavors/terraform/Dockerfile | 2 +- linters/sql_sqlfluff/Dockerfile | 2 +- megalinter/descriptors/sql.megalinter-descriptor.yml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d511061ce4..f1cc7f8e2a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -133,7 +133,7 @@ ARG SALESFORCE_SFDX_SCANNER_VERSION=4.7.0 # renovate: datasource=npm depName=lightning-flow-scanner ARG LIGHTNING_FLOW_SCANNER_VERSION=2.36.0 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/c_cpp/Dockerfile b/flavors/c_cpp/Dockerfile index c26cf868182..f9bd1d0dfd8 100644 --- a/flavors/c_cpp/Dockerfile +++ b/flavors/c_cpp/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile index 219947091b1..6a5ce952743 100644 --- a/flavors/cupcake/Dockerfile +++ b/flavors/cupcake/Dockerfile @@ -101,7 +101,7 @@ ARG PMD_VERSION=7.8.0 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile index d8bd95294ab..2ada00907b7 100644 --- a/flavors/documentation/Dockerfile +++ b/flavors/documentation/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile index e658a30e8f3..519e590c228 100644 --- a/flavors/dotnet/Dockerfile +++ b/flavors/dotnet/Dockerfile @@ -92,7 +92,7 @@ ARG DETEKT_VERSION=1.23.7 ARG PSSA_VERSION='1.23.0' # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/dotnetweb/Dockerfile b/flavors/dotnetweb/Dockerfile index f406de77db1..ddef10aa5c6 100644 --- a/flavors/dotnetweb/Dockerfile +++ b/flavors/dotnetweb/Dockerfile @@ -92,7 +92,7 @@ ARG DETEKT_VERSION=1.23.7 ARG PSSA_VERSION='1.23.0' # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index b1a60fa8929..322b2c3603e 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -90,7 +90,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile index 1f4f5e357db..30e16d88fed 100644 --- a/flavors/java/Dockerfile +++ b/flavors/java/Dockerfile @@ -86,7 +86,7 @@ ARG PMD_VERSION=7.8.0 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile index b5ec0b2ed16..344d62ba705 100644 --- a/flavors/javascript/Dockerfile +++ b/flavors/javascript/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile index e3f89e3ea51..1f4f449b23b 100644 --- a/flavors/php/Dockerfile +++ b/flavors/php/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile index e209d986bff..180f4184516 100644 --- a/flavors/python/Dockerfile +++ b/flavors/python/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile index ab68e536bcf..6232bb1445d 100644 --- a/flavors/ruby/Dockerfile +++ b/flavors/ruby/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile index c7e242004ce..671699ff89b 100644 --- a/flavors/rust/Dockerfile +++ b/flavors/rust/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile index f37db8c2325..0bf03e41fa4 100644 --- a/flavors/salesforce/Dockerfile +++ b/flavors/salesforce/Dockerfile @@ -93,7 +93,7 @@ ARG SALESFORCE_SFDX_SCANNER_VERSION=4.7.0 # renovate: datasource=npm depName=lightning-flow-scanner ARG LIGHTNING_FLOW_SCANNER_VERSION=2.36.0 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile index 5c4bc03f92b..10c41743340 100644 --- a/flavors/swift/Dockerfile +++ b/flavors/swift/Dockerfile @@ -83,7 +83,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile index 94cc6babba6..72b89c5f294 100644 --- a/flavors/terraform/Dockerfile +++ b/flavors/terraform/Dockerfile @@ -97,7 +97,7 @@ FROM python:3.12.8-alpine3.20 ARG DETEKT_VERSION=1.23.7 # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/linters/sql_sqlfluff/Dockerfile b/linters/sql_sqlfluff/Dockerfile index 536c2b77982..dee1a298cd2 100644 --- a/linters/sql_sqlfluff/Dockerfile +++ b/linters/sql_sqlfluff/Dockerfile @@ -49,7 +49,7 @@ FROM python:3.12.8-alpine3.20 ############################################################################################# #ARG__START # renovate: datasource=pypi depName=sqlfluff -ARG SQL_SQLFLUFF_VERSION=3.2.5 +ARG SQL_SQLFLUFF_VERSION=3.3.0 #ARG__END #################### diff --git a/megalinter/descriptors/sql.megalinter-descriptor.yml b/megalinter/descriptors/sql.megalinter-descriptor.yml index 3449e92c05f..b9e90b21b2c 100644 --- a/megalinter/descriptors/sql.megalinter-descriptor.yml +++ b/megalinter/descriptors/sql.megalinter-descriptor.yml @@ -32,7 +32,7 @@ linters: dockerfile: - |- # renovate: datasource=pypi depName=sqlfluff - ARG SQL_SQLFLUFF_VERSION=3.2.5 + ARG SQL_SQLFLUFF_VERSION=3.3.0 pip: - sqlfluff==${SQL_SQLFLUFF_VERSION} # TSQL From 79d0ccfaa2987f60cbf8852baf5d7c18fff437b3 Mon Sep 17 00:00:00 2001 From: nvuillam Date: Wed, 18 Dec 2024 20:12:22 +0100 Subject: [PATCH 2/2] Fix test case & doc link --- .automation/test/sql/.sqlfluff | 1 + TEMPLATES/.sqlfluff | 1 + megalinter/descriptors/sql.megalinter-descriptor.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.automation/test/sql/.sqlfluff b/.automation/test/sql/.sqlfluff index 75f73ae023c..f5bd32be23d 100644 --- a/.automation/test/sql/.sqlfluff +++ b/.automation/test/sql/.sqlfluff @@ -1,2 +1,3 @@ [sqlfluff] dialect = mysql +warnings = LT14 \ No newline at end of file diff --git a/TEMPLATES/.sqlfluff b/TEMPLATES/.sqlfluff index 68a4974c9be..d6e02104f8c 100644 --- a/TEMPLATES/.sqlfluff +++ b/TEMPLATES/.sqlfluff @@ -13,3 +13,4 @@ [sqlfluff] #dialect = ansi + diff --git a/megalinter/descriptors/sql.megalinter-descriptor.yml b/megalinter/descriptors/sql.megalinter-descriptor.yml index b9e90b21b2c..b4dac72f4c2 100644 --- a/megalinter/descriptors/sql.megalinter-descriptor.yml +++ b/megalinter/descriptors/sql.megalinter-descriptor.yml @@ -13,7 +13,7 @@ linters: linter_banner_image_url: https://raw.githubusercontent.com/sqlfluff/sqlfluff/main/images/sqlfluff-wide.png linter_image_url: https://docs.sqlfluff.com/en/stable/_static/images/sqlfluff-lrg.png linter_rules_url: https://docs.sqlfluff.com/en/stable/rules.html - linter_rules_configuration_url: https://docs.sqlfluff.com/en/stable/configuration.html + linter_rules_configuration_url: https://docs.sqlfluff.com/en/stable/configuration/index.html config_file_name: .sqlfluff active_only_if_file_found: - .sqlfluff