Skip to content

Commit 5b96571

Browse files
jfinaljfinal
committed
no change
1 parent 08f70c8 commit 5b96571

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

‎src/com/jfinal/plugin/activerecord/dialect/PostgreSqlDialect.java

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
public class PostgreSqlDialect extends Dialect {
3030

3131
public String forTableInfoBuilderDoBuildTableInfo(String tableName) {
32-
return "select * from " + tableName + " where 1 = 2";
32+
return "select * from \"" + tableName + "\" where 1 = 2";
3333
}
3434

3535
public void forModelSave(TableInfo tableInfo, Map<String, Object> attrs, StringBuilder sql, List<Object> paras) {
36-
sql.append("insert into ").append(tableInfo.getTableName()).append("(");
36+
sql.append("insert into \"").append(tableInfo.getTableName()).append("\"(");
3737
StringBuilder temp = new StringBuilder(") values(");
3838
for (Entry<String, Object> e: attrs.entrySet()) {
3939
String colName = e.getKey();
@@ -42,7 +42,7 @@ public void forModelSave(TableInfo tableInfo, Map<String, Object> attrs, StringB
4242
sql.append(", ");
4343
temp.append(", ");
4444
}
45-
sql.append(colName);
45+
sql.append("\"").append(colName).append("\"");
4646
temp.append("?");
4747
paras.add(e.getValue());
4848
}
@@ -53,24 +53,24 @@ public void forModelSave(TableInfo tableInfo, Map<String, Object> attrs, StringB
5353
public String forModelDeleteById(TableInfo tInfo) {
5454
String pKey = tInfo.getPrimaryKey();
5555
StringBuilder sql = new StringBuilder(45);
56-
sql.append("delete from ");
56+
sql.append("delete from \"");
5757
sql.append(tInfo.getTableName());
58-
sql.append(" where ").append(pKey).append(" = ?");
58+
sql.append("\" where \"").append(pKey).append("\" = ?");
5959
return sql.toString();
6060
}
6161

6262
public void forModelUpdate(TableInfo tableInfo, Map<String, Object> attrs, Set<String> modifyFlag, String pKey, Object id, StringBuilder sql, List<Object> paras) {
63-
sql.append("update ").append(tableInfo.getTableName()).append(" set ");
63+
sql.append("update \"").append(tableInfo.getTableName()).append("\" set ");
6464
for (Entry<String, Object> e : attrs.entrySet()) {
6565
String colName = e.getKey();
6666
if (!pKey.equalsIgnoreCase(colName) && modifyFlag.contains(colName) && tableInfo.hasColumnLabel(colName)) {
6767
if (paras.size() > 0)
6868
sql.append(", ");
69-
sql.append(colName).append(" = ? ");
69+
sql.append("\"").append(colName).append("\" = ? ");
7070
paras.add(e.getValue());
7171
}
7272
}
73-
sql.append(" where ").append(pKey).append(" = ?");
73+
sql.append(" where \"").append(pKey).append("\" = ?");
7474
paras.add(id);
7575
}
7676

@@ -84,12 +84,14 @@ public String forModelFindById(TableInfo tInfo, String columns) {
8484
for (int i=0; i<columnsArray.length; i++) {
8585
if (i > 0)
8686
sql.append(", ");
87+
sql.append("\"");
8788
sql.append(columnsArray[i].trim());
89+
sql.append("\"");
8890
}
8991
}
90-
sql.append(" from ");
92+
sql.append(" from \"");
9193
sql.append(tInfo.getTableName());
92-
sql.append(" where ").append(tInfo.getPrimaryKey()).append(" = ?");
94+
sql.append("\" where \"").append(tInfo.getPrimaryKey()).append("\" = ?");
9395
return sql.toString();
9496
}
9597

@@ -103,25 +105,25 @@ public String forDbFindById(String tableName, String primaryKey, String columns)
103105
for (int i=0; i<columnsArray.length; i++) {
104106
if (i > 0)
105107
sql.append(", ");
106-
sql.append(columnsArray[i].trim());
108+
sql.append("\"").append(columnsArray[i].trim()).append("\"");
107109
}
108110
}
109-
sql.append(" from ");
111+
sql.append(" from \"");
110112
sql.append(tableName.trim());
111-
sql.append(" where ").append(primaryKey).append(" = ?");
113+
sql.append("\" where \"").append(primaryKey).append("\" = ?");
112114
return sql.toString();
113115
}
114116

115117
public String forDbDeleteById(String tableName, String primaryKey) {
116-
StringBuilder sql = new StringBuilder("delete from ");
118+
StringBuilder sql = new StringBuilder("delete from \"");
117119
sql.append(tableName.trim());
118-
sql.append(" where ").append(primaryKey).append(" = ?");
120+
sql.append("\" where \"").append(primaryKey).append("\" = ?");
119121
return sql.toString();
120122
}
121123

122124
public void forDbSave(StringBuilder sql, List<Object> paras, String tableName, Record record) {
123-
sql.append("insert into ");
124-
sql.append(tableName.trim()).append("(");
125+
sql.append("insert into \"");
126+
sql.append(tableName.trim()).append("\"(");
125127
StringBuilder temp = new StringBuilder();
126128
temp.append(") values(");
127129

@@ -130,26 +132,26 @@ public void forDbSave(StringBuilder sql, List<Object> paras, String tableName, R
130132
sql.append(", ");
131133
temp.append(", ");
132134
}
133-
sql.append(e.getKey());
135+
sql.append("\"").append(e.getKey()).append("\"");
134136
temp.append("?");
135137
paras.add(e.getValue());
136138
}
137139
sql.append(temp.toString()).append(")");
138140
}
139141

140142
public void forDbUpdate(String tableName, String primaryKey, Object id, Record record, StringBuilder sql, List<Object> paras) {
141-
sql.append("update ").append(tableName.trim()).append(" set ");
143+
sql.append("update \"").append(tableName.trim()).append("\" set ");
142144
for (Entry<String, Object> e: record.getColumns().entrySet()) {
143145
String colName = e.getKey();
144146
if (!primaryKey.equalsIgnoreCase(colName)) {
145147
if (paras.size() > 0) {
146148
sql.append(", ");
147149
}
148-
sql.append(colName).append(" = ? ");
150+
sql.append("\"").append(colName).append("\" = ? ");
149151
paras.add(e.getValue());
150152
}
151153
}
152-
sql.append(" where ").append(primaryKey).append(" = ?");
154+
sql.append(" where \"").append(primaryKey).append("\" = ?");
153155
paras.add(id);
154156
}
155157

0 commit comments

Comments
 (0)