Merge remote-tracking branch 'origin/master'

clagomess · Sep 24, 2019 · dfbfab0 · dfbfab0
2 parents f16e266 + 8a6e397
commit dfbfab0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.clagomess</groupId>
     <artifactId>mod-plsql</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <properties>
         <jetty.version>9.4.19.v20190610</jetty.version>

diff --git a/src/main/java/com/github/clagomess/modplsql/jdbc/Database.java b/src/main/java/com/github/clagomess/modplsql/jdbc/Database.java
@@ -32,6 +32,8 @@ public static void init(ConfigDto dto) throws SQLException {
     }
 
     public static String runPl(String plName, Map<String, String> param) throws SQLException {
+        int idx;
+
         // fill parans
         param.putAll(configDto.getParamsAsMap());
 
@@ -45,10 +47,10 @@ public static String runPl(String plName, Map<String, String> param) throws SQLE
 
         sql.append(String.format("  NUM_ENTRIES := %s;\n", param.size()));
 
-        int idx = 1;
+        idx = 1;
         for (Map.Entry<String, String> entry : param.entrySet()) {
-            sql.append(String.format("  NAME_ARRAY(%s) := '%s';\n", idx, entry.getKey()));
-            sql.append(String.format("  VALUE_ARRAY(%s) := '%s';\n", idx, escape(entry.getValue())));
+            sql.append(String.format("  NAME_ARRAY(%s) := ?; -- '%s'\n", idx, entry.getKey()));
+            sql.append(String.format("  VALUE_ARRAY(%s) := ?; -- '%s'\n", idx, escape(entry.getValue())));
             idx++;
         }
 
@@ -63,9 +65,17 @@ public static String runPl(String plName, Map<String, String> param) throws SQLE
 
         log.info("QUERY:\n{}", sql.toString());
 
-        stmt.executeUpdate(sql.toString());
+        PreparedStatement pstmt = conn.prepareStatement(sql.toString());
+        idx = 1;
+        for (Map.Entry<String, String> entry : param.entrySet()) {
+            pstmt.setString(idx, entry.getKey());
+            idx++;
+            pstmt.setString(idx, entry.getValue());
+            idx++;
+        }
+
+        pstmt.execute();
 
-        log.info("GET RESULT");
         return getResult();
     }