From c7884f3605eba4cdf4d07ecaa2838865e1ce04fd Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Thu, 27 Oct 2022 06:58:18 -0400 Subject: [PATCH] clean up replacements --- app/src/main/java/jrunner/jrunner.java | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/jrunner/jrunner.java b/app/src/main/java/jrunner/jrunner.java index 3e980f7..906b903 100644 --- a/app/src/main/java/jrunner/jrunner.java +++ b/app/src/main/java/jrunner/jrunner.java @@ -35,7 +35,7 @@ public class jrunner { Integer cols = null; String[] dtn = null; - msg = "jrunner version 0.36"; + msg = "jrunner version 0.37"; msg = msg + nl + "-scu source jdbc url"; msg = msg + nl + "-scn source username"; msg = msg + nl + "-scp source passowrd"; @@ -207,17 +207,7 @@ public class jrunner { nc = "NULL"; break; } - nc.replace("'","''"); - if (trim) { nc = nc.trim();} - nc = "'" + nc + "'"; - break; - case "CLOB": - nc = rs.getString(i); - if (rs.wasNull() || nc == null) { - nc = "NULL"; - break; - } - nc.replace("'","''"); + nc = nc.replaceAll("'","''"); if (trim) { nc = nc.trim();} nc = "'" + nc + "'"; break; @@ -227,7 +217,17 @@ public class jrunner { nc = "NULL"; break; } - nc.replace("'","''"); + nc = nc.replaceAll("'","''"); + if (trim) { nc = nc.trim();} + nc = "'" + nc + "'"; + break; + case "CLOB": + nc = rs.getString(i); + if (rs.wasNull() || nc == null) { + nc = "NULL"; + break; + } + nc = nc.replaceAll("'","''"); if (trim) { nc = nc.trim();} nc = "'" + nc + "'"; break; @@ -248,7 +248,7 @@ public class jrunner { nc = "NULL"; break; } - nc.replace("'","''"); + nc.replaceAll("'","''"); nc = "'" + nc + "'"; break; case "TIMESTAMP": @@ -257,7 +257,7 @@ public class jrunner { nc = "NULL"; break; } - nc.replace("'","''"); + nc.replaceAll("'","''"); nc = "'" + nc + "'"; break; case "BIGINT":