Bugs solved: export as insert statement damages date values

Under Java 11 and macos: SQLRunner does not start.

Author: jan

.DS_Store

@@ -198,7 +198,7 @@
 		            version="${version}"
 		            mainclass="${mainclass}"
 		            jvmversion="1.8+"
-		            vmoptions="-Xmx8G -Dcom.sun.management.jmxremote=true -Dapple.awt.graphics.UseQuartz=true">
+		            vmoptions="-Xmx4G -Dcom.sun.management.jmxremote=true -Dapple.awt.graphics.UseQuartz=true">
 			<jarfileset dir="${lib}">
 				<include name="*.jar" />
                 <exclude name="ui.jar" />

build.xml

@@ -5,6 +5,9 @@ http://jan-lolling.de/#sqlrunner
 
 release notes
 -------------
+Version 20.7
+- Export result-set data bug fixed: insert statement use always the first timestamp value instead of column specific value
+
 Version 20.6
 - Model: Filter works now again
 Version 20.5

src/main/java/ReleaseNotes.txt

@@ -1 +1 @@
-20.6
+20.7

src/main/java/VERSION

@@ -2203,34 +2203,35 @@ private String createInsertLine(
 		final StringBuilder sb = new StringBuilder();
 		sb.append(insertStart); // jetzt ist alles fertig bis zu values ( ...
 		for (int c = 0; c < getColumnCount(); c++) {
+			Object value = getValueAt(row, c);
 			if (getColumnBasicType(c) == BasicDataType.DATE.getId()) {
-				if (getValueAt(row, c) != null) {
-					final String s = sdf.format((java.util.Date) getValueAt(row,
-							c));
+				if (value != null) {
+					final String s = sdf.format((java.util.Date) value);
 					final int p0 = dateFormatTemplate.indexOf("<");
+					String dateStrValue = "";
 					if (p0 != -1) {
 						final int p1 = dateFormatTemplate.indexOf(">", p0 + 1);
-						dateFormatTemplate = dateFormatTemplate.substring(0, p0)
+						dateStrValue = dateFormatTemplate.substring(0, p0)
 								+ s
 								+ dateFormatTemplate.substring(p1 + 1,
 										dateFormatTemplate.length());
 					}
 					// dateFormatTemplate ist nun kein Template mehr
-					sb.append(dateFormatTemplate);
+					sb.append(dateStrValue);
 				} else {
 					sb.append("null");
 				}
 			} else if (BasicDataType.isStringType(getColumnBasicType(c))) {
 				sb.append('\'');
-				if (getValueAt(row, c) != null) {
-					sb.append(dublicateSingleQuotas(getValueAt(row, c).toString()
+				if (value != null) {
+					sb.append(dublicateSingleQuotas(value.toString()
 							.replace('\n', ' ')
 							.replace('\r', ' ')));
 				}
 				sb.append('\'');
 			} else {
-				if (getValueAt(row, c) != null) {
-					sb.append(getValueAt(row, c).toString()
+				if (value != null) {
+					sb.append(value.toString()
 							.replace('\n', ' ')
 							.replace('\r', ' '));
 				} else {

src/main/java/sqlrunner/Database.java

@@ -1371,7 +1371,7 @@ private static void setupMacOSXApplicationListener() {
     	try {
 			MacOSXAdapterInterface adapter = (MacOSXAdapterInterface) Class.forName("sqlrunner.MacOSXAdapter").newInstance();
 			adapter.setup();
-    	} catch (Exception e) {
+    	} catch (Throwable e) {
 			logger.error("Instantiation of MacOS X adapter failed: " + e.getMessage(), e);
 		}
     }

src/main/java/sqlrunner/Main.java

@@ -7,7 +7,7 @@
  * This class is generated by the IconCodeGenerator
  *
  * author: jan
- * created at: Thu Feb 06 18:34:34 CET 2020
+ * created at: Wed Jan 06 18:01:21 CET 2021
  */
 public class ApplicationIcons {
 

src/main/java/sqlrunner/resources/ApplicationIcons.java

@@ -8,7 +8,7 @@
  * This class is generated by the IconCodeGenerator
  *
  * author: jan
- * created at: Thu Feb 06 18:34:34 CET 2020
+ * created at: Wed Jan 06 18:01:21 CET 2021
  */
 public class ApplicationImages {