Skip to content

Commit 785ea41

Browse files
jeffgbutlerjeffgbutler
committed
Replace "record" with "row"
1 parent bd75fee commit 785ea41

File tree

21 files changed

+492
-492
lines changed

21 files changed

+492
-492
lines changed

‎src/main/java/org/mybatis/dynamic/sql/ParameterTypeConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* Existing converters may be reused if they are marked with this additional interface.
3333
*
3434
* <p>The converter is only used for parameters in a parameter map. It is not used for result set processing.
35-
* It is also not used for insert statements that are based on an external record class. The converter will be called
35+
* It is also not used for insert statements that are based on an external row class. The converter will be called
3636
* in the following circumstances:
3737
*
3838
* <ul>

‎src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public String formatParameterMapKey(AtomicInteger sequence) {
7979
public abstract String getFormattedJdbcPlaceholder(String prefix, String parameterName);
8080

8181
/**
82-
* This method generates a binding for a parameter to a placeholder in a record based insert statement.
82+
* This method generates a binding for a parameter to a placeholder in a row based insert statement.
8383
*
8484
* <p>This binding is specifically for use with insert, batch insert, and multirow insert statements.
8585
* These statements bind parameters to properties of a row class. The Spring implementation changes the binding
@@ -102,7 +102,7 @@ public String getRecordBasedInsertBinding(BindableColumn<?> column, String prefi
102102
}
103103

104104
/**
105-
* This method generates a binding for a parameter to a placeholder in a record based insert statement.
105+
* This method generates a binding for a parameter to a placeholder in a row based insert statement.
106106
*
107107
* <p>This binding is specifically for use with insert, batch insert, and multirow insert statements and the
108108
* MapToRow mapping. These statements bind parameters to the row class directly.

‎src/main/java/org/mybatis/dynamic/sql/update/UpdateDSLCompleter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
* </pre>
6060
*
6161
* <p>You could also implement a helper method that would set fields based on values of a record. For example,
62-
* the following method would set all fields of a record based on whether or not the values are null:
62+
* the following method would set all fields of a row based on whether the values are null:
6363
*
6464
* <pre>
6565
* static UpdateDSL&lt;UpdateModel&gt; updateSelectiveColumns(PersonRecord record,

‎src/main/java/org/mybatis/dynamic/sql/util/mybatis3/CommonInsertMapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* insert statements that do NOT expect generated keys.
3030
*
3131
* @param <T>
32-
* the type of record associated with this mapper
32+
* the type of row associated with this mapper
3333
*/
3434
public interface CommonInsertMapper<T> extends CommonGeneralInsertMapper {
3535
/**

‎src/test/java/examples/animal/data/AnimalDataTest.java‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,11 +1498,11 @@ void testComplexCondition() {
14981498
void testUpdate() {
14991499
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
15001500
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
1501-
AnimalData record = new AnimalData();
1502-
record.setBodyWeight(2.6);
1501+
AnimalData row = new AnimalData();
1502+
row.setBodyWeight(2.6);
15031503

15041504
UpdateStatementProvider updateStatement = update(animalData)
1505-
.set(bodyWeight).equalTo(record.getBodyWeight())
1505+
.set(bodyWeight).equalTo(row.getBodyWeight())
15061506
.set(animalName).equalToNull()
15071507
.where(id, isIn(1, 5, 7))
15081508
.or(id, isIn(2, 6, 8), and(animalName, isLike("%bat")))
@@ -1556,13 +1556,13 @@ void testUpdateValueOrNullWithNull() {
15561556
void testInsert() {
15571557
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
15581558
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
1559-
AnimalData record = new AnimalData();
1560-
record.setId(100);
1561-
record.setAnimalName("Old Shep");
1562-
record.setBodyWeight(22.5);
1563-
record.setBrainWeight(1.2);
1559+
AnimalData row = new AnimalData();
1560+
row.setId(100);
1561+
row.setAnimalName("Old Shep");
1562+
row.setBodyWeight(22.5);
1563+
row.setBrainWeight(1.2);
15641564

1565-
InsertStatementProvider<AnimalData> insertStatement = insert(record)
1565+
InsertStatementProvider<AnimalData> insertStatement = insert(row)
15661566
.into(animalData)
15671567
.map(id).toProperty("id")
15681568
.map(animalName).toProperty("animalName")
@@ -1580,13 +1580,13 @@ void testInsert() {
15801580
void testInsertNull() {
15811581
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
15821582
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
1583-
AnimalData record = new AnimalData();
1584-
record.setId(100);
1585-
record.setAnimalName("Old Shep");
1586-
record.setBodyWeight(22.5);
1587-
record.setBrainWeight(1.2);
1583+
AnimalData row = new AnimalData();
1584+
row.setId(100);
1585+
row.setAnimalName("Old Shep");
1586+
row.setBodyWeight(22.5);
1587+
row.setBrainWeight(1.2);
15881588

1589-
InsertStatementProvider<AnimalData> insertStatement = insert(record)
1589+
InsertStatementProvider<AnimalData> insertStatement = insert(row)
15901590
.into(animalData)
15911591
.map(id).toProperty("id")
15921592
.map(animalName).toNull()
@@ -1605,17 +1605,17 @@ void testBulkInsert() {
16051605
try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH)) {
16061606
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
16071607
List<AnimalData> records = new ArrayList<>();
1608-
AnimalData record = new AnimalData();
1609-
record.setId(100);
1610-
record.setAnimalName("Old Shep");
1611-
record.setBodyWeight(22.5);
1612-
records.add(record);
1613-
1614-
record = new AnimalData();
1615-
record.setId(101);
1616-
record.setAnimalName("Old Dan");
1617-
record.setBodyWeight(22.5);
1618-
records.add(record);
1608+
AnimalData row = new AnimalData();
1609+
row.setId(100);
1610+
row.setAnimalName("Old Shep");
1611+
row.setBodyWeight(22.5);
1612+
records.add(row);
1613+
1614+
row = new AnimalData();
1615+
row.setId(101);
1616+
row.setAnimalName("Old Dan");
1617+
row.setBodyWeight(22.5);
1618+
records.add(row);
16191619

16201620
BatchInsert<AnimalData> batchInsert = insertBatch(records)
16211621
.into(animalData)
@@ -1655,17 +1655,17 @@ void testBulkInsert2() {
16551655
try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH)) {
16561656
AnimalDataMapper mapper = sqlSession.getMapper(AnimalDataMapper.class);
16571657
List<AnimalData> records = new ArrayList<>();
1658-
AnimalData record = new AnimalData();
1659-
record.setId(100);
1660-
record.setAnimalName("Old Shep");
1661-
record.setBodyWeight(22.5);
1662-
records.add(record);
1663-
1664-
record = new AnimalData();
1665-
record.setId(101);
1666-
record.setAnimalName("Old Dan");
1667-
record.setBodyWeight(22.5);
1668-
records.add(record);
1658+
AnimalData row = new AnimalData();
1659+
row.setId(100);
1660+
row.setAnimalName("Old Shep");
1661+
row.setBodyWeight(22.5);
1662+
records.add(row);
1663+
1664+
row = new AnimalData();
1665+
row.setId(101);
1666+
row.setAnimalName("Old Dan");
1667+
row.setBodyWeight(22.5);
1668+
records.add(row);
16691669

16701670
BatchInsert<AnimalData> batchInsert = insertBatch(records)
16711671
.into(animalData)
@@ -2245,14 +2245,14 @@ void testUpdateWithAddAndSubtract() {
22452245
int rows = mapper.update(updateStatement);
22462246
assertThat(rows).isEqualTo(1);
22472247

2248-
AnimalData record = MyBatis3Utils.selectOne(mapper::selectOne,
2248+
AnimalData row = MyBatis3Utils.selectOne(mapper::selectOne,
22492249
BasicColumn.columnList(id, bodyWeight, brainWeight),
22502250
animalData,
22512251
c -> c.where(id, isEqualTo(1))
22522252
);
22532253

2254-
assertThat(record.getBodyWeight()).isEqualTo(-2.86);
2255-
assertThat(record.getBrainWeight()).isEqualTo(2.005);
2254+
assertThat(row.getBodyWeight()).isEqualTo(-2.86);
2255+
assertThat(row.getBrainWeight()).isEqualTo(2.005);
22562256
}
22572257
}
22582258

@@ -2278,14 +2278,14 @@ void testUpdateWithMultiplyAndDivide() {
22782278
int rows = mapper.update(updateStatement);
22792279
assertThat(rows).isEqualTo(1);
22802280

2281-
AnimalData record = MyBatis3Utils.selectOne(mapper::selectOne,
2281+
AnimalData row = MyBatis3Utils.selectOne(mapper::selectOne,
22822282
BasicColumn.columnList(id, bodyWeight, brainWeight),
22832283
animalData,
22842284
c -> c.where(id, isEqualTo(1))
22852285
);
22862286

2287-
assertThat(record.getBodyWeight()).isEqualTo(0.42, within(.001));
2288-
assertThat(record.getBrainWeight()).isEqualTo(.0025);
2287+
assertThat(row.getBodyWeight()).isEqualTo(0.42, within(.001));
2288+
assertThat(row.getBrainWeight()).isEqualTo(.0025);
22892289
}
22902290
}
22912291
}

‎src/test/java/examples/array/ArrayTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ void testInsertSelectById() {
8383
.build()
8484
.render(RenderingStrategies.MYBATIS3);
8585

86-
Optional<NamesRecord> record = mapper.selectOne(selectStatement);
87-
assertThat(record).hasValueSatisfying( r -> {
86+
Optional<NamesRecord> row = mapper.selectOne(selectStatement);
87+
assertThat(row).hasValueSatisfying( r -> {
8888
assertThat(r.getId()).isEqualTo(1);
8989
assertThat(r.getNames()).isEqualTo(someNames);
9090
});
@@ -112,8 +112,8 @@ void testInsertSelectByArray() {
112112
.build()
113113
.render(RenderingStrategies.MYBATIS3);
114114

115-
Optional<NamesRecord> record = mapper.selectOne(selectStatement);
116-
assertThat(record).hasValueSatisfying( r -> {
115+
Optional<NamesRecord> row = mapper.selectOne(selectStatement);
116+
assertThat(row).hasValueSatisfying( r -> {
117117
assertThat(r.getId()).isEqualTo(1);
118118
assertThat(r.getNames()).isEqualTo(someNames);
119119
});

‎src/test/java/examples/custom_render/CustomRenderingTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ void testInsertRecord() {
8181
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
8282
JsonTestMapper mapper = sqlSession.getMapper(JsonTestMapper.class);
8383

84-
JsonTestRecord record = new JsonTestRecord();
85-
record.setId(1);
86-
record.setDescription("Fred");
87-
record.setInfo("{\"firstName\": \"Fred\", \"lastName\": \"Flintstone\", \"age\": 30}");
84+
JsonTestRecord row = new JsonTestRecord();
85+
row.setId(1);
86+
row.setDescription("Fred");
87+
row.setInfo("{\"firstName\": \"Fred\", \"lastName\": \"Flintstone\", \"age\": 30}");
8888

89-
InsertStatementProvider<JsonTestRecord> insertStatement = insert(record).into(jsonTest)
89+
InsertStatementProvider<JsonTestRecord> insertStatement = insert(row).into(jsonTest)
9090
.map(id).toProperty("id")
9191
.map(description).toProperty("description")
9292
.map(info).toProperty("info")
@@ -102,12 +102,12 @@ void testInsertRecord() {
102102
int rows = mapper.insert(insertStatement);
103103
assertThat(rows).isEqualTo(1);
104104

105-
record = new JsonTestRecord();
106-
record.setId(2);
107-
record.setDescription("Wilma");
108-
record.setInfo("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 25}");
105+
row = new JsonTestRecord();
106+
row.setId(2);
107+
row.setDescription("Wilma");
108+
row.setInfo("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 25}");
109109

110-
insertStatement = insert(record).into(jsonTest)
110+
insertStatement = insert(row).into(jsonTest)
111111
.map(id).toProperty("id")
112112
.map(description).toProperty("description")
113113
.map(info).toProperty("info")
@@ -313,9 +313,9 @@ void testDeReference() {
313313

314314
assertThat(selectStatement.getSelectStatement()).isEqualTo(expected);
315315

316-
Optional<JsonTestRecord> record = mapper.selectOne(selectStatement);
316+
Optional<JsonTestRecord> row = mapper.selectOne(selectStatement);
317317

318-
assertThat(record).hasValueSatisfying( r ->
318+
assertThat(row).hasValueSatisfying( r ->
319319
assertThat(r.getInfo())
320320
.isEqualTo("{\"firstName\": \"Wilma\", \"lastName\": \"Flintstone\", \"age\": 25}")
321321
);

0 commit comments

Comments
 (0)