PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix again table column name escaping

Browse Source
This commit is contained in:
Marc Baloup 2019-07-18 18:26:19 +02:00
parent 4773999dd6
commit d0a80abd41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/pandacube/java/util/orm/SQLElement.java
View File

@ -248,7 +248,7 @@ public abstract class SQLElement<E extends SQLElement<E>> {
List<Object> psValues = new ArrayList<>(); List<Object> psValues = new ArrayList<>();
for (Map.Entry<SQLField<E, ?>, Object> entry : modifiedValues.entrySet()) { for (Map.Entry<SQLField<E, ?>, Object> entry : modifiedValues.entrySet()) {
sql += entry.getKey().getName() + " = ? ,"; sql += "`" + entry.getKey().getName() + "` = ? ,";
addValueToSQLObjectList(psValues, entry.getKey(), entry.getValue()); addValueToSQLObjectList(psValues, entry.getKey(), entry.getValue());
} }

2
src/main/java/fr/pandacube/java/util/orm/SQLField.java
View File

@ -36,7 +36,7 @@ public class SQLField<E extends SQLElement<E>, T> {
/* package */ Pair<String, List<Object>> forSQLPreparedStatement() { /* package */ Pair<String, List<Object>> forSQLPreparedStatement() {
List<Object> params = new ArrayList<>(1); List<Object> params = new ArrayList<>(1);
if (defaultValue != null && !autoIncrement) params.add(defaultValue); if (defaultValue != null && !autoIncrement) params.add(defaultValue);
return new Pair<>(getName() + " " + type.toString() + (canBeNull ? " NULL" : " NOT NULL") return new Pair<>("`" + getName() + "` " + type.toString() + (canBeNull ? " NULL" : " NOT NULL")
+ (autoIncrement ? " AUTO_INCREMENT" : "") + (autoIncrement ? " AUTO_INCREMENT" : "")
+ ((defaultValue == null || autoIncrement) ? "" : " DEFAULT ?"), params); + ((defaultValue == null || autoIncrement) ? "" : " DEFAULT ?"), params);
} }