Fix JDBI named bind params being uppercased and losing spaces in DBeaver SQL formatter

CHANGES.md

@@ -10,6 +10,8 @@ This document is intended for Spotless developers.
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Preserve case of JDBI named bind params that collide with SQL keywords (e.g. `:limit`, `:offset`) in the DBeaver SQL formatter.
 
 ## [4.5.0] - 2026-03-18
 ### Added

lib/src/main/java/com/diffplug/spotless/sql/dbeaver/SQLTokenizedFormatter.java

@@ -95,9 +95,13 @@ private List<FormatterToken> format(final List<FormatterToken> argList) {
 		}
 
 		final KeywordCase keywordCase = formatterCfg.getKeywordCase();
-		for (FormatterToken anArgList : argList) {
-			token = anArgList;
+		for (int index = 0; index < argList.size(); index++) {
+			token = argList.get(index);
 			if (token.getType() == TokenType.KEYWORD) {
+				// Do not transform case for JDBI named bind params (e.g. :limit, :offset)
+				if (index > 0 && isEmbeddedToken(argList.get(index - 1))) {
+					continue;
+				}
 				token.setString(keywordCase.transform(token.getString()));
 			}
 		}
@@ -323,8 +327,10 @@ private List<FormatterToken> format(final List<FormatterToken> argList) {
 					continue;
 				}
 				if (token.getType() == TokenType.SYMBOL && isEmbeddedToken(token)
+						&& (!":".equals(token.getString()) || prev.getType() == TokenType.SYMBOL)
 						|| prev.getType() == TokenType.SYMBOL && isEmbeddedToken(prev)) {
-					// Do not insert spaces around colons
+					// Do not insert spaces around embedded tokens (colons, dots),
+					// except before JDBI named bind params (e.g. :limit) preceded by a keyword or name
 					continue;
 				}
 				if (token.getType() == TokenType.SYMBOL && prev.getType() == TokenType.SYMBOL) {

plugin-gradle/CHANGES.md

@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Preserve case of JDBI named bind params that collide with SQL keywords (e.g. `:limit`, `:offset`) in the DBeaver SQL formatter.
 
 ## [8.4.0] - 2026-03-18
 ### Added

plugin-maven/CHANGES.md

@@ -3,6 +3,8 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `1.27.0`).
 
 ## [Unreleased]
+### Fixed
+* Preserve case of JDBI named bind params that collide with SQL keywords (e.g. `:limit`, `:offset`) in the DBeaver SQL formatter.
 
 ## [3.4.0] - 2026-03-18
 ### Added

testlib/src/main/resources/sql/dbeaver/jdbi-params.clean

@@ -5,3 +5,10 @@ FROM
     WHERE
         id IN(<ids>)
         AND user_id =:user_id;
+
+SELECT
+    *
+FROM
+    TABLE
+    WHERE
+        id =:id LIMIT :limit OFFSET :offset;

testlib/src/main/resources/sql/dbeaver/jdbi-params.dirty

@@ -1 +1,2 @@
 SELECT * FROM table WHERE id IN (<ids>) AND user_id = :user_id;
+SELECT * FROM table WHERE id = :id LIMIT :limit OFFSET :offset;