Skip to content

Commit e8bc446

Browse files
feat: improve the Expression Visitor Adapter
Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
1 parent 8a662af commit e8bc446

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ public void setSelectVisitor(SelectVisitor<T> selectVisitor) {
8585

8686
@Override
8787
public <S> T visit(NullValue nullValue, S context) {
88-
89-
return null;
88+
return visitExpression(nullValue, context);
9089
}
9190

9291
@Override
@@ -113,42 +112,42 @@ public <S> T visit(SignedExpression signedExpression, S context) {
113112

114113
@Override
115114
public <S> T visit(JdbcParameter jdbcParameter, S context) {
116-
return null;
115+
return visitExpression(jdbcParameter, context);
117116
}
118117

119118
@Override
120119
public <S> T visit(JdbcNamedParameter jdbcNamedParameter, S context) {
121-
return null;
120+
return visitExpression(jdbcNamedParameter, context);
122121
}
123122

124123
@Override
125124
public <S> T visit(DoubleValue doubleValue, S context) {
126-
return null;
125+
return visitExpression(doubleValue, context);
127126
}
128127

129128
@Override
130129
public <S> T visit(LongValue longValue, S context) {
131-
return null;
130+
return visitExpression(longValue, context);
132131
}
133132

134133
@Override
135134
public <S> T visit(DateValue dateValue, S context) {
136-
return null;
135+
return visitExpression(dateValue, context);
137136
}
138137

139138
@Override
140139
public <S> T visit(TimeValue timeValue, S context) {
141-
return null;
140+
return visitExpression(timeValue, context);
142141
}
143142

144143
@Override
145144
public <S> T visit(TimestampValue timestampValue, S context) {
146-
return null;
145+
return visitExpression(timestampValue, context);
147146
}
148147

149148
@Override
150149
public <S> T visit(StringValue stringValue, S context) {
151-
return null;
150+
return visitExpression(stringValue, context);
152151
}
153152

154153
@Override
@@ -290,7 +289,7 @@ public <S> T visit(ContainedBy containedBy, S context) {
290289

291290
@Override
292291
public <S> T visit(Column column, S context) {
293-
return null;
292+
return visitExpression(column, context);
294293
}
295294

296295
@Override
@@ -334,7 +333,7 @@ public <S> T visit(MemberOfExpression memberOfExpression, S context) {
334333

335334
@Override
336335
public <S> T visit(AnyComparisonExpression anyComparisonExpression, S context) {
337-
return null;
336+
return visitExpression(anyComparisonExpression, context);
338337
}
339338

340339
@Override
@@ -460,6 +459,10 @@ public <S> T visit(BitwiseLeftShift bitwiseLeftShift, S context) {
460459
return visitBinaryExpression(bitwiseLeftShift, context);
461460
}
462461

462+
protected <S> T visitExpression(Expression expression, S context) {
463+
return null;
464+
}
465+
463466
protected <S> T visitExpressions(Expression expression, S context,
464467
ExpressionList<? extends Expression> subExpressions) {
465468
return visitExpressions(expression, context, (Collection<Expression>) subExpressions);
@@ -497,12 +500,12 @@ public <S> T visit(JsonOperator jsonOperator, S context) {
497500

498501
@Override
499502
public <S> T visit(UserVariable userVariable, S context) {
500-
return null;
503+
return visitExpression(userVariable, context);
501504
}
502505

503506
@Override
504507
public <S> T visit(NumericBind numericBind, S context) {
505-
return null;
508+
return visitExpression(numericBind, context);
506509
}
507510

508511
@Override
@@ -562,23 +565,22 @@ public <S> T visit(PivotXml pivotXml, S context) {
562565

563566
@Override
564567
public <S> T visit(UnPivot unpivot, S context) {
565-
unpivot.accept(this, context);
566-
return null;
568+
return unpivot.accept(this, context);
567569
}
568570

569571
@Override
570572
public <S> T visit(AllColumns allColumns, S context) {
571-
return null;
573+
return visitExpression(allColumns, context);
572574
}
573575

574576
@Override
575577
public <S> T visit(AllTableColumns allTableColumns, S context) {
576-
return null;
578+
return visitExpression(allTableColumns, context);
577579
}
578580

579581
@Override
580582
public <S> T visit(AllValue allValue, S context) {
581-
return null;
583+
return visitExpression(allValue, context);
582584
}
583585

584586
@Override
@@ -598,27 +600,27 @@ public <S> T visit(RowGetExpression rowGetExpression, S context) {
598600

599601
@Override
600602
public <S> T visit(HexValue hexValue, S context) {
601-
return null;
603+
return visitExpression(hexValue, context);
602604
}
603605

604606
@Override
605607
public <S> T visit(OracleHint hint, S context) {
606-
return null;
608+
return visitExpression(hint, context);
607609
}
608610

609611
@Override
610612
public <S> T visit(TimeKeyExpression timeKeyExpression, S context) {
611-
return null;
613+
return visitExpression(timeKeyExpression, context);
612614
}
613615

614616
@Override
615617
public <S> T visit(DateTimeLiteralExpression dateTimeLiteralExpression, S context) {
616-
return null;
618+
return visitExpression(dateTimeLiteralExpression, context);
617619
}
618620

619621
@Override
620622
public <S> T visit(NextValExpression nextValExpression, S context) {
621-
return null;
623+
return visitExpression(nextValExpression, context);
622624
}
623625

624626
@Override

src/main/java/net/sf/jsqlparser/schema/Table.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void setDatabase(Database database) {
111111
}
112112

113113
public Table setDatabaseName(String databaseName) {
114-
this.setDatabase( new Database(databaseName) );
114+
this.setDatabase(new Database(databaseName));
115115
return this;
116116
}
117117

0 commit comments

Comments
 (0)