spring-projects#3299: use postgres function convert_from() instead of…

… encode() to insert JSON byte stream into PreparedStatement. This works with session attributes containing special characters in the JSON blob.
mindhaq · Jan 7, 2025 · 8e86689 · 8e86689
1 parent f4cd1d0
commit 8e86689
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc b/spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc
@@ -161,7 +161,7 @@ public class QueryCustomizer
 
     private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
 		UPDATE %TABLE_NAME%_ATTRIBUTES
-		SET ATTRIBUTE_BYTES = encode(?, 'escape')::jsonb
+		SET ATTRIBUTE_BYTES = convert_from(?, 'UTF8')::jsonb
 		WHERE SESSION_PRIMARY_ID = ?
 		AND ATTRIBUTE_NAME = ?
 		""";
@@ -309,12 +309,12 @@ public class SessionConfig {
 
     private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
             INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
-            VALUES (?, ?, encode(?, 'escape')::jsonb) <1>
+            VALUES (?, ?, convert_from(?, 'UTF8')::jsonb) <1>
             """;
 
     private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
             UPDATE %TABLE_NAME%_ATTRIBUTES
-            SET ATTRIBUTE_BYTES = encode(?, 'escape')::jsonb
+            SET ATTRIBUTE_BYTES = convert_from(?, 'UTF8')::jsonb
             WHERE SESSION_PRIMARY_ID = ?
             AND ATTRIBUTE_NAME = ?
             """;

diff --git a/...ng-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java b/...ng-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java
@@ -23,7 +23,7 @@ public class SessionConfig implements BeanClassLoaderAware {
 
 	private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
 			INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
-			VALUES (?, ?, encode(?, 'escape')::jsonb)
+			VALUES (?, ?, convert_from(?, 'UTF8')::jsonb)
 			""";
 
 	private ClassLoader classLoader;