Merge pull request quarkusio#27467 from xieshenzh/service-binding-sql…

…server-oracle Fix service binding for SqlServer and Oracle
gastaldi · Aug 24, 2022 · 85d06ba · 85d06ba
2 parents c51233e + 9743d7e
commit 85d06ba
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/...sql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/MsSQLServiceBindingConverter.java b/...sql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/MsSQLServiceBindingConverter.java
@@ -13,6 +13,6 @@ public class MsSQLServiceBindingConverter implements ServiceBindingConverter {
     @Override
     public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
         return ServiceBinding.singleMatchingByType("sqlserver", serviceBindings)
-                .map(new DatasourceServiceBindingConfigSourceFactory.Jdbc());
+                .map(new DatasourceServiceBindingConfigSourceFactory.Jdbc("jdbc:%s://%s%s;databaseName=%s"));
     }
 }
diff --git a/...e/runtime/src/main/java/io/quarkus/jdbc/oracle/runtime/OracleServiceBindingConverter.java b/...e/runtime/src/main/java/io/quarkus/jdbc/oracle/runtime/OracleServiceBindingConverter.java
@@ -13,7 +13,7 @@ public class OracleServiceBindingConverter implements ServiceBindingConverter {
     @Override
     public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
         return ServiceBinding.singleMatchingByType("oracle", serviceBindings)
-                .map(new DatasourceServiceBindingConfigSourceFactory.Jdbc());
+                .map(new DatasourceServiceBindingConfigSourceFactory.Jdbc("jdbc:%s:thin:@%s%s/%s"));
     }
 
 }
diff --git a/...s/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter b/...s/META-INF/services/io.quarkus.kubernetes.service.binding.runtime.ServiceBindingConverter
@@ -0,0 +1 @@
+io.quarkus.jdbc.oracle.runtime.OracleServiceBindingConverter
diff --git a/...arkus/kubernetes/service/binding/runtime/DatasourceServiceBindingConfigSourceFactory.java b/...arkus/kubernetes/service/binding/runtime/DatasourceServiceBindingConfigSourceFactory.java
@@ -47,6 +47,12 @@ private Map<String, String> getServiceBindingProperties() {
             log.debugf("Property 'password' was not found for datasource of type %s", serviceBinding.getType());
         }
 
+        String url = bindingProperties.get("jdbc-url");
+        if (url != null) {
+            properties.put(urlPropertyName, url);
+            return properties;
+        }
+
         String host = bindingProperties.get("host");
         String port = bindingProperties.get("port");
         String database = bindingProperties.get("database");
@@ -72,11 +78,19 @@ public static class Jdbc extends DatasourceServiceBindingConfigSourceFactory {
         public Jdbc() {
             super("jdbc", "quarkus.datasource.jdbc.url", "jdbc:%s://%s%s/%s");
         }
+
+        public Jdbc(String urlFormat) {
+            super("jdbc", "quarkus.datasource.jdbc.url", urlFormat);
+        }
     }
 
     public static class Reactive extends DatasourceServiceBindingConfigSourceFactory {
         public Reactive() {
             super("reactive", "quarkus.datasource.reactive.url", "%s://%s%s/%s");
         }
+
+        public Reactive(String urlFormat) {
+            super("reactive", "quarkus.datasource.reactive.url", urlFormat);
+        }
     }
 }
diff --git a/...rc/main/java/io/quarkus/reactive/oracle/client/runtime/OracleServiceBindingConverter.java b/...rc/main/java/io/quarkus/reactive/oracle/client/runtime/OracleServiceBindingConverter.java
@@ -13,7 +13,7 @@ public class OracleServiceBindingConverter implements ServiceBindingConverter {
     @Override
     public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> serviceBindings) {
         return ServiceBinding.singleMatchingByType("oracle", serviceBindings)
-                .map(new DatasourceServiceBindingConfigSourceFactory.Reactive());
+                .map(new DatasourceServiceBindingConfigSourceFactory.Reactive("%s:thin:@%s%s/%s"));
     }
 
 }