Skip to content

Commit 9a7afd6

Browse files
committed
Fix bug in WriteJDBC
1 parent 0fef527 commit 9a7afd6

File tree

11 files changed

+38
-28
lines changed

11 files changed

+38
-28
lines changed

META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Manifest-Version: 1.0
22
Implementation-Title: JavaFBP
3-
Implementation-Version: 4.1.5
4-
3+
Implementation-Version: 4.1.6

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apply plugin: 'java-library'
3333

3434
}
3535

36-
version = '4.1.5'
36+
version = '4.1.6'
3737

3838
group = 'com.jpaulmorrison'
3939

@@ -74,7 +74,7 @@ java {
7474

7575

7676
jar {
77-
archiveVersion = '4.1.5'
77+
archiveVersion = '4.1.6'
7878
manifest {
7979
attributes 'Implementation-Title': 'JavaFBP', 'Implementation-Version': archiveVersion,
8080

@@ -138,7 +138,7 @@ description = "Create default maven directory structure"
138138

139139
groupId = 'com.jpaulmorrison'
140140
artifactId = 'javafbp'
141-
version = '4.1.5'
141+
version = '4.1.6'
142142

143143
from components.java
144144

8.47 MB
Binary file not shown.
7.94 MB
Binary file not shown.
665 KB
Binary file not shown.
248 KB
Binary file not shown.

build/libs/javafbp-4.1.6.jar

4.34 MB
Binary file not shown.

build/scripts/javafbp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ case "`uname`" in
8080
;;
8181
esac
8282

83-
CLASSPATH=$APP_HOME/lib/javafbp-4.1.5.jar:$APP_HOME/lib/gson-2.8.6.jar:$APP_HOME/lib/mysql-connector-java-8.0.21.jar:$APP_HOME/lib/protobuf-java-3.11.4.jar
83+
CLASSPATH=$APP_HOME/lib/javafbp-4.1.6.jar:$APP_HOME/lib/gson-2.8.6.jar:$APP_HOME/lib/mysql-connector-java-8.0.21.jar:$APP_HOME/lib/protobuf-java-3.11.4.jar
8484

8585

8686
# Determine the Java command to use to start the JVM.

build/scripts/javafbp.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ set CMD_LINE_ARGS=%*
8282
:execute
8383
@rem Setup the command line
8484

85-
set CLASSPATH=%APP_HOME%\lib\javafbp-4.1.5.jar;%APP_HOME%\lib\gson-2.8.6.jar;%APP_HOME%\lib\mysql-connector-java-8.0.21.jar;%APP_HOME%\lib\protobuf-java-3.11.4.jar
85+
set CLASSPATH=%APP_HOME%\lib\javafbp-4.1.6.jar;%APP_HOME%\lib\gson-2.8.6.jar;%APP_HOME%\lib\mysql-connector-java-8.0.21.jar;%APP_HOME%\lib\protobuf-java-3.11.4.jar
8686

8787

8888
@rem Execute javafbp

src/main/java/com/jpaulmorrison/fbp/core/components/jdbc/WriteJDBC.java

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -158,27 +158,38 @@ protected void execute() throws Exception {
158158
System.out.println("Unexpected class in incoming IP: " + o.getClass());
159159
continue;
160160
}
161-
String sqlInsert = "insert into " + iipContents[1] + " values (";
162-
// iterate through fiArray
161+
String sqlInsert = "insert into " + iipContents[1] + "(";
162+
String sqlValues = " values(";
163+
// iterate through hmColumns
163164
String cma = "";
164-
for (int i = 0; i < fiArray.length; i++) {
165-
//String colName = fiArray[i].colName;
166-
String objField = fiArray[i].objField;
167-
168-
//System.out.println("JDBC: " + colName + " " + hmColumns.get(colName));
169-
170-
//System.out.println("Obj: " + objField + " " + hmFields.get(objField));
171-
172-
//String objFType = hmFields.get(objField).toString();
173-
174-
Field field = curClass.getDeclaredField(objField);
175-
sqlInsert += cma + "\"" + field.get(o).toString() + "\"";
176-
cma = ",";
177-
}
178-
sqlInsert += ")";
165+
for (String col : hmColumns.keySet()) {
166+
Field field = null;
167+
for (int i = 0; i < fiArray.length; i++) {
168+
// String colName = fiArray[i].colName;
169+
String objField = fiArray[i].objField;
170+
if (fiArray[i].colName.equals(col)) {
171+
field = curClass.getDeclaredField(objField);
172+
break;
173+
}
174+
}
175+
176+
if (field == null) {
177+
System.out.println("Table column \"" + col +
178+
"\" not found in Field Info:" +
179+
fldsStr);
180+
return;
181+
}
182+
183+
sqlInsert += cma + col;
184+
sqlValues += cma + "\"" + field.get(o).toString() + "\"";
185+
cma = ",";
186+
}
187+
sqlInsert += ")";
188+
sqlValues += ")";
179189
//String sqlInsert = "insert into sales values (3001, 'Gone Fishing', 'Kumar', 'CAD11.11', 11)";
180-
System.out.println("The SQL statement is: " + sqlInsert + "\n"); // Echo for debugging
181-
int countInserted = stmt.executeUpdate(sqlInsert);
190+
System.out.println("The SQL statement is: " + sqlInsert + " " +
191+
sqlValues + "\n"); // Echo for debugging
192+
int countInserted = stmt.executeUpdate(sqlInsert + " " + sqlValues);
182193
if (countInserted != 1) {
183194
System.out.println("Couldn't insert record:\n");
184195
System.out.println("... " + sqlInsert);

0 commit comments

Comments
 (0)