Skip to content

Commit 83472de

Browse files
tglsfdctglsfdc
committed
Improve readability and error detection of array_in().
Rewrite array_in() and its subroutines so that we make only one pass over the input text, rather than two. This requires potentially re-pallocing the working arrays values[] and nulls[] larger than our initial guess, but that cost will hopefully be made up by avoiding duplicate parsing. In any case this coding seems much clearer and more straightforward than what we had before. This also fixes array_in() to reject non-rectangular input (that is, different brace depths in different parts of the input) more reliably than before, and to give a better error message when it does so. This is analogous to the plpython and plperl fixes in 0553528 and f47004a. Like those PLs, we now accept input such as '{{},{}}' as a valid representation of an empty array, which we did not before. Additionally, reject explicit array subscripts that are outside the integer range (previously you just got whatever atoi() converted them to), and make some other minor improvements in error reporting. Although this is arguably a bug fix, it's also a behavioral change that might trip somebody up, so no back-patch. Tom Lane, Heikki Linnakangas, and Jian He. Thanks to Alexander Lakhin for the initial report and for review/testing. Discussion: https://postgr.es/m/2794005.1683042087@sss.pgh.pa.us
1 parent 57d6a19 commit 83472de

File tree

7 files changed

+789
-620
lines changed

7 files changed

+789
-620
lines changed

‎doc/src/sgml/array.sgml

+2-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ INSERT INTO sal_emp
171171
VALUES ('Bill',
172172
'{10000, 10000, 10000, 10000}',
173173
'{{"meeting", "lunch"}, {"meeting"}}');
174-
ERROR: multidimensional arrays must have array expressions with matching dimensions
174+
ERROR: malformed array literal: "{{"meeting", "lunch"}, {"meeting"}}"
175+
DETAIL: Multidimensional arrays must have sub-arrays with matching dimensions.
175176
</programlisting>
176177
</para>
177178

0 commit comments

Comments
 (0)