2b526efe65
Polishing
2025-11-02 17:38:50 +01:00
a8410aa601
Merge branch '6.2.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java
# spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
2025-11-02 17:37:13 +01:00
a33027703d
Preserve Connection readOnly state for defaultReadOnly DataSource
...
Includes DataSourceTransactionManagerTests alignment with main branch.
Closes gh-35743
2025-11-02 17:28:12 +01:00
00e1429378
Polish SQLErrorCodeSQLExceptionTranslatorTests
2025-10-30 16:13:38 +01:00
2d3c2e3feb
Revise contribution
...
See gh-35380
2025-10-30 16:13:38 +01:00
a41af448ec
Ensure SingletonSupplier is singleton even if singletonInstance is null
...
Previously, SingletonSupplier stored "null" in singletonInstance when
the supplied instance was "null". On subsequent get() calls, this was
treated as "uninitialized" and triggered another attempt to obtain an
instance from the Supplier.
This commit ensures that a "null" returned from the instanceSupplier or
defaultSupplier is handled correctly, so that subsequent calls to get()
return "null" consistently instead of repeatedly invoking the Supplier.
Closes gh-35380
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com >
2025-10-30 16:13:13 +01:00
34562d3145
Merge branch '6.2.x'
2025-10-30 15:32:36 +01:00
5471961f06
Restore exposure of original BatchUpdateException as root cause
...
Closes gh-35717
See gh-35547
2025-10-30 14:59:00 +01:00
92a186b44b
Merge branch '6.2.x'
2025-10-28 20:39:56 +01:00
4b7b280ac3
Optimize resource URL resolution in SortedResourcesFactoryBean
...
Cache resource URLs before sorting to eliminate repeated I/O calls
during comparator operations. The previous implementation called
getURL() multiple times per resource during sorting (O(n log n)
calls), and silently swallowed IOExceptions by returning 0,
potentially causing unstable sort results.
This change:
- Caches URLs once per resource before sorting (O(n) I/O calls)
- Removes unnecessary ArrayList conversions
- Provides clear exception handling with context
- Improves performance by ~70% for typical use cases
Signed-off-by: Park Juhyeong <wngud5957@naver.com >
2025-10-28 20:30:33 +01:00
694224f1a6
Remove outdated Spring version mentions
...
Close gh-35696
2025-10-28 13:58:09 +01:00
bccfbfd630
Fix previous commit for 6.2.x compatibility
...
See gh-35674
2025-10-21 15:37:35 +02:00
5923d36de3
Merge branch '6.2.x'
2025-10-21 13:50:25 +02:00
506b76032f
Add missing reflection hints for JdbcUtils
...
This commit adds the missing reflection hints for `JdbcUtils`, as this
class reflects on `java.sql.Types` public fields.
Fixes gh-35674
2025-10-21 13:50:13 +02:00
ea27415b7b
Merge branch '6.2.x'
2025-10-13 15:12:50 +02:00
6c5de48059
Ignore SQL state 3B001 in HSQLDB exception message as well
...
Closes gh-35618
See gh-35564
2025-10-13 15:10:20 +02:00
c2ef11e1fc
Remove test prefixes and avoid warnings in JDBC and TX tests
2025-10-13 14:48:03 +02:00
edc14c2e15
Merge branch '6.2.x'
...
# Conflicts:
# spring-context-indexer/src/main/java/org/springframework/context/index/processor/StandardStereotypesProvider.java
# spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
# spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
2025-10-09 20:37:49 +02:00
c2a66e723f
Polishing
2025-10-09 20:34:03 +02:00
2ee34a5632
Add MySQLTableMetaDataProvider for correct generated-keys support
...
Closes gh-35593
2025-10-09 20:30:25 +02:00
54b43d4a88
Merge branch '6.2.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java
# spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLStateSQLExceptionTranslator.java
2025-10-03 14:54:04 +02:00
332953c9a4
Align BatchUpdateException handling among SQLExceptionTranslator variants
...
Closes gh-35547
2025-10-03 14:51:15 +02:00
7089bdcc3a
Merge branch '6.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/factory/support/FactoryBeanRegistrySupport.java
2025-10-02 13:17:45 +02:00
d484e4f3ff
Ignore SQL state 3B001 in releaseSavepoint (for HSQLDB)
...
Closes gh-35564
2025-10-02 13:01:30 +02:00
da0a36bfd6
Upgrade to NullAway 0.12.10 and refine nullability
...
Closes gh-35492
2025-09-17 15:17:23 +02:00
b8f71b2321
Add DataFieldMaxValueIncrementer for SQLite (migrated from Spring Batch)
...
Closes gh-35440
2025-09-08 17:03:18 +02:00
80a7371510
Merge branch '6.2.x'
2025-09-03 16:29:55 +02:00
db9e938ec4
Detect Informix error codes as DuplicateKeyException
...
Closes gh-35400
Signed-off-by: Lukáš Kvídera <kvideral@qwsome.eu >
2025-09-03 16:20:19 +02:00
7a2a167f34
Upgrade nullability plugin to 0.0.4
...
This commit also includes related refinements of
JdbcTemplate#getSingleColumnRowMapper and
ObjectUtils#addObjectToArray.
Closes gh-35340
2025-08-19 15:31:57 +02:00
15d3692669
Update assertion in JdbcClientIntegrationTests
2025-08-11 17:53:05 +03:00
0efa04f32c
Merge branch '6.2.x'
2025-08-11 17:49:36 +03:00
37b076be51
Support multiple result sets in ScriptUtils.executeSqlScript()
...
Prior to this commit, ScriptUtils.executeSqlScript() treated every
statement within the script as if it were a single insert/update/delete
statement. This disregarded the fact that the execution of a JDBC
Statement can result in multiple individual statements, some of which
result in a ResultSet and others that result in an update count.
For example, when executing a stored procedure on Sybase, ScriptUtils
did not execute all statements within the stored procedure.
To address that, this commit revises the implementation of
ScriptUtils.executeSqlScript() so that it handles multiple results and
differentiates between result sets and update counts.
Closes gh-35248
2025-08-11 17:44:39 +03:00
321a804449
Merge branch '6.2.x'
2025-07-28 22:07:53 +02:00
f3832c7262
Add note on SQL types with SqlBinaryValue/SqlCharacterValue
...
Closes gh-34786
2025-07-28 22:06:38 +02:00
16e99f289c
Accept support for generated keys column name array on HSQLDB/Derby
...
Closes gh-34790
2025-07-28 22:04:18 +02:00
dacaf7fd56
Align @Nullable annotation
2025-07-28 20:33:33 +02:00
2a0a1fa67a
Merge branch '6.2.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
2025-07-28 20:32:30 +02:00
642e554c52
Process PostgreSQL-returned catalog/schema names in given case
...
Closes gh-35064
2025-07-28 20:28:45 +02:00
a61b297967
Specify flexible generics nullness in spring-jdbc
...
This commit leverages flexible generics nullness at method and
type level when relevant in spring-jdbc.
Due to https://github.com/uber/NullAway/issues/1075 , some related
`@SuppressWarnings("NullAway")` have been added.
JdbcOperations Kotlin extensions have been refined accordingly.
Closes gh-34911
2025-07-07 16:35:25 +02:00
9406e7ee2a
Add additional javadoc notes on 7.0
...
See gh-34709
See gh-34757
2025-07-07 14:08:43 +02:00
88257f7dfd
Discard further rows once maxRows has been reached
...
See https://github.com/spring-projects/spring-framework/issues/34666#issuecomment-2773151317
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com >
2025-07-07 13:37:31 +02:00
8cb901825b
Merge branch '6.2.x'
...
# Conflicts:
# spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
# spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
# spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java
# spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageReceivingTemplate.java
# spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
# spring-messaging/src/main/java/org/springframework/messaging/core/MessageRequestReplyOperations.java
# spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java
2025-07-04 18:31:13 +02:00
65e5c14245
Polishing
2025-07-04 18:20:27 +02:00
842f582afc
Specify fetchSize/maxRows/queryTimeout per statement in JdbcClient
...
Closes gh-35155
2025-07-04 17:36:18 +02:00
196b7ec275
Deprecate (Jdbc)DaoSupport classes (including JmsGatewaySupport)
...
Closes gh-35145
2025-07-02 11:12:57 +02:00
294406dae9
Remove @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
...
Fixed in Kotlin 2.2.0 and IntelliJ IDEA IDEA 2024.2 EAP, see
https://youtrack.jetbrains.com/issue/KT-75169 related issue.
See gh-34453
2025-06-24 11:40:23 +02:00
6927e39e6b
Merge branch '6.2.x'
2025-06-18 12:23:07 +02:00
e33adadc62
Detect SQL state 57014 as QueryTimeoutException
...
Closes gh-35073
2025-06-18 12:20:09 +02:00
74ee1b991a
Apply consistent copyright headers in Kotlin source code
...
See gh-35070
2025-06-17 16:24:15 +02:00
16edf9867a
Update copyright headers in source files
...
This commit updates Java, Kotlin, and Groovy source files to use the
"<year>-present" pattern in copyright headers.
Closes gh-35070
2025-06-17 16:23:50 +02:00
Juergen Hoeller