Skip to content

Commit d2a802e

Browse files
denglimingdengliming
committed
fix
1 parent 9287a08 commit d2a802e

8 files changed

Lines changed: 46 additions & 41 deletions

File tree

‎src/main/java/net/sf/jsqlparser/statement/insert/Insert.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
*/
1010
package net.sf.jsqlparser.statement.insert;
1111

12+
import java.util.Arrays;
13+
import java.util.Collection;
14+
import java.util.Iterator;
15+
import java.util.List;
16+
import java.util.Optional;
1217
import net.sf.jsqlparser.expression.Alias;
1318
import net.sf.jsqlparser.expression.OracleHint;
1419
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
@@ -26,12 +31,6 @@
2631
import net.sf.jsqlparser.statement.select.WithItem;
2732
import net.sf.jsqlparser.statement.update.UpdateSet;
2833

29-
import java.util.Arrays;
30-
import java.util.Collection;
31-
import java.util.Iterator;
32-
import java.util.List;
33-
import java.util.Optional;
34-
3534
@SuppressWarnings({"PMD.CyclomaticComplexity"})
3635
public class Insert implements Statement {
3736

@@ -100,7 +99,8 @@ public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
10099
}
101100

102101
public Table getTable() {
103-
if (table == null && oracleMultiInsertBranches != null && !oracleMultiInsertBranches.isEmpty()
102+
if (table == null && oracleMultiInsertBranches != null
103+
&& !oracleMultiInsertBranches.isEmpty()
104104
&& oracleMultiInsertBranches.get(0).getClauses() != null
105105
&& !oracleMultiInsertBranches.get(0).getClauses().isEmpty()) {
106106
return oracleMultiInsertBranches.get(0).getClauses().get(0).getTable();
@@ -298,7 +298,8 @@ public List<OracleMultiInsertBranch> getOracleMultiInsertBranches() {
298298
return oracleMultiInsertBranches;
299299
}
300300

301-
public void setOracleMultiInsertBranches(List<OracleMultiInsertBranch> oracleMultiInsertBranches) {
301+
public void setOracleMultiInsertBranches(
302+
List<OracleMultiInsertBranch> oracleMultiInsertBranches) {
302303
this.oracleMultiInsertBranches = oracleMultiInsertBranches;
303304
}
304305

‎src/main/java/net/sf/jsqlparser/statement/insert/OracleMultiInsertBranch.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
*/
1010
package net.sf.jsqlparser.statement.insert;
1111

12-
import net.sf.jsqlparser.expression.Expression;
13-
1412
import java.io.Serializable;
1513
import java.util.ArrayList;
1614
import java.util.List;
15+
import net.sf.jsqlparser.expression.Expression;
1716

1817
public class OracleMultiInsertBranch implements Serializable {
1918

‎src/main/java/net/sf/jsqlparser/statement/insert/OracleMultiInsertClause.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
*/
1010
package net.sf.jsqlparser.statement.insert;
1111

12+
import java.io.Serializable;
13+
import java.util.Iterator;
1214
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
1315
import net.sf.jsqlparser.schema.Column;
1416
import net.sf.jsqlparser.schema.Table;
1517
import net.sf.jsqlparser.statement.select.Select;
1618

17-
import java.io.Serializable;
18-
import java.util.Iterator;
19-
2019
public class OracleMultiInsertClause implements Serializable {
2120

2221
private Table table;

‎src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
*/
1010
package net.sf.jsqlparser.util;
1111

12+
import java.util.ArrayList;
13+
import java.util.HashSet;
14+
import java.util.List;
15+
import java.util.Map;
16+
import java.util.Set;
1217
import net.sf.jsqlparser.JSQLParserException;
1318
import net.sf.jsqlparser.expression.*;
1419
import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
@@ -140,12 +145,6 @@
140145
import net.sf.jsqlparser.statement.update.UpdateSet;
141146
import net.sf.jsqlparser.statement.upsert.Upsert;
142147

143-
import java.util.ArrayList;
144-
import java.util.HashSet;
145-
import java.util.List;
146-
import java.util.Map;
147-
import java.util.Set;
148-
149148

150149
/**
151150
* Find all used tables within an select statement.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
package net.sf.jsqlparser.util.deparser;
1111

12+
import java.util.Iterator;
1213
import net.sf.jsqlparser.expression.ExpressionVisitor;
1314
import net.sf.jsqlparser.schema.Column;
1415
import net.sf.jsqlparser.schema.Partition;
@@ -20,8 +21,6 @@
2021
import net.sf.jsqlparser.statement.select.SelectVisitor;
2122
import net.sf.jsqlparser.statement.select.WithItem;
2223

23-
import java.util.Iterator;
24-
2524
public class InsertDeParser extends AbstractDeParser<Insert> {
2625

2726
private ExpressionVisitor<StringBuilder> expressionVisitor;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ public void validate(Insert insert) {
5757
validateOptionalExpressions(clause.getColumns());
5858
if (clause.getSelect() instanceof Values) {
5959
clause.getSelect().accept(getValidator(StatementValidator.class), null);
60-
validateOptionalExpressions(clause.getSelect().as(Values.class).getExpressions());
60+
validateOptionalExpressions(
61+
clause.getSelect().as(Values.class).getExpressions());
6162
}
6263
}
6364
}

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,14 @@ public void testOracleInsertMultiRowValue() throws JSQLParserException {
251251
assertEquals(1, insert.getOracleMultiInsertBranches().size());
252252
assertEquals(3, insert.getOracleMultiInsertBranches().get(0).getClauses().size());
253253
assertEquals("suppliers",
254-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getTable().toString());
254+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getTable()
255+
.toString());
255256
assertEquals("supplier_id, supplier_name",
256-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getColumns().toString());
257+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getColumns()
258+
.toString());
257259
assertEquals("VALUES (1000, 'IBM')",
258-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getSelect().toString());
260+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getSelect()
261+
.toString());
259262
assertEquals("SELECT * FROM dual", insert.getSelect().toString());
260263
}
261264

@@ -270,9 +273,11 @@ public void testOracleInsertAllWithJdbcParameters() throws JSQLParserException {
270273
assertFalse(insert.getOracleMultiInsertBranches().get(0).isElseClause());
271274
assertEquals(1, insert.getOracleMultiInsertBranches().get(0).getClauses().size());
272275
assertEquals("spm_message",
273-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getTable().toString());
276+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getTable()
277+
.toString());
274278
assertEquals("VALUES (?, ?)",
275-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getSelect().toString());
279+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getSelect()
280+
.toString());
276281
}
277282

278283
@Test
@@ -314,11 +319,14 @@ public void testOracleInsertFirstWithWhenMultipleInto() throws JSQLParserExcepti
314319
insert.getOracleMultiInsertBranches().get(0).getWhenExpression().toString());
315320
assertTrue(insert.getOracleMultiInsertBranches().get(1).isElseClause());
316321
assertEquals("apac_orders",
317-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getTable().toString());
322+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(0).getTable()
323+
.toString());
318324
assertEquals("apac_audit",
319-
insert.getOracleMultiInsertBranches().get(0).getClauses().get(1).getTable().toString());
325+
insert.getOracleMultiInsertBranches().get(0).getClauses().get(1).getTable()
326+
.toString());
320327
assertEquals("other_orders",
321-
insert.getOracleMultiInsertBranches().get(1).getClauses().get(0).getTable().toString());
328+
insert.getOracleMultiInsertBranches().get(1).getClauses().get(0).getTable()
329+
.toString());
322330
}
323331

324332
@Test

‎src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99
*/
1010
package net.sf.jsqlparser.util;
1111

12+
import static org.assertj.core.api.Assertions.assertThat;
13+
import static org.assertj.core.api.Assertions.assertThatCode;
14+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
16+
import static org.junit.jupiter.api.Assertions.assertNull;
17+
import static org.junit.jupiter.api.Assertions.assertTrue;
18+
19+
import java.util.Arrays;
20+
import java.util.List;
21+
import java.util.Set;
1222
import net.sf.jsqlparser.JSQLParserException;
1323
import net.sf.jsqlparser.expression.OracleHint;
1424
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -21,17 +31,6 @@
2131
import net.sf.jsqlparser.test.TestUtils;
2232
import org.junit.jupiter.api.Test;
2333

24-
import java.util.Arrays;
25-
import java.util.List;
26-
import java.util.Set;
27-
28-
import static org.assertj.core.api.Assertions.assertThat;
29-
import static org.assertj.core.api.Assertions.assertThatCode;
30-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
31-
import static org.junit.jupiter.api.Assertions.assertEquals;
32-
import static org.junit.jupiter.api.Assertions.assertNull;
33-
import static org.junit.jupiter.api.Assertions.assertTrue;
34-
3534
public class TablesNamesFinderTest {
3635

3736
@Test

0 commit comments

Comments
 (0)