diff --git a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionOracleImpl.kt b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionOracleImpl.kt index 24d3bc9c86..bf9e6170b4 100644 --- a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionOracleImpl.kt +++ b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionOracleImpl.kt @@ -23,15 +23,15 @@ import java.util.* class CashSelectionOracleImpl : AbstractCashSelection(maxRetries = 16, retrySleep = 1000, retryCap = 5000) { companion object { - val JDBC_DRIVER_NAME = "Oracle JDBC driver" + const val JDBC_DRIVER_NAME = "Oracle JDBC driver" private val log = contextLogger() } override fun isCompatible(metaData: DatabaseMetaData): Boolean { - return metaData.driverName == JDBC_DRIVER_NAME + return metaData.driverName.startsWith(JDBC_DRIVER_NAME, ignoreCase = true) } - override fun toString() = "${this::class.java} for $JDBC_DRIVER_NAME" + override fun toString() = "${this::class.qualifiedName} for '$JDBC_DRIVER_NAME'" override fun executeQuery(connection: Connection, amount: Amount, lockId: UUID, notary: Party?, onlyFromIssuerParties: Set, withIssuerRefs: Set, withResultSet: (ResultSet) -> Boolean): Boolean { diff --git a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionPostgreSQLImpl.kt b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionPostgreSQLImpl.kt index d219fb3a2e..33053ddabf 100644 --- a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionPostgreSQLImpl.kt +++ b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionPostgreSQLImpl.kt @@ -28,7 +28,7 @@ class CashSelectionPostgreSQLImpl : AbstractCashSelection() { } override fun isCompatible(metadata: DatabaseMetaData): Boolean { - return metadata.driverName == JDBC_DRIVER_NAME + return metadata.driverName.startsWith(JDBC_DRIVER_NAME, ignoreCase = true) } override fun toString() = "${this::class.qualifiedName} for '$JDBC_DRIVER_NAME'" diff --git a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt index bd9f6c16a7..20d0c5343b 100644 --- a/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt +++ b/finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt @@ -28,15 +28,15 @@ import java.util.* class CashSelectionSQLServerImpl : AbstractCashSelection(maxRetries = 16, retrySleep = 1000, retryCap = 5000) { companion object { - val JDBC_DRIVER_NAME = "Microsoft JDBC Driver 6.2 for SQL Server" + const val JDBC_DRIVER_NAME = "Microsoft JDBC Driver" private val log = contextLogger() } override fun isCompatible(metaData: DatabaseMetaData): Boolean { - return metaData.driverName == JDBC_DRIVER_NAME + return metaData.driverName.startsWith(JDBC_DRIVER_NAME, ignoreCase = true) } - override fun toString() = "${this::class.java} for $JDBC_DRIVER_NAME" + override fun toString() = "${this::class.qualifiedName} for '$JDBC_DRIVER_NAME'" override fun executeQuery(connection: Connection, amount: Amount, lockId: UUID, notary: Party?, onlyFromIssuerParties: Set,