forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit55c8807
committed
Fix hstore_to_json_loose's detection of valid JSON number values.
We expose a function IsValidJsonNumber that internally calls the lexerfor json numbers. That allows us to use the same test everywhere,instead of inventing a broken test for hstore conversions. The newfunction is also used in datum_to_json, replacing the code that is nowmoved to the new function.Backpatch to 9.3 where hstore_to_json_loose was introduced.1 parent5c9a4a8 commit55c8807
File tree
3 files changed
+42
-48
lines changed- contrib/hstore
- src
- backend/utils/adt
- include/utils
3 files changed
+42
-48
lines changedLines changed: 2 additions & 41 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| 15 | + | |
15 | 16 |
| |
16 | 17 |
| |
17 | 18 |
| |
| |||
1253 | 1254 |
| |
1254 | 1255 |
| |
1255 | 1256 |
| |
1256 |
| - | |
1257 | 1257 |
| |
1258 | 1258 |
| |
1259 | 1259 |
| |
| |||
1280 | 1280 |
| |
1281 | 1281 |
| |
1282 | 1282 |
| |
1283 |
| - | |
1284 | 1283 |
| |
1285 | 1284 |
| |
1286 |
| - | |
1287 |
| - | |
1288 |
| - | |
1289 |
| - | |
1290 |
| - | |
1291 |
| - | |
1292 |
| - | |
1293 |
| - | |
1294 |
| - | |
1295 |
| - | |
1296 |
| - | |
1297 |
| - | |
1298 |
| - | |
1299 |
| - | |
1300 |
| - | |
1301 |
| - | |
1302 |
| - | |
1303 |
| - | |
1304 |
| - | |
1305 |
| - | |
1306 |
| - | |
1307 |
| - | |
1308 |
| - | |
1309 |
| - | |
1310 |
| - | |
1311 |
| - | |
1312 |
| - | |
1313 |
| - | |
1314 |
| - | |
1315 |
| - | |
1316 |
| - | |
1317 |
| - | |
1318 |
| - | |
1319 |
| - | |
1320 |
| - | |
1321 |
| - | |
1322 |
| - | |
1323 |
| - | |
1324 |
| - | |
| 1285 | + | |
1325 | 1286 |
| |
1326 | 1287 |
| |
1327 | 1288 |
| |
|
Lines changed: 33 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
164 | 164 |
| |
165 | 165 |
| |
166 | 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 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
167 | 197 |
| |
168 | 198 |
| |
169 | 199 |
| |
| |||
1306 | 1336 |
| |
1307 | 1337 |
| |
1308 | 1338 |
| |
1309 |
| - | |
1310 |
| - | |
1311 | 1339 |
| |
1312 | 1340 |
| |
1313 | 1341 |
| |
| |||
1332 | 1360 |
| |
1333 | 1361 |
| |
1334 | 1362 |
| |
1335 |
| - | |
| 1363 | + | |
| 1364 | + | |
1336 | 1365 |
| |
1337 |
| - | |
1338 |
| - | |
1339 |
| - | |
1340 |
| - | |
| 1366 | + | |
1341 | 1367 |
| |
1342 | 1368 |
| |
1343 | 1369 |
| |
|
Lines changed: 7 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
107 | 107 |
| |
108 | 108 |
| |
109 | 109 |
| |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
110 | 117 |
|
0 commit comments
Comments
(0)