CHANGE: Bugfixes in ESQLNumArray and ESQLTextArray

Author: Bernhard Schlegel

bin/sql_dumper.jar

@@ -37,6 +37,9 @@ public static List<String> execute(String match, Log log) {
                     while (m2.find())
                         count++;
                     log.info("found " + String.valueOf(count) + " elements");
+                    // count now holds the number of actual values (the blocksize
+                    // itself is not included. So e.g. 2, val1, val2, val3 would
+                    // lead to count = 3
 
                     String[] values = block.split(",", 0);  // no limit, may cause stability issue on small hardware
 
@@ -49,7 +52,7 @@ public static List<String> execute(String match, Log log) {
                         for (int k = 0; k < blocksize && j <= (count); k++) {
                             String tempstr = values[j].toString();
                             tempstr = tempstr.replace("\"", "");
-                            if ((k + 1) < blocksize && (j + 1) < (count)) {
+                            if ((k + 1) < blocksize && j < (count)) {
                                 tempstr += ", ";
                             }
                             superString += tempstr;

src/main/java/sqldump/etl/esql/functions/ESQLNumArray.java

@@ -44,9 +44,9 @@ public static List<String> execute(String match, Log log) {
                     int blocksize =  Integer.parseInt(values[0]);
 
                     // add all numbers in range
-                    for (int j = 1; j < (count); j++) {
+                    for (int j = 1; j < (count+1);) {
                         String superString = "(";
-                        for (int k = 0; k < blocksize && j <= (count); k++) {
+                        for (int k = 0; k < blocksize && j <= (count+1); k++) {
                             String tempstr = values[j].toString();
                             tempstr = tempstr.replace("\"", "'");
                             if ((k + 1) < blocksize && (j + 1) < (count)) {