Skip to content

Commit 3f60913

Browse files
nicky6snicky6s
committed
formatting fixes via spotlessApply
1 parent 1de2a39 commit 3f60913

File tree

8 files changed

+134
-62
lines changed

8 files changed

+134
-62
lines changed

‎src/main/java/net/sf/jsqlparser/util/deparser/DeleteDeParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public DeleteDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
4040
public void deParse(Delete delete) {
4141
if (delete.getWithItemsList() != null && !delete.getWithItemsList().isEmpty()) {
4242
buffer.append("WITH ");
43-
for (Iterator<WithItem<?>> iter = delete.getWithItemsList().iterator(); iter.hasNext();) {
43+
for (Iterator<WithItem<?>> iter = delete.getWithItemsList().iterator(); iter
44+
.hasNext();) {
4445
WithItem<?> withItem = iter.next();
4546
buffer.append(withItem);
4647
if (iter.hasNext()) {

‎src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public InsertDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
4141
public void deParse(Insert insert) {
4242
if (insert.getWithItemsList() != null && !insert.getWithItemsList().isEmpty()) {
4343
buffer.append("WITH ");
44-
for (Iterator<WithItem<?>> iter = insert.getWithItemsList().iterator(); iter.hasNext();) {
44+
for (Iterator<WithItem<?>> iter = insert.getWithItemsList().iterator(); iter
45+
.hasNext();) {
4546
WithItem<?> withItem = iter.next();
4647
withItem.accept(this.selectVisitor, null);
4748
if (iter.hasNext()) {

‎src/main/java/net/sf/jsqlparser/util/deparser/UpdateDeParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public UpdateDeParser(ExpressionVisitor<StringBuilder> expressionVisitor,
4040
public void deParse(Update update) {
4141
if (update.getWithItemsList() != null && !update.getWithItemsList().isEmpty()) {
4242
buffer.append("WITH ");
43-
for (Iterator<WithItem<?>> iter = update.getWithItemsList().iterator(); iter.hasNext();) {
43+
for (Iterator<WithItem<?>> iter = update.getWithItemsList().iterator(); iter
44+
.hasNext();) {
4445
WithItem<?> withItem = iter.next();
4546
buffer.append(withItem);
4647
if (iter.hasNext()) {

‎src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,4 +417,4 @@ public void visit(Values values) {
417417
visit(values, null);
418418
}
419419

420-
}
420+
}

‎src/test/java/net/sf/jsqlparser/statement/delete/DeleteTest.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,13 @@ public void testWith() throws JSQLParserException {
130130
List<WithItem<?>> withItems = delete.getWithItemsList();
131131
assertEquals("cfe.instrument_ref", delete.getTable().getFullyQualifiedName());
132132
assertEquals(2, withItems.size());
133-
SelectItem selectItem1 = withItems.get(0).getSelect().getPlainSelect().getSelectItems().get(0);
133+
SelectItem selectItem1 =
134+
withItems.get(0).getSelect().getPlainSelect().getSelectItems().get(0);
134135
assertEquals("1", selectItem1.getExpression().toString());
135136
assertEquals(" id_instrument_ref", selectItem1.getAlias().toString());
136137
assertEquals(" a", withItems.get(0).getAlias().toString());
137-
SelectItem selectItem2 = withItems.get(1).getSelect().getPlainSelect().getSelectItems().get(0);
138+
SelectItem selectItem2 =
139+
withItems.get(1).getSelect().getPlainSelect().getSelectItems().get(0);
138140
assertEquals("1", selectItem2.getExpression().toString());
139141
assertEquals(" id_instrument_ref", selectItem2.getAlias().toString());
140142
assertEquals(" b", withItems.get(1).getAlias().toString());
@@ -326,9 +328,12 @@ void testDeleteAndInsertWithin2Ctes() throws JSQLParserException {
326328
assertEquals(" deleted", withItems.get(0).getAlias().toString());
327329
Insert insert = withItems.get(1).getInsert().getInsert();
328330
assertEquals("x", insert.getTable().toString());
329-
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM deleted)", insert.getSelect().toString());
331+
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM deleted)",
332+
insert.getSelect().toString());
330333
assertEquals(" RETURNING w", insert.getReturningClause().toString());
331-
assertEquals("INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM deleted) RETURNING w", insert.toString());
334+
assertEquals(
335+
"INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM deleted) RETURNING w",
336+
insert.toString());
332337
assertEquals(" inserted", withItems.get(1).getAlias().toString());
333338
}
334339

@@ -357,9 +362,12 @@ void testSelectAndInsertWithin2Ctes() throws JSQLParserException {
357362
assertEquals(" selection", withItems.get(0).getAlias().toString());
358363
Insert insert = withItems.get(1).getInsert().getInsert();
359364
assertEquals("x", insert.getTable().toString());
360-
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM selection)", insert.getSelect().toString());
365+
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM selection)",
366+
insert.getSelect().toString());
361367
assertEquals(" RETURNING w", insert.getReturningClause().toString());
362-
assertEquals("INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM selection) RETURNING w", insert.toString());
368+
assertEquals(
369+
"INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM selection) RETURNING w",
370+
insert.toString());
363371
assertEquals(" inserted", withItems.get(1).getAlias().toString());
364372
}
365373

‎src/test/java/net/sf/jsqlparser/statement/insert/InsertTest.java

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -279,25 +279,29 @@ public void testInsertSelect() throws JSQLParserException {
279279

280280
@Test
281281
public void testInsertWithSelect() throws JSQLParserException {
282-
String sqlStr1 = "INSERT INTO mytable (mycolumn) WITH a AS (SELECT mycolumn FROM mytable) SELECT mycolumn FROM a";
282+
String sqlStr1 =
283+
"INSERT INTO mytable (mycolumn) WITH a AS (SELECT mycolumn FROM mytable) SELECT mycolumn FROM a";
283284
Insert insert1 = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr1, true);
284285
List<WithItem<?>> insertWithItems1 = insert1.getWithItemsList();
285286
List<WithItem<?>> selectWithItems1 = insert1.getSelect().getWithItemsList();
286287
assertEquals("mytable", insert1.getTable().getFullyQualifiedName());
287288
assertNull(insertWithItems1);
288289
assertEquals(1, selectWithItems1.size());
289-
assertEquals("SELECT mycolumn FROM mytable", selectWithItems1.get(0).getSelect().getPlainSelect().toString());
290+
assertEquals("SELECT mycolumn FROM mytable",
291+
selectWithItems1.get(0).getSelect().getPlainSelect().toString());
290292
assertEquals(" a", selectWithItems1.get(0).getAlias().toString());
291293

292-
String sqlStr2 = "INSERT INTO mytable (mycolumn) (WITH a AS (SELECT mycolumn FROM mytable) SELECT mycolumn FROM a)";
294+
String sqlStr2 =
295+
"INSERT INTO mytable (mycolumn) (WITH a AS (SELECT mycolumn FROM mytable) SELECT mycolumn FROM a)";
293296
Insert insert2 = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr2, true);
294297
List<WithItem<?>> insertWithItems2 = insert2.getWithItemsList();
295298
assertEquals("mytable", insert2.getTable().getFullyQualifiedName());
296299
assertNull(insertWithItems2);
297300
ParenthesedSelect select = (ParenthesedSelect) insert2.getSelect();
298301
List<WithItem<?>> selectWithItems2 = select.getSelect().getWithItemsList();
299302
assertEquals(1, selectWithItems2.size());
300-
assertEquals("SELECT mycolumn FROM mytable", selectWithItems2.get(0).getSelect().getPlainSelect().toString());
303+
assertEquals("SELECT mycolumn FROM mytable",
304+
selectWithItems2.get(0).getSelect().getPlainSelect().toString());
301305
assertEquals(" a", selectWithItems2.get(0).getAlias().toString());
302306
}
303307

@@ -364,15 +368,17 @@ public void testKeywordPrecisionIssue363() throws JSQLParserException {
364368

365369
@Test
366370
public void testWithDeparsingIssue406() throws JSQLParserException {
367-
String sqlStr = "insert into mytab3 (a,b,c) select a,b,c from mytab where exists(with t as (select * from mytab2) select * from t)";
371+
String sqlStr =
372+
"insert into mytab3 (a,b,c) select a,b,c from mytab where exists(with t as (select * from mytab2) select * from t)";
368373
Insert insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr, true);
369374
List<WithItem<?>> insertWithItems = insert.getWithItemsList();
370375
List<WithItem<?>> selectWithItems = insert.getSelect().getWithItemsList();
371376
assertEquals("mytab3", insert.getTable().getFullyQualifiedName());
372377
assertNull(insertWithItems);
373378
assertNull(selectWithItems);
374379
ExistsExpression exists = (ExistsExpression) insert.getPlainSelect().getWhere();
375-
assertEquals("(WITH t AS (SELECT * FROM mytab2) SELECT * FROM t)", exists.getRightExpression().toString());
380+
assertEquals("(WITH t AS (SELECT * FROM mytab2) SELECT * FROM t)",
381+
exists.getRightExpression().toString());
376382
}
377383

378384
@Test
@@ -412,12 +418,14 @@ public void testInsertKeyWordIntervalIssue682() throws JSQLParserException {
412418

413419
@Test
414420
public void testWithAtFront() throws JSQLParserException {
415-
String sqlStr = "WITH foo AS ( SELECT attr FROM bar ) INSERT INTO lalelu (attr) SELECT attr FROM foo";
421+
String sqlStr =
422+
"WITH foo AS ( SELECT attr FROM bar ) INSERT INTO lalelu (attr) SELECT attr FROM foo";
416423
Insert insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr, true);
417424
List<WithItem<?>> insertWithItems = insert.getWithItemsList();
418425
assertEquals("lalelu", insert.getTable().getFullyQualifiedName());
419426
assertEquals(1, insertWithItems.size());
420-
assertEquals("SELECT attr FROM bar", insertWithItems.get(0).getSelect().getPlainSelect().toString());
427+
assertEquals("SELECT attr FROM bar",
428+
insertWithItems.get(0).getSelect().getPlainSelect().toString());
421429
assertEquals(" foo", insertWithItems.get(0).getAlias().toString());
422430
assertEquals("SELECT attr FROM foo", insert.getSelect().toString());
423431
assertEquals("foo", insert.getSelect().getPlainSelect().getFromItem().toString());
@@ -456,12 +464,14 @@ public void testDisableKeywordIssue945() throws JSQLParserException {
456464

457465
@Test
458466
public void testWithListIssue282() throws JSQLParserException {
459-
String sqlStr = "WITH myctl AS (SELECT a, b FROM mytable) INSERT INTO mytable SELECT a, b FROM myctl";
467+
String sqlStr =
468+
"WITH myctl AS (SELECT a, b FROM mytable) INSERT INTO mytable SELECT a, b FROM myctl";
460469
Insert insert = (Insert) assertSqlCanBeParsedAndDeparsed(sqlStr, true);
461470
List<WithItem<?>> insertWithItems = insert.getWithItemsList();
462471
assertEquals("mytable", insert.getTable().getFullyQualifiedName());
463472
assertEquals(1, insertWithItems.size());
464-
assertEquals("SELECT a, b FROM mytable", insertWithItems.get(0).getSelect().getPlainSelect().toString());
473+
assertEquals("SELECT a, b FROM mytable",
474+
insertWithItems.get(0).getSelect().getPlainSelect().toString());
465475
assertEquals(" myctl", insertWithItems.get(0).getAlias().toString());
466476
assertEquals("SELECT a, b FROM myctl", insert.getSelect().toString());
467477
assertEquals("myctl", insert.getSelect().getPlainSelect().getFromItem().toString());
@@ -510,10 +520,12 @@ public void testInsertUnionSelectIssue1491() throws JSQLParserException {
510520
@Test
511521
public void testWithSelectFromDual() throws JSQLParserException {
512522
String sqlStr = "(with a as (select * from dual) select * from a)";
513-
ParenthesedSelect parenthesedSelect = (ParenthesedSelect) assertSqlCanBeParsedAndDeparsed(sqlStr, true);
523+
ParenthesedSelect parenthesedSelect =
524+
(ParenthesedSelect) assertSqlCanBeParsedAndDeparsed(sqlStr, true);
514525
List<WithItem<?>> withItems = parenthesedSelect.getSelect().getWithItemsList();
515526
assertEquals(1, withItems.size());
516-
assertEquals("SELECT * FROM dual", withItems.get(0).getSelect().getPlainSelect().toString());
527+
assertEquals("SELECT * FROM dual",
528+
withItems.get(0).getSelect().getPlainSelect().toString());
517529
assertEquals(" a", withItems.get(0).getAlias().toString());
518530
assertEquals("a", parenthesedSelect.getPlainSelect().getFromItem().toString());
519531
assertEquals("[*]", parenthesedSelect.getPlainSelect().getSelectItems().toString());
@@ -578,7 +590,8 @@ public void insertOnConflictObjectsTest() throws JSQLParserException {
578590
List<WithItem<?>> withItems = insert.getWithItemsList();
579591
assertEquals("test", insert.getTable().getFullyQualifiedName());
580592
assertEquals(1, withItems.size());
581-
assertEquals("[1, 2, 3]", withItems.get(0).getSelect().getPlainSelect().getSelectItems().toString());
593+
assertEquals("[1, 2, 3]",
594+
withItems.get(0).getSelect().getPlainSelect().getSelectItems().toString());
582595
assertEquals(" a", withItems.get(0).getAlias().toString());
583596

584597
Expression whereExpression = CCJSqlParserUtil.parseExpression("a=1", false);
@@ -647,7 +660,7 @@ void testMultiColumnConflictTargetIssue955() throws JSQLParserException {
647660
@Test
648661
public void testDefaultValues() throws JSQLParserException {
649662
String statement = "INSERT INTO mytable DEFAULT VALUES";
650-
//assertSqlCanBeParsedAndDeparsed(statement);
663+
// assertSqlCanBeParsedAndDeparsed(statement);
651664
Insert insert = (Insert) parserManager.parse(new StringReader(statement));
652665
assertEquals("mytable", insert.getTable().getFullyQualifiedName());
653666
assertEquals("INSERT INTO MYTABLE DEFAULT VALUES", insert.toString().toUpperCase());
@@ -782,9 +795,12 @@ void testDeleteAndInsertWithin2Ctes() throws JSQLParserException {
782795
assertEquals(" deleted", withItems.get(0).getAlias().toString());
783796
Insert innerInsert = withItems.get(1).getInsert().getInsert();
784797
assertEquals("x", innerInsert.getTable().toString());
785-
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM deleted)", innerInsert.getSelect().toString());
798+
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM deleted)",
799+
innerInsert.getSelect().toString());
786800
assertEquals(" RETURNING w", innerInsert.getReturningClause().toString());
787-
assertEquals("INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM deleted) RETURNING w", innerInsert.toString());
801+
assertEquals(
802+
"INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM deleted) RETURNING w",
803+
innerInsert.toString());
788804
assertEquals(" inserted", withItems.get(1).getAlias().toString());
789805
}
790806

@@ -812,9 +828,12 @@ void testSelectAndInsertWithin2Ctes() throws JSQLParserException {
812828
assertEquals(" selection", withItems.get(0).getAlias().toString());
813829
Insert innerInsert = withItems.get(1).getInsert().getInsert();
814830
assertEquals("x", innerInsert.getTable().toString());
815-
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM selection)", innerInsert.getSelect().toString());
831+
assertEquals("SELECT bar FROM b WHERE y IN (SELECT y FROM selection)",
832+
innerInsert.getSelect().toString());
816833
assertEquals(" RETURNING w", innerInsert.getReturningClause().toString());
817-
assertEquals("INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM selection) RETURNING w", innerInsert.toString());
834+
assertEquals(
835+
"INSERT INTO x (foo) SELECT bar FROM b WHERE y IN (SELECT y FROM selection) RETURNING w",
836+
innerInsert.toString());
818837
assertEquals(" inserted", withItems.get(1).getAlias().toString());
819838
}
820839

0 commit comments

Comments
 (0)