Skip to content

Commit d295bff

Browse files
mindhaqrwinch
authored andcommitted
#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.
1 parent 3b7d9f3 commit d295bff

File tree

2 files changed

+4
-4
lines changed
  • spring-session-docs/modules/ROOT/pages/configuration
  • spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config

2 files changed

+4
-4
lines changed

spring-session-docs/modules/ROOT/pages/configuration/jdbc.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public class QueryCustomizer
161161
162162
private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
163163
UPDATE %TABLE_NAME%_ATTRIBUTES
164-
SET ATTRIBUTE_BYTES = encode(?, 'escape')::jsonb
164+
SET ATTRIBUTE_BYTES = convert_from(?, 'UTF8')::jsonb
165165
WHERE SESSION_PRIMARY_ID = ?
166166
AND ATTRIBUTE_NAME = ?
167167
""";
@@ -309,12 +309,12 @@ public class SessionConfig {
309309
310310
private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
311311
INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
312-
VALUES (?, ?, encode(?, 'escape')::jsonb) <1>
312+
VALUES (?, ?, convert_from(?, 'UTF8')::jsonb) <1>
313313
""";
314314
315315
private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """
316316
UPDATE %TABLE_NAME%_ATTRIBUTES
317-
SET ATTRIBUTE_BYTES = encode(?, 'escape')::jsonb
317+
SET ATTRIBUTE_BYTES = convert_from(?, 'UTF8')::jsonb
318318
WHERE SESSION_PRIMARY_ID = ?
319319
AND ATTRIBUTE_NAME = ?
320320
""";

spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/src/main/java/sample/config/SessionConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class SessionConfig implements BeanClassLoaderAware {
2323

2424
private static final String CREATE_SESSION_ATTRIBUTE_QUERY = """
2525
INSERT INTO %TABLE_NAME%_ATTRIBUTES (SESSION_PRIMARY_ID, ATTRIBUTE_NAME, ATTRIBUTE_BYTES)
26-
VALUES (?, ?, encode(?, 'escape')::jsonb)
26+
VALUES (?, ?, convert_from(?, 'UTF8')::jsonb)
2727
""";
2828

2929
private static final String UPDATE_SESSION_ATTRIBUTE_QUERY = """

0 commit comments

Comments
 (0)