Commit e3f531c
authored
Json function Improvements (#1506)
* Adjust Gradle to JUnit 5
Parallel Test execution
Gradle Caching
Explicitly request for latest JavaCC 7.0.10
* Do not mark SpeedTest for concurrent execution
* Remove unused imports
* Adjust Gradle to JUnit 5
Parallel Test execution
Gradle Caching
Explicitly request for latest JavaCC 7.0.10
* Do not mark SpeedTest for concurrent execution
* Remove unused imports
* Improve JSON Functions
Space around the `:` delimiter of JSON Functions
* Improve JSON Functions
Enforce `KEY` as `S_CHAR_LITERAL`
Allow `Column` as `VALUE`
Temporarily disable Postgres Syntax
* Improve JSON Functions
Bring back Postgres Syntax
Enable MySQL Syntax JSON_OBJECT(key, value [, key, value, ...])
Fix some more tests, where key was not a String
* Appease Codacy
* Let JSON_OBJECT accept Expressions as value
* set Version = 4.4-SNAPSHOT1 parent 41c77ca commit e3f531c
File tree
8 files changed
+142
-82
lines changed- src
- main
- java/net/sf/jsqlparser/expression
- jjtree/net/sf/jsqlparser/parser
- test/java/net/sf/jsqlparser
- expression
- test
- util/validation/validator
8 files changed
+142
-82
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
Lines changed: 23 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
60 | 64 | | |
61 | 65 | | |
62 | 66 | | |
| |||
122 | 126 | | |
123 | 127 | | |
124 | 128 | | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
125 | 132 | | |
126 | 133 | | |
127 | 134 | | |
| |||
200 | 207 | | |
201 | 208 | | |
202 | 209 | | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
203 | 226 | | |
204 | 227 | | |
205 | 228 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
Lines changed: 60 additions & 56 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3735 | 3735 | | |
3736 | 3736 | | |
3737 | 3737 | | |
| 3738 | + | |
| 3739 | + | |
3738 | 3740 | | |
3739 | 3741 | | |
3740 | 3742 | | |
| |||
3743 | 3745 | | |
3744 | 3746 | | |
3745 | 3747 | | |
3746 | | - | |
| 3748 | + | |
3747 | 3749 | | |
3748 | 3750 | | |
3749 | 3751 | | |
| |||
3981 | 3983 | | |
3982 | 3984 | | |
3983 | 3985 | | |
| 3986 | + | |
3984 | 3987 | | |
3985 | 3988 | | |
| 3989 | + | |
3986 | 3990 | | |
3987 | 3991 | | |
3988 | | - | |
| 3992 | + | |
3989 | 3993 | | |
3990 | 3994 | | |
3991 | 3995 | | |
| |||
3994 | 3998 | | |
3995 | 3999 | | |
3996 | 4000 | | |
3997 | | - | |
3998 | | - | |
3999 | | - | |
4000 | | - | |
4001 | | - | |
4002 | | - | |
4003 | | - | |
4004 | | - | |
4005 | | - | |
4006 | | - | |
4007 | | - | |
4008 | | - | |
4009 | | - | |
4010 | | - | |
4011 | | - | |
4012 | 4001 | | |
| 4002 | + | |
| 4003 | + | |
| 4004 | + | |
| 4005 | + | |
| 4006 | + | |
| 4007 | + | |
| 4008 | + | |
| 4009 | + | |
| 4010 | + | |
| 4011 | + | |
| 4012 | + | |
| 4013 | + | |
| 4014 | + | |
| 4015 | + | |
| 4016 | + | |
| 4017 | + | |
| 4018 | + | |
| 4019 | + | |
| 4020 | + | |
| 4021 | + | |
| 4022 | + | |
| 4023 | + | |
| 4024 | + | |
| 4025 | + | |
| 4026 | + | |
| 4027 | + | |
| 4028 | + | |
| 4029 | + | |
| 4030 | + | |
| 4031 | + | |
| 4032 | + | |
| 4033 | + | |
| 4034 | + | |
| 4035 | + | |
| 4036 | + | |
| 4037 | + | |
4013 | 4038 | | |
4014 | | - | |
4015 | | - | |
| 4039 | + | |
| 4040 | + | |
| 4041 | + | |
| 4042 | + | |
| 4043 | + | |
| 4044 | + | |
| 4045 | + | |
| 4046 | + | |
| 4047 | + | |
4016 | 4048 | | |
4017 | | - | |
4018 | | - | |
4019 | | - | |
| 4049 | + | |
| 4050 | + | |
| 4051 | + | |
| 4052 | + | |
| 4053 | + | |
| 4054 | + | |
| 4055 | + | |
| 4056 | + | |
| 4057 | + | |
4020 | 4058 | | |
4021 | | - | |
4022 | | - | |
4023 | | - | |
4024 | | - | |
4025 | | - | |
4026 | | - | |
4027 | | - | |
4028 | | - | |
4029 | | - | |
4030 | | - | |
4031 | | - | |
4032 | | - | |
4033 | | - | |
4034 | | - | |
4035 | | - | |
4036 | | - | |
4037 | | - | |
4038 | | - | |
4039 | | - | |
4040 | | - | |
4041 | | - | |
4042 | | - | |
4043 | | - | |
4044 | | - | |
4045 | | - | |
4046 | | - | |
4047 | | - | |
4048 | | - | |
4049 | | - | |
4050 | | - | |
4051 | | - | |
4052 | | - | |
4053 | | - | |
4054 | | - | |
4055 | 4059 | | |
4056 | 4060 | | |
4057 | 4061 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | | - | |
| 219 | + | |
220 | 220 | | |
221 | 221 | | |
222 | 222 | | |
| |||
Lines changed: 52 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | 16 | | |
22 | 17 | | |
23 | 18 | | |
| |||
69 | 64 | | |
70 | 65 | | |
71 | 66 | | |
72 | | - | |
| 67 | + | |
73 | 68 | | |
74 | 69 | | |
75 | | - | |
| 70 | + | |
76 | 71 | | |
77 | 72 | | |
78 | | - | |
79 | | - | |
80 | | - | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
81 | 76 | | |
82 | | - | |
| 77 | + | |
83 | 78 | | |
84 | 79 | | |
85 | 80 | | |
| |||
95 | 90 | | |
96 | 91 | | |
97 | 92 | | |
98 | | - | |
| 93 | + | |
99 | 94 | | |
100 | 95 | | |
101 | 96 | | |
| |||
131 | 126 | | |
132 | 127 | | |
133 | 128 | | |
134 | | - | |
135 | | - | |
| 129 | + | |
| 130 | + | |
136 | 131 | | |
137 | 132 | | |
138 | | - | |
| 133 | + | |
139 | 134 | | |
140 | | - | |
| 135 | + | |
141 | 136 | | |
142 | 137 | | |
143 | | - | |
| 138 | + | |
144 | 139 | | |
145 | 140 | | |
146 | 141 | | |
147 | | - | |
| 142 | + | |
148 | 143 | | |
149 | 144 | | |
150 | 145 | | |
151 | | - | |
| 146 | + | |
152 | 147 | | |
153 | 148 | | |
154 | 149 | | |
| |||
158 | 153 | | |
159 | 154 | | |
160 | 155 | | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
161 | 192 | | |
162 | 193 | | |
163 | 194 | | |
| |||
213 | 244 | | |
214 | 245 | | |
215 | 246 | | |
216 | | - | |
| 247 | + | |
217 | 248 | | |
218 | 249 | | |
219 | 250 | | |
220 | 251 | | |
221 | 252 | | |
222 | 253 | | |
223 | | - | |
| 254 | + | |
224 | 255 | | |
225 | 256 | | |
226 | 257 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
57 | 58 | | |
58 | | - | |
| 59 | + | |
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| |||
265 | 266 | | |
266 | 267 | | |
267 | 268 | | |
268 | | - | |
| 269 | + | |
269 | 270 | | |
270 | 271 | | |
271 | 272 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
226 | 226 | | |
227 | 227 | | |
228 | 228 | | |
229 | | - | |
| 229 | + | |
230 | 230 | | |
231 | 231 | | |
232 | 232 | | |
| |||
0 commit comments