Skip to content

Commit 3447ff5

Browse files
committed
refactor: 升级版本到1.1.0并同步CI配置
1 parent 40c8f56 commit 3447ff5

6 files changed

Lines changed: 57 additions & 16 deletions

File tree

.github/workflows/codecov.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v1
14-
- name: Set up JDK 1.8
15-
uses: actions/setup-java@v1
13+
- uses: actions/checkout@v4
14+
- name: Set up JDK 11
15+
uses: actions/setup-java@v4
1616
with:
17-
java-version: 1.8
17+
distribution: temurin
18+
java-version: 11
19+
cache: maven
1820
- name: Cache Maven Repository
1921
uses: actions/cache@v3
2022
with:
@@ -23,7 +25,7 @@ jobs:
2325
- name: Build with Maven
2426
run: ./mvnw test
2527
- name: Codecov
26-
uses: codecov/codecov-action@v2.1.0
28+
uses: codecov/codecov-action@v4
2729
with:
2830
# Repository upload token - get it from codecov.io. Required only for private repositories
29-
token: ${{ secrets.CODECOV_TOKEN }}
31+
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/maven-publish.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ jobs:
1212
# os: [ubuntu-latest, windows-latest, macOS-latest]
1313
os: [ ubuntu-latest ]
1414
steps:
15-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v4
1616
- run: echo ${{github.ref}}
1717
- name: Set up Repository info
18-
uses: actions/setup-java@v2
18+
uses: actions/setup-java@v4
1919
with:
20-
java-version: '8'
21-
distribution: 'adopt'
20+
java-version: '11'
21+
distribution: temurin
22+
cache: maven
2223
- name: Cache Maven Repository
2324
uses: actions/cache@v3
2425
with:

.github/workflows/pull_request.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ jobs:
77
build:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v1
11-
- name: Set up JDK 1.8
12-
uses: actions/setup-java@v1
10+
- uses: actions/checkout@v4
11+
- name: Set up JDK 11
12+
uses: actions/setup-java@v4
1313
with:
14-
java-version: 1.8
14+
distribution: temurin
15+
java-version: 11
16+
cache: maven
1517
- name: Cache Maven Repository
1618
uses: actions/cache@v3
1719
with:
@@ -23,4 +25,4 @@ jobs:
2325
uses: codecov/codecov-action@v2.1.0
2426
with:
2527
# Repository upload token - get it from codecov.io. Required only for private repositories
26-
token: ${{ secrets.CODECOV_TOKEN }}
28+
token: ${{ secrets.CODECOV_TOKEN }}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>org.jetlinks</groupId>
2525
<artifactId>reactor-ql</artifactId>
26-
<version>1.0.21-SNAPSHOT</version>
26+
<version>1.1.0</version>
2727

2828
<name>JetLinks</name>
2929
<url>https://github.com/jetlinks/reactor-ql</url>

src/main/java/org/jetlinks/reactor/ql/supports/ExpressionVisitorAdapter.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,71 @@
3030
public abstract class ExpressionVisitorAdapter extends net.sf.jsqlparser.expression.ExpressionVisitorAdapter<Void> {
3131

3232
public void visit(BinaryExpression expression) {
33+
ignore(expression);
3334
}
3435

3536
public void visit(ComparisonOperator expression) {
37+
ignore(expression);
3638
}
3739

3840
public void visit(NullValue nullValue) {
41+
ignore(nullValue);
3942
}
4043

4144
public void visit(Function function) {
45+
ignore(function);
4246
}
4347

4448
public void visit(SignedExpression signedExpression) {
49+
ignore(signedExpression);
4550
}
4651

4752
public void visit(JdbcParameter jdbcParameter) {
53+
ignore(jdbcParameter);
4854
}
4955

5056
public void visit(JdbcNamedParameter jdbcNamedParameter) {
57+
ignore(jdbcNamedParameter);
5158
}
5259

5360
public void visit(NumericBind numericBind) {
61+
ignore(numericBind);
5462
}
5563

5664
public void visit(DoubleValue doubleValue) {
65+
ignore(doubleValue);
5766
}
5867

5968
public void visit(BooleanValue booleanValue) {
69+
ignore(booleanValue);
6070
}
6171

6272
public void visit(LongValue longValue) {
73+
ignore(longValue);
6374
}
6475

6576
public void visit(HexValue hexValue) {
77+
ignore(hexValue);
6678
}
6779

6880
public void visit(DateValue dateValue) {
81+
ignore(dateValue);
6982
}
7083

7184
public void visit(TimeValue timeValue) {
85+
ignore(timeValue);
7286
}
7387

7488
public void visit(TimestampValue timestampValue) {
89+
ignore(timestampValue);
7590
}
7691

7792
public void visit(Parenthesis parenthesis) {
93+
ignore(parenthesis);
7894
}
7995

8096
public void visit(StringValue stringValue) {
97+
ignore(stringValue);
8198
}
8299

83100
public void visit(AndExpression andExpression) {
@@ -89,42 +106,59 @@ public void visit(OrExpression orExpression) {
89106
}
90107

91108
public void visit(Between between) {
109+
ignore(between);
92110
}
93111

94112
public void visit(InExpression inExpression) {
113+
ignore(inExpression);
95114
}
96115

97116
public void visit(IsNullExpression isNullExpression) {
117+
ignore(isNullExpression);
98118
}
99119

100120
public void visit(IsBooleanExpression isBooleanExpression) {
121+
ignore(isBooleanExpression);
101122
}
102123

103124
public void visit(Column tableColumn) {
125+
ignore(tableColumn);
104126
}
105127

106128
public void visit(Select subSelect) {
129+
ignore(subSelect);
107130
}
108131

109132
public void visit(CaseExpression caseExpression) {
133+
ignore(caseExpression);
110134
}
111135

112136
public void visit(ExistsExpression existsExpression) {
137+
ignore(existsExpression);
113138
}
114139

115140
public void visit(NotExpression notExpression) {
141+
ignore(notExpression);
116142
}
117143

118144
public void visit(CastExpression castExpression) {
145+
ignore(castExpression);
119146
}
120147

121148
public void visit(ArrayExpression arrayExpression) {
149+
ignore(arrayExpression);
122150
}
123151

124152
public void visit(IntervalExpression intervalExpression) {
153+
ignore(intervalExpression);
125154
}
126155

127156
public void visit(UserVariable var) {
157+
ignore(var);
158+
}
159+
160+
protected void ignore(Object expression) {
161+
// no-op by default, subclasses override only the expression types they need
128162
}
129163

130164
@Override
@@ -447,6 +481,7 @@ public <S> Void visit(SimilarToExpression similarToExpression, S context) {
447481

448482
@Override
449483
public <S> Void visit(FromQuery fromQuery, S context) {
484+
ignore(fromQuery);
450485
return null;
451486
}
452487
}

src/main/java/org/jetlinks/reactor/ql/utils/CastUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ public static Number castNumber(Object value, Function<Object, Number> fallback)
181181
}
182182
return decimal.doubleValue();
183183
} catch (NumberFormatException ignore) {
184+
// ignore parse error and continue with fallback conversion paths
184185
}
185186
}
186187
if (value instanceof Character) {

0 commit comments

Comments
 (0)