Skip to content

Commit 26f01ae

Browse files
robinsrobins
committed
Merge branch 'main' into v13_mark_as_supported
2 parents 55c2cc0 + be3d3b5 commit 26f01ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1043
-62
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ jobs:
322322
runs-on: ubuntu-latest
323323
services:
324324
mysql:
325-
image: mariadb:11.3.2
325+
image: mariadb:11.7.2
326326
env:
327327
MYSQL_ROOT_PASSWORD: root
328328
ports:

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
<dependency>
315315
<groupId>org.duckdb</groupId>
316316
<artifactId>duckdb_jdbc</artifactId>
317-
<version>1.1.3</version>
317+
<version>1.2.0</version>
318318
</dependency>
319319
<dependency>
320320
<groupId>com.facebook.presto</groupId>

‎src/sqlancer/Main.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ public void run() {
595595
System.out.println(
596596
formatInteger(nrSuccessfulActions.get()) + " successfully-executed statements");
597597
System.out.println(
598-
formatInteger(nrUnsuccessfulActions.get()) + " unsuccessfuly-executed statements");
598+
formatInteger(nrUnsuccessfulActions.get()) + " unsuccessfully-executed statements");
599599
}
600600

601601
private String formatInteger(long intValue) {

‎src/sqlancer/clickhouse/ast/constant/ClickHouseStringConstant.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public String toString() {
3232

3333
@Override
3434
public boolean asBooleanNotNull() {
35-
return value.length() > 0;
35+
return !value.isEmpty();
3636
}
3737

3838
@Override

‎src/sqlancer/cnosdb/CnosDBLoggableFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected Loggable createLoggable(String input, String suffix) {
1919
if (!input.endsWith(";")) {
2020
completeString += ";";
2121
}
22-
if (suffix != null && suffix.length() != 0) {
22+
if (suffix != null && !suffix.isEmpty()) {
2323
completeString += suffix;
2424
}
2525
return new LoggedString(completeString);

‎src/sqlancer/cnosdb/CnosDBToStringVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void visit(CnosDBSelect s) {
137137
sb.append(" WHERE ");
138138
visit(s.getWhereClause());
139139
}
140-
if (s.getGroupByExpressions().size() > 0) {
140+
if (!s.getGroupByExpressions().isEmpty()) {
141141
sb.append(" GROUP BY ");
142142
visit(s.getGroupByExpressions());
143143
}

‎src/sqlancer/cockroachdb/gen/CockroachDBExpressionGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public String generateUnoptimizedQueryString(CockroachDBSelect select, Cockroach
457457

458458
@Override
459459
public List<CockroachDBExpression> generateFetchColumns(boolean shouldCreateDummy) {
460-
if (shouldCreateDummy || columns.size() == 0) {
460+
if (shouldCreateDummy || columns.isEmpty()) {
461461
return List.of(new CockroachDBColumnReference(new CockroachDBColumn("*", null, false, false)));
462462
}
463463
return Randomly.nonEmptySubset(columns).stream().map(c -> new CockroachDBColumnReference(c))
@@ -541,7 +541,7 @@ boolean mutateWhere(CockroachDBSelect select) {
541541
}
542542

543543
boolean mutateGroupBy(CockroachDBSelect select) {
544-
boolean increase = select.getGroupByExpressions().size() > 0;
544+
boolean increase = !select.getGroupByExpressions().isEmpty();
545545
if (increase) {
546546
select.clearGroupByExpressions();
547547
} else {
@@ -551,7 +551,7 @@ boolean mutateGroupBy(CockroachDBSelect select) {
551551
}
552552

553553
boolean mutateHaving(CockroachDBSelect select) {
554-
if (select.getGroupByExpressions().size() == 0) {
554+
if (select.getGroupByExpressions().isEmpty()) {
555555
select.setGroupByExpressions(select.getFetchColumns());
556556
select.setHavingClause(generateExpression(CockroachDBDataType.BOOL.get()));
557557
return false;

‎src/sqlancer/cockroachdb/gen/CockroachDBInsertGenerator.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ public static SQLQueryAdapter insert(CockroachDBGlobalState globalState, Cockroa
8181
if (Randomly.getBoolean()) {
8282
sb.append(" NOTHING ");
8383
} else {
84-
// TODO: also support excluded. (see
85-
// https://www.cockroachlabs.com/docs/stable/insert.html)
8684
sb.append(" UPDATE SET ");
8785
List<CockroachDBColumn> columns = table.getRandomNonEmptyColumnSubset();
8886
int i = 0;
@@ -92,7 +90,12 @@ public static SQLQueryAdapter insert(CockroachDBGlobalState globalState, Cockroa
9290
}
9391
sb.append(c.getName());
9492
sb.append(" = ");
95-
sb.append(CockroachDBVisitor.asString(gen.generateConstant(c.getType())));
93+
if (Randomly.getBoolean()) {
94+
sb.append(CockroachDBVisitor.asString(gen.generateConstant(c.getType())));
95+
} else {
96+
sb.append("excluded.");
97+
sb.append(c.getName());
98+
}
9699
}
97100
errors.add("UPSERT or INSERT...ON CONFLICT command cannot affect row a second time");
98101
}

‎src/sqlancer/cockroachdb/oracle/CockroachDBCERTOracle.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ protected boolean mutateWhere() {
177177

178178
@Override
179179
protected boolean mutateGroupBy() {
180-
boolean increase = select.getGroupByExpressions().size() > 0;
180+
boolean increase = !select.getGroupByExpressions().isEmpty();
181181
if (increase) {
182182
select.clearGroupByExpressions();
183183
} else {
@@ -188,7 +188,7 @@ protected boolean mutateGroupBy() {
188188

189189
@Override
190190
protected boolean mutateHaving() {
191-
if (select.getGroupByExpressions().size() == 0) {
191+
if (select.getGroupByExpressions().isEmpty()) {
192192
select.setGroupByExpressions(select.getFetchColumns());
193193
select.setHavingClause(gen.generateExpression(CockroachDBDataType.BOOL.get()));
194194
return false;

‎src/sqlancer/cockroachdb/oracle/tlp/CockroachDBTLPBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void check() throws SQLException {
5656

5757
List<CockroachDBExpression> generateFetchColumns() {
5858
List<CockroachDBExpression> columns = new ArrayList<>();
59-
if (Randomly.getBoolean() || targetTables.getColumns().size() == 0) {
59+
if (Randomly.getBoolean() || targetTables.getColumns().isEmpty()) {
6060
columns.add(new CockroachDBColumnReference(new CockroachDBColumn("*", null, false, false)));
6161
} else {
6262
columns.addAll(Randomly.nonEmptySubset(targetTables.getColumns()).stream()

0 commit comments

Comments
 (0)