Skip to content

Commit eedc2b4

Browse files
cotidecotide
committed
👶 update to sql2o-plus 1.0.3-SNAPSHOT
1.将占位符@0,@1,@2...统一改为?
1 parent 5eadfe3 commit eedc2b4

11 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,14 @@ List<UserInfo> result1 = userInfoRepository.getList();
201201
List<UserInfo> result2 = userInfoRepository.getList(Sql.builder().select().from(UserInfo.class));
202202

203203
// getList(String sql,Object ... param)
204-
String sql = "select * from user_info where user_id = @0 ";
204+
String sql = "select * from user_info where user_id = ? ";
205205
List<UserInfo> result3 = userInfoRepository.getList(sql,1);
206206

207207
// ** Dto getList **
208-
Sql sql1 = Sql.builder().select(" user_id as id, user_Name as name ").from(UserInfo.class).where("user_id = @0",1);
208+
Sql sql1 = Sql.builder().select(" user_id as id, user_Name as name ").from(UserInfo.class).where("user_id = ?",1);
209209
List<UserInfoDto> result4 = db.getSqlQuery().getDtoList(UserInfoDto.class,sql1);
210210

211-
String sql2 = "select user_id as id, user_Name as name from user_info where user_id = @0 ";
211+
String sql2 = "select user_id as id, user_Name as name from user_info where user_id = ? ";
212212
List<UserInfoDto> result5 = db.getSqlQuery().getDtoList(UserInfoDto.class,sql2,1);
213213
```
214214

@@ -225,16 +225,16 @@ UserInfo result1 = userInfoRepository.getById(1);
225225

226226
// get(Sql sql)
227227
UserInfo result2 = userInfoRepository.get(
228-
Sql.builder().select().from(UserInfo.class).where("user_id = @0",1));
228+
Sql.builder().select().from(UserInfo.class).where("user_id = ?",1));
229229

230230
// get(String sql, Object ... param)
231-
String sql = "select * from user_info where user_id = @0 ";
231+
String sql = "select * from user_info where user_id = ? ";
232232
UserInfo result3 = userInfoRepository.get(sql,1);
233233

234234
// ** Dto get **
235235
// getDto(Class<TDto> returnType, Sql sql)
236236
UserInfoDto result4 = db.getSqlQuery().getDto(
237-
UserInfoDto.class,Sql.builder().select("user_id as id, user_Name as name").from(UserInfo.class).where("user_id = @0",1));
237+
UserInfoDto.class,Sql.builder().select("user_id as id, user_Name as name").from(UserInfo.class).where("user_id = ?",1));
238238
```
239239

240240

@@ -366,7 +366,7 @@ UserInfo user = userInfoRepository.create(domain);
366366
Database db = getDatabase();
367367
IRepository<UserInfo> userInfoRepository = db.getRepository(UserInfo.class);
368368
// get
369-
UserInfo user = userInfoRepository.get(Sql.builder().select().from(UserInfo.class).where("user_id = @0",3399));
369+
UserInfo user = userInfoRepository.get(Sql.builder().select().from(UserInfo.class).where("user_id = ?",3399));
370370
// update
371371
user.setName("Test_2 ## -- ");
372372
userInfoRepository.update(user);
@@ -378,7 +378,7 @@ userInfoRepository.update(user);
378378
Database db = getDatabase();
379379
IRepository<UserInfo> userInfoRepository = db.getRepository(UserInfo.class);
380380
// get
381-
UserInfo user = userInfoRepository.get(Sql.builder().select().from(UserInfo.class).where("user_id = @0",3391));
381+
UserInfo user = userInfoRepository.get(Sql.builder().select().from(UserInfo.class).where("user_id = ?",3391));
382382
// delete
383383
userInfoRepository.delete(user);
384384
```
@@ -419,7 +419,7 @@ try(Database db = getDatabase()){
419419
// 开启事务
420420
db.beginTransaction();
421421
final String insertSql =
422-
"INSERT INTO user_info (user_Name,password,login,create_time) VALUES (@0,@1,@2,@3)";
422+
"INSERT INTO user_info (user_Name,password,login,create_time) VALUES (?,?,?,?)";
423423
// Create
424424
int id = db.getSqlRun().execute(
425425
insertSql,
@@ -429,14 +429,14 @@ try(Database db = getDatabase()){
429429
new Date()).asInt();
430430
// Update
431431
final String updateSql =
432-
"UPDATE user_info set user_Name = @0 WHERE user_id = @1";
432+
"UPDATE user_info set user_Name = ? WHERE user_id = ?";
433433
db.getSqlRun().execute(updateSql,"Execute Test2",id);
434434
// 事务提交
435435
db.commit();
436436
// Select
437437
Sql sql = Sql.builder()
438438
.select("user_id as id, user_Name as name")
439-
.from(UserInfo.class).where("user_id = @0", id);
439+
.from(UserInfo.class).where("user_id = ?", id);
440440
UserInfoDto resultDto = db.getSqlQuery().getDto(UserInfoDto.class,sql);
441441
}
442442
```

‎src/main/java/io/github/cotide/dapper/query/Sql.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class Sql {
2727
private String _sqlFinal;
2828
private Object[] _argsFinal;
2929

30-
private final static Pattern SQL_BRACKET = Pattern.compile("(?<!@)@\\w+");
30+
private final static Pattern SQL_BRACKET = Pattern.compile("(?<!\\?)\\?+");
3131

3232
public Sql() {
3333

@@ -60,20 +60,20 @@ public Sql append(String sql, Object... params) {
6060

6161

6262
public <T extends Entity,R> Sql whereGt(TypeFunction<T, R> function,Object param) {
63-
return where(Sql2oUtils.getLambdaColumnName(function)+" > @0 ",param);
63+
return where(Sql2oUtils.getLambdaColumnName(function)+" > ? ",param);
6464
}
6565

6666
public <T extends Entity,R> Sql whereLt(TypeFunction<T, R> function,Object param) {
67-
return where(Sql2oUtils.getLambdaColumnName(function)+" < @0 ",param);
67+
return where(Sql2oUtils.getLambdaColumnName(function)+" < ? ",param);
6868
}
6969

7070

7171
public <T extends Entity,R> Sql whereGte(TypeFunction<T, R> function,Object param) {
72-
return where(Sql2oUtils.getLambdaColumnName(function)+" >= @0 ",param);
72+
return where(Sql2oUtils.getLambdaColumnName(function)+" >= ? ",param);
7373
}
7474

7575
public <T extends Entity,R> Sql whereLte(TypeFunction<T, R> function,Object param) {
76-
return where(Sql2oUtils.getLambdaColumnName(function)+" <= @0 ",param);
76+
return where(Sql2oUtils.getLambdaColumnName(function)+" <= ? ",param);
7777
}
7878

7979

@@ -85,11 +85,11 @@ public Sql where(String sql, Object... params) {
8585

8686

8787
public <T extends Entity,R> Sql where(String asName,TypeFunction<T, R> function,Object param) {
88-
return where((asName!=null&&!asName.isEmpty()?asName+".":"")+Sql2oUtils.getLambdaColumnName(function)+" = @0 ",param);
88+
return where((asName!=null&&!asName.isEmpty()?asName+".":"")+Sql2oUtils.getLambdaColumnName(function)+" = ? ",param);
8989
}
9090

9191
public <T extends Entity,R> Sql where(TypeFunction<T, R> function,Object param) {
92-
return where(Sql2oUtils.getLambdaColumnName(function)+" = @0 ",param);
92+
return where(Sql2oUtils.getLambdaColumnName(function)+" = ? ",param);
9393
}
9494

9595
public <T extends Entity,R> Sql whereIn(String asName,TypeFunction<T, R> function, Object... paras) throws SqlBuildException {
@@ -126,7 +126,7 @@ public Sql whereIn(String column, Object... paras) throws SqlBuildException {
126126
String appendSql = String.format("%s in (%s)",column,appendValue);
127127
where(appendSql,paras);
128128
}else{
129-
where(String.format("%s in (@0)",column,paras));
129+
where(String.format("%s in (?)",column,paras));
130130
}
131131

132132
return this;
@@ -144,7 +144,7 @@ public <T extends Entity,R> Sql whereLike(TypeFunction<T, R> function, String
144144
}
145145

146146
public Sql whereLike(String column, String parm) throws SqlBuildException {
147-
where(column+" like @0 ","%"+parm+"%");
147+
where(column+" like ? ","%"+parm+"%");
148148
return this;
149149
}
150150

‎src/main/java/io/github/cotide/dapper/repository/DapperRepositoryBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public List<TEntity> getList(String sql, Object... param) {
7272
@Override
7373
public TEntity getById(Object primaryKey) {
7474
Sql sql = Sql.builder().select().from(modelClass).where(
75-
String.format("%s = @0", Sql2oCache.getPKColumn(modelClass)),
75+
String.format("%s = ?", Sql2oCache.getPKColumn(modelClass)),
7676
primaryKey);
7777
return super.getDto(modelClass,sql);
7878
}

‎src/test/java/com/sqltest/db/CRUDTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void updateTest(){
4343
Sql.builder()
4444
.select()
4545
.from(UserInfo.class)
46-
.where("user_id = @0", 4));
46+
.where("user_id = ?", 4));
4747
assert (user != null) : "userinfo is null";
4848
System.out.println(">>>>>>>>>> get result <<<<<<<<<<");
4949
System.out.println(user.getId());
@@ -63,7 +63,7 @@ public void deleteTest(){
6363
Sql.builder()
6464
.select()
6565
.from(UserInfo.class)
66-
.where("user_id = @0", 4));
66+
.where("user_id = ?", 4));
6767
assert (user != null) : "userinfo is null";
6868
System.out.println(">>>>>>>>>> Result <<<<<<<<<<");
6969
System.out.println(user.getId());

‎src/test/java/com/sqltest/db/DebugTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void getDtoListTest(){
2626
"status," +
2727
"create_time as createTime")
2828
.from(UserInfo.class)
29-
.where("user_id=@0",1));
29+
.where("user_id=?",1));
3030

3131
assert (user != null&&user.getId()>0) : "user is null";
3232

‎src/test/java/com/sqltest/db/EnumTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public void selectByEnumString(){
2424
IRepository<UserInfo> userInfoIRepository = db.getRepository(UserInfo.class);
2525
List<UserInfo> userInfos = userInfoIRepository.getList(
2626
Sql.builder().select().from(UserInfo.class)
27-
.where("`group` = @0 ",EnumGroup.GROUP1)
28-
.where("`status` = @0",EnumUserStatus.NORMAL)
27+
.where("`group` = ? ",EnumGroup.GROUP1)
28+
.where("`status` = ?",EnumUserStatus.NORMAL)
2929
.where(UserInfo::getStatus,EnumUserStatus.NORMAL)
3030
.where(UserInfo::getGroup,EnumGroup.GROUP1));
3131
System.out.println(userInfos.size());
@@ -100,7 +100,7 @@ public void GetDtoList(){
100100
Sql.builder()
101101
.select("user_id as id,user_name as name,login,level,status,create_time as createTime")
102102
.from(UserInfo.class)
103-
.where("user_id=@0",3));
103+
.where("user_id=?",3));
104104

105105
assert (user != null&&user.getId()>0) : "user is null";
106106
//assert (user.getLevel() == EnumVipLevel.VIP3) : "user vip is error";

‎src/test/java/com/sqltest/db/ExecuteTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void Execute(){
1717
try(Database db = getDatabase()){
1818
db.beginTransaction();
1919
final String insertSql =
20-
"INSERT INTO user_info (user_Name,password,login,create_time) VALUES (@0,@1,@2,@3)";
20+
"INSERT INTO user_info (user_Name,password,login,create_time) VALUES (?,?,?,?)";
2121

2222
int id = db.getSqlRun().execute(
2323
insertSql,
@@ -28,12 +28,12 @@ public void Execute(){
2828
System.out.println("Object is :"+id);
2929
assert (id>0):"insert is error";
3030
final String updateSql =
31-
"UPDATE user_info set user_Name = @0 WHERE user_id = @1";
31+
"UPDATE user_info set user_Name = ? WHERE user_id = ?";
3232
db.getSqlRun().execute(updateSql,"Execute Test2",id);
3333
db.commit();
3434
Sql sql = Sql.builder()
3535
.select("user_id as id, user_Name as name")
36-
.from(UserInfo.class).where("user_id = @0", id);
36+
.from(UserInfo.class).where("user_id = ?", id);
3737
UserInfoDto resultDto = db.getSqlQuery().getDto(UserInfoDto.class,sql);
3838
assert (resultDto!=null&&resultDto.getName().equals("Execute Test2")):"update get is error";
3939
System.out.println(">>>>>>>>>> Result <<<<<<<<<<");
@@ -51,12 +51,12 @@ public void Execute2(){
5151
try(Database db = getDatabase()){
5252
db.beginTransaction();
5353
// Sql sql = Sql.builder().append(
54-
// "INSERT INTO user_info (user_Name,password,login,create_time) VALUES (@0,@1,@2,@3);",
54+
// "INSERT INTO user_info (user_Name,password,login,create_time) VALUES (?,?,?,?);",
5555
// "Execute Test1",
5656
// "123456",
5757
// 10086,
5858
// new Date());
59-
// sql.append("INSERT INTO user_info (user_Name,password,login,create_time) VALUES (@0,@1,@2,@3);",
59+
// sql.append("INSERT INTO user_info (user_Name,password,login,create_time) VALUES (?,?,?,?);",
6060
// "Execute Test2",
6161
// "123456",
6262
// 10086,

‎src/test/java/com/sqltest/db/SelectExTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void getDtoListTest(){
2020
Database db = getDatabase();
2121

2222
// getDtoList(Class<TDto> returnType,Sql inter)
23-
Sql sql1 = Sql.builder().select(" user_id as id, user_Name as name ").from(UserInfo.class).where("user_id = @0", 1);
23+
Sql sql1 = Sql.builder().select(" user_id as id, user_Name as name ").from(UserInfo.class).where("user_id = ?", 1);
2424
List<UserInfoDto> result = db.getSqlQuery().getDtoList(UserInfoDto.class, sql1);
2525
assert (result.size() > 0 && result.get(0).getId() > 0) : "UserInfoRepository getDtoList(Class<TDto> returnType,Sql inter) is error";
2626
System.out.println(">>>>>>>>>> Result <<<<<<<<<<");
@@ -31,7 +31,7 @@ public void getDtoListTest(){
3131
}
3232

3333
// getDtoList(Class<TDto> returnType,String inter,Object ... param)
34-
String sql2 = "select user_id as id, user_Name as name from user_info where user_id = @0 ";
34+
String sql2 = "select user_id as id, user_Name as name from user_info where user_id = ? ";
3535
List<UserInfoDto> result2 = db.getSqlQuery().getDtoList(UserInfoDto.class, sql2, 1);
3636
assert (result2.size() > 0 && result2.get(0).getId() > 0) : "UserInfoRepository getDtoList(Class<TDto> returnType,String inter,Object ... param) is error";
3737
System.out.println(">>>>>>>>>> Result2 <<<<<<<<<<");
@@ -49,7 +49,7 @@ public void getDtoTest(){
4949
// getDto(Class<TDto> returnType, Sql inter)
5050
UserInfoDto result1 = db.getSqlQuery().getDto(
5151
UserInfoDto.class,
52-
Sql.builder().select("user_id as id, user_Name as name").from(UserInfo.class).where("user_id = @0", 1));
52+
Sql.builder().select("user_id as id, user_Name as name").from(UserInfo.class).where("user_id = ?", 1));
5353
assert (result1 != null && result1.getId() > 0) : "UserInfoRepository getDto(Class<TDto> returnType, Sql inter) is error";
5454
System.out.println(">>>>>>>>>> Result2 <<<<<<<<<<");
5555
System.out.println("id:" + result1.getId());
@@ -63,7 +63,7 @@ public void getCountTest(){
6363

6464
Database db = getDatabase();
6565
// int count(Sql inter)
66-
int result = db.getSqlQuery().count(Sql.builder().select("count(1)").from(UserInfo.class).where("user_id in (@0,@1,@2)", 1, 2, 3));
66+
int result = db.getSqlQuery().count(Sql.builder().select("count(1)").from(UserInfo.class).where("user_id in (?,?,?)", 1, 2, 3));
6767
assert (result > 0) : "result value is error";
6868
System.out.println(">>>>>>>>>> Result <<<<<<<<<<");
6969
System.out.println("result size:" + result);

‎src/test/java/com/sqltest/db/SelectOneTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void getDtoTest(){
2020
String.class,
2121
Sql.builder().select(UserInfo::getValue)
2222
.from(UserInfo.class)
23-
.where(UserInfo::getId,8));
23+
.where(UserInfo::getId,1));
2424
System.out.println(">>>>>>>>>> Result1 <<<<<<<<<<");
2525
System.out.println(result);
2626

@@ -29,23 +29,23 @@ public void getDtoTest(){
2929
String.class,
3030
Sql.builder().select(UserInfo::getName)
3131
.from(UserInfo.class)
32-
.where(UserInfo::getId,8));
32+
.where(UserInfo::getId,2));
3333
System.out.println(">>>>>>>>>> Result2 <<<<<<<<<<");
3434
System.out.println(result1);
3535

36-
int result2 = db.getSqlQuery().getDto(
36+
Integer result2 = db.getSqlQuery().getDto(
3737
Integer.class,
3838
Sql.builder().select(UserInfo::getLogin)
3939
.from(UserInfo.class)
40-
.where(UserInfo::getId,8));
40+
.where(UserInfo::getId,3));
4141
System.out.println(">>>>>>>>>> Result3 <<<<<<<<<<");
4242
System.out.println(result2);
4343

4444
UserInfo result3 = db.getSqlQuery().getDto(
4545
UserInfo.class,
4646
Sql.builder().select()
4747
.from(UserInfo.class)
48-
.where(UserInfo::getId,8));
48+
.where(UserInfo::getId,4));
4949
System.out.println(">>>>>>>>>> Result4 <<<<<<<<<<");
5050
System.out.println(result3.getId());
5151
System.out.println(result3.getName());

0 commit comments

Comments
 (0)