-- invalid input: parse errors
SELECT ''::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT ''::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT 'ABC'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT 'ABC'::cube AS cube;
+ ^
DETAIL: syntax error at or near "A"
SELECT '()'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '()'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '[]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[()]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[()]'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '[(1)]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1)]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[(1),]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[(1),2]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),2]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "2"
SELECT '[(1),(2),(3)]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),(2),(3)]'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '1,'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,'::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT '1,2,'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,2,'::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT '1,,2'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,,2'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '(1,)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '(1,2,)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '(1,,2)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,,2)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
-- invalid input: semantic errors and trailing garbage
SELECT '[(1),(2)],'::cube AS cube; -- 0
ERROR: bad cube representation
+LINE 1: SELECT '[(1),(2)],'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1
ERROR: bad cube representation
+LINE 1: SELECT '[(1,2,3),(2,3)]'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2,3) and (2,3).
SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1
ERROR: bad cube representation
+LINE 1: SELECT '[(1,2),(1,2,3)]'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2) and (1,2,3).
SELECT '(1),(2),'::cube AS cube; -- 2
ERROR: bad cube representation
+LINE 1: SELECT '(1),(2),'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3),(2,3)'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2,3) and (2,3).
SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3
ERROR: bad cube representation
+LINE 1: SELECT '(1,2),(1,2,3)'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2) and (1,2,3).
SELECT '(1,2,3)ab'::cube AS cube; -- 4
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3)ab'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '(1,2,3)a'::cube AS cube; -- 5
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3)a'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '(1,2)('::cube AS cube; -- 5
ERROR: bad cube representation
+LINE 1: SELECT '(1,2)('::cube AS cube;
+ ^
DETAIL: syntax error at or near "("
SELECT '1,2ab'::cube AS cube; -- 6
ERROR: bad cube representation
+LINE 1: SELECT '1,2ab'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '1 e7'::cube AS cube; -- 6
ERROR: bad cube representation
+LINE 1: SELECT '1 e7'::cube AS cube;
+ ^
DETAIL: syntax error at or near "e"
SELECT '1,2a'::cube AS cube; -- 7
ERROR: bad cube representation
+LINE 1: SELECT '1,2a'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '1..2'::cube AS cube; -- 7
ERROR: bad cube representation
+LINE 1: SELECT '1..2'::cube AS cube;
+ ^
DETAIL: syntax error at or near ".2"
--
-- Testing building cubes from float8 values
--
select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube;
ERROR: bad cube representation
+LINE 1: select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0...
+ ^
DETAIL: A cube cannot have more than 100 dimensions.
select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube;
ERROR: bad cube representation
+LINE 1: select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0...
+ ^
DETAIL: A cube cannot have more than 100 dimensions.
--
-- testing the operators
-- invalid input: parse errors
SELECT ''::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT ''::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT 'ABC'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT 'ABC'::cube AS cube;
+ ^
DETAIL: syntax error at or near "A"
SELECT '()'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '()'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '[]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[()]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[()]'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '[(1)]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1)]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[(1),]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[(1),2]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),2]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "2"
SELECT '[(1),(2),(3)]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),(2),(3)]'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '1,'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,'::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT '1,2,'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,2,'::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT '1,,2'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,,2'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '(1,)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '(1,2,)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '(1,,2)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,,2)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
-- invalid input: semantic errors and trailing garbage
SELECT '[(1),(2)],'::cube AS cube; -- 0
ERROR: bad cube representation
+LINE 1: SELECT '[(1),(2)],'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1
ERROR: bad cube representation
+LINE 1: SELECT '[(1,2,3),(2,3)]'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2,3) and (2,3).
SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1
ERROR: bad cube representation
+LINE 1: SELECT '[(1,2),(1,2,3)]'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2) and (1,2,3).
SELECT '(1),(2),'::cube AS cube; -- 2
ERROR: bad cube representation
+LINE 1: SELECT '(1),(2),'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3),(2,3)'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2,3) and (2,3).
SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3
ERROR: bad cube representation
+LINE 1: SELECT '(1,2),(1,2,3)'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2) and (1,2,3).
SELECT '(1,2,3)ab'::cube AS cube; -- 4
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3)ab'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '(1,2,3)a'::cube AS cube; -- 5
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3)a'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '(1,2)('::cube AS cube; -- 5
ERROR: bad cube representation
+LINE 1: SELECT '(1,2)('::cube AS cube;
+ ^
DETAIL: syntax error at or near "("
SELECT '1,2ab'::cube AS cube; -- 6
ERROR: bad cube representation
+LINE 1: SELECT '1,2ab'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '1 e7'::cube AS cube; -- 6
ERROR: bad cube representation
+LINE 1: SELECT '1 e7'::cube AS cube;
+ ^
DETAIL: syntax error at or near "e"
SELECT '1,2a'::cube AS cube; -- 7
ERROR: bad cube representation
+LINE 1: SELECT '1,2a'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '1..2'::cube AS cube; -- 7
ERROR: bad cube representation
+LINE 1: SELECT '1..2'::cube AS cube;
+ ^
DETAIL: syntax error at or near ".2"
--
-- Testing building cubes from float8 values
--
select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube;
ERROR: bad cube representation
+LINE 1: select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0...
+ ^
DETAIL: A cube cannot have more than 100 dimensions.
select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube;
ERROR: bad cube representation
+LINE 1: select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0...
+ ^
DETAIL: A cube cannot have more than 100 dimensions.
--
-- testing the operators
-- invalid input: parse errors
SELECT ''::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT ''::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT 'ABC'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT 'ABC'::cube AS cube;
+ ^
DETAIL: syntax error at or near "A"
SELECT '()'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '()'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '[]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[()]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[()]'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '[(1)]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1)]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[(1),]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "]"
SELECT '[(1),2]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),2]'::cube AS cube;
+ ^
DETAIL: syntax error at or near "2"
SELECT '[(1),(2),(3)]'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '[(1),(2),(3)]'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '1,'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,'::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT '1,2,'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,2,'::cube AS cube;
+ ^
DETAIL: syntax error at end of input
SELECT '1,,2'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '1,,2'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '(1,)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '(1,2,)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ")"
SELECT '(1,,2)'::cube AS cube;
ERROR: bad cube representation
+LINE 1: SELECT '(1,,2)'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
-- invalid input: semantic errors and trailing garbage
SELECT '[(1),(2)],'::cube AS cube; -- 0
ERROR: bad cube representation
+LINE 1: SELECT '[(1),(2)],'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '[(1,2,3),(2,3)]'::cube AS cube; -- 1
ERROR: bad cube representation
+LINE 1: SELECT '[(1,2,3),(2,3)]'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2,3) and (2,3).
SELECT '[(1,2),(1,2,3)]'::cube AS cube; -- 1
ERROR: bad cube representation
+LINE 1: SELECT '[(1,2),(1,2,3)]'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2) and (1,2,3).
SELECT '(1),(2),'::cube AS cube; -- 2
ERROR: bad cube representation
+LINE 1: SELECT '(1),(2),'::cube AS cube;
+ ^
DETAIL: syntax error at or near ","
SELECT '(1,2,3),(2,3)'::cube AS cube; -- 3
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3),(2,3)'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2,3) and (2,3).
SELECT '(1,2),(1,2,3)'::cube AS cube; -- 3
ERROR: bad cube representation
+LINE 1: SELECT '(1,2),(1,2,3)'::cube AS cube;
+ ^
DETAIL: Different point dimensions in (1,2) and (1,2,3).
SELECT '(1,2,3)ab'::cube AS cube; -- 4
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3)ab'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '(1,2,3)a'::cube AS cube; -- 5
ERROR: bad cube representation
+LINE 1: SELECT '(1,2,3)a'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '(1,2)('::cube AS cube; -- 5
ERROR: bad cube representation
+LINE 1: SELECT '(1,2)('::cube AS cube;
+ ^
DETAIL: syntax error at or near "("
SELECT '1,2ab'::cube AS cube; -- 6
ERROR: bad cube representation
+LINE 1: SELECT '1,2ab'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '1 e7'::cube AS cube; -- 6
ERROR: bad cube representation
+LINE 1: SELECT '1 e7'::cube AS cube;
+ ^
DETAIL: syntax error at or near "e"
SELECT '1,2a'::cube AS cube; -- 7
ERROR: bad cube representation
+LINE 1: SELECT '1,2a'::cube AS cube;
+ ^
DETAIL: syntax error at or near "a"
SELECT '1..2'::cube AS cube; -- 7
ERROR: bad cube representation
+LINE 1: SELECT '1..2'::cube AS cube;
+ ^
DETAIL: syntax error at or near ".2"
--
-- Testing building cubes from float8 values
--
select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube;
ERROR: bad cube representation
+LINE 1: select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0...
+ ^
DETAIL: A cube cannot have more than 100 dimensions.
select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)'::cube;
ERROR: bad cube representation
+LINE 1: select '(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0...
+ ^
DETAIL: A cube cannot have more than 100 dimensions.
--
-- testing the operators
-- invalid input
SELECT ''::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT ''::seg AS seg;
+ ^
DETAIL: syntax error at end of input
SELECT 'ABC'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT 'ABC'::seg AS seg;
+ ^
DETAIL: syntax error at or near "A"
SELECT '1ABC'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1ABC'::seg AS seg;
+ ^
DETAIL: syntax error at or near "A"
SELECT '1.'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1.'::seg AS seg;
+ ^
DETAIL: syntax error at or near "."
SELECT '1.....'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1.....'::seg AS seg;
+ ^
DETAIL: syntax error at or near ".."
SELECT '.1'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '.1'::seg AS seg;
+ ^
DETAIL: syntax error at or near "."
SELECT '1..2.'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1..2.'::seg AS seg;
+ ^
DETAIL: syntax error at or near "."
SELECT '1 e7'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1 e7'::seg AS seg;
+ ^
DETAIL: syntax error at or near "e"
SELECT '1e700'::seg AS seg;
ERROR: "1e700" is out of range for type real
+LINE 1: SELECT '1e700'::seg AS seg;
+ ^
--
-- testing the operators
--
-- invalid input
SELECT ''::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT ''::seg AS seg;
+ ^
DETAIL: syntax error at end of input
SELECT 'ABC'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT 'ABC'::seg AS seg;
+ ^
DETAIL: syntax error at or near "A"
SELECT '1ABC'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1ABC'::seg AS seg;
+ ^
DETAIL: syntax error at or near "A"
SELECT '1.'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1.'::seg AS seg;
+ ^
DETAIL: syntax error at or near "."
SELECT '1.....'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1.....'::seg AS seg;
+ ^
DETAIL: syntax error at or near ".."
SELECT '.1'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '.1'::seg AS seg;
+ ^
DETAIL: syntax error at or near "."
SELECT '1..2.'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1..2.'::seg AS seg;
+ ^
DETAIL: syntax error at or near "."
SELECT '1 e7'::seg AS seg;
ERROR: bad seg representation
+LINE 1: SELECT '1 e7'::seg AS seg;
+ ^
DETAIL: syntax error at or near "e"
SELECT '1e700'::seg AS seg;
ERROR: "1e700" is out of range for type real
+LINE 1: SELECT '1e700'::seg AS seg;
+ ^
--
-- testing the operators
--
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.92 2008/05/09 23:32:04 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.93 2008/09/01 20:42:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
{
do_start();
- DefineIndex(makeRangeVar(NULL, LexIDStr($6)),
+ DefineIndex(makeRangeVar(NULL, LexIDStr($6), -1),
LexIDStr($3),
$4,
LexIDStr($8),
{
do_start();
- DefineIndex(makeRangeVar(NULL, LexIDStr($7)),
+ DefineIndex(makeRangeVar(NULL, LexIDStr($7), -1),
LexIDStr($4),
$5,
LexIDStr($9),
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.244 2008/06/24 17:58:27 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.245 2008/09/01 20:42:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
elog(DEBUG4, "open relation %s, attrsize %d",
relname, (int) ATTRIBUTE_TUPLE_SIZE);
- boot_reldesc = heap_openrv(makeRangeVar(NULL, relname), NoLock);
+ boot_reldesc = heap_openrv(makeRangeVar(NULL, relname, -1), NoLock);
numattr = boot_reldesc->rd_rel->relnatts;
for (i = 0; i < numattr; i++)
{
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.110 2008/08/30 01:39:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.111 2008/09/01 20:42:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
RangeVar *
makeRangeVarFromNameList(List *names)
{
- RangeVar *rel = makeRangeVar(NULL, NULL);
+ RangeVar *rel = makeRangeVar(NULL, NULL, -1);
switch (list_length(names))
{
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.10 2008/05/09 23:32:04 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.11 2008/09/01 20:42:43 tgl Exp $
*
*-------------------------------------------------------------------------
*/
{
Relation rel;
- rel = heap_openrv(makeRangeVar(NULL, relName), AccessExclusiveLock);
+ rel = heap_openrv(makeRangeVar(NULL, relName, -1), AccessExclusiveLock);
/* Note: during bootstrap may see uncataloged relation */
if (rel->rd_rel->relkind != RELKIND_RELATION &&
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.264 2008/08/28 23:09:45 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.265 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
* Reconstruct a RangeVar for my relation (not passed in, unfortunately).
*/
myRel = makeRangeVar(get_namespace_name(RelationGetNamespace(rel)),
- pstrdup(RelationGetRelationName(rel)));
+ pstrdup(RelationGetRelationName(rel)),
+ -1);
/* Make changes-so-far visible */
CommandCounterIncrement();
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.236 2008/07/18 20:26:06 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.237 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
else
{
/* Work around ancient pg_dump bug that omitted constrrel */
- fkcon->pktable = makeRangeVar(NULL, pk_table_name);
+ fkcon->pktable = makeRangeVar(NULL, pk_table_name, -1);
}
}
else
else
{
/* Work around ancient pg_dump bug that omitted constrrel */
- atstmt->relation = makeRangeVar(NULL, fk_table_name);
+ atstmt->relation = makeRangeVar(NULL, fk_table_name, -1);
}
}
atstmt->cmds = list_make1(atcmd);
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.403 2008/08/30 01:39:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.404 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
COPY_SCALAR_FIELD(inhOpt);
COPY_SCALAR_FIELD(istemp);
COPY_NODE_FIELD(alias);
+ COPY_LOCATION_FIELD(location);
return newnode;
}
{
SortBy *newnode = makeNode(SortBy);
+ COPY_NODE_FIELD(node);
COPY_SCALAR_FIELD(sortby_dir);
COPY_SCALAR_FIELD(sortby_nulls);
COPY_NODE_FIELD(useOp);
- COPY_NODE_FIELD(node);
+ COPY_LOCATION_FIELD(location);
return newnode;
}
{
NotifyStmt *newnode = makeNode(NotifyStmt);
- COPY_NODE_FIELD(relation);
+ COPY_STRING_FIELD(conditionname);
return newnode;
}
{
ListenStmt *newnode = makeNode(ListenStmt);
- COPY_NODE_FIELD(relation);
+ COPY_STRING_FIELD(conditionname);
return newnode;
}
{
UnlistenStmt *newnode = makeNode(UnlistenStmt);
- COPY_NODE_FIELD(relation);
+ COPY_STRING_FIELD(conditionname);
return newnode;
}
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.330 2008/08/30 01:39:13 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.331 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
COMPARE_SCALAR_FIELD(inhOpt);
COMPARE_SCALAR_FIELD(istemp);
COMPARE_NODE_FIELD(alias);
+ COMPARE_LOCATION_FIELD(location);
return true;
}
static bool
_equalNotifyStmt(NotifyStmt *a, NotifyStmt *b)
{
- COMPARE_NODE_FIELD(relation);
+ COMPARE_STRING_FIELD(conditionname);
return true;
}
static bool
_equalListenStmt(ListenStmt *a, ListenStmt *b)
{
- COMPARE_NODE_FIELD(relation);
+ COMPARE_STRING_FIELD(conditionname);
return true;
}
static bool
_equalUnlistenStmt(UnlistenStmt *a, UnlistenStmt *b)
{
- COMPARE_NODE_FIELD(relation);
+ COMPARE_STRING_FIELD(conditionname);
return true;
}
static bool
_equalSortBy(SortBy *a, SortBy *b)
{
+ COMPARE_NODE_FIELD(node);
COMPARE_SCALAR_FIELD(sortby_dir);
COMPARE_SCALAR_FIELD(sortby_nulls);
COMPARE_NODE_FIELD(useOp);
- COMPARE_NODE_FIELD(node);
+ COMPARE_LOCATION_FIELD(location);
return true;
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/makefuncs.c,v 1.59 2008/08/28 23:09:46 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/makefuncs.c,v 1.60 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
* creates a RangeVar node (rather oversimplified case)
*/
RangeVar *
-makeRangeVar(char *schemaname, char *relname)
+makeRangeVar(char *schemaname, char *relname, int location)
{
RangeVar *r = makeNode(RangeVar);
r->inhOpt = INH_DEFAULT;
r->istemp = false;
r->alias = NULL;
+ r->location = location;
return r;
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/nodeFuncs.c,v 1.31 2008/08/28 23:09:46 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/nodeFuncs.c,v 1.32 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
return -1;
switch (nodeTag(expr))
{
+ case T_RangeVar:
+ loc = ((RangeVar *) expr)->location;
+ break;
case T_Var:
loc = ((Var *) expr)->location;
break;
/* just use argument's location */
loc = exprLocation((Node *) ((TargetEntry *) expr)->expr);
break;
+ case T_IntoClause:
+ /* use the contained RangeVar's location --- close enough */
+ loc = exprLocation((Node *) ((IntoClause *) expr)->rel);
+ break;
case T_List:
{
/* report location of first list member that has a location */
loc = leftmostLoc(loc, tc->location);
}
break;
+ case T_SortBy:
+ /* just use argument's location (ignore operator, if any) */
+ loc = exprLocation(((SortBy *) expr)->node);
+ break;
case T_TypeName:
loc = ((TypeName *) expr)->location;
break;
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.337 2008/08/30 01:39:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.338 2008/09/01 20:42:44 tgl Exp $
*
* NOTES
* Every node type that can appear in stored rules' parsetrees *must*
WRITE_ENUM_FIELD(inhOpt, InhOption);
WRITE_BOOL_FIELD(istemp);
WRITE_NODE_FIELD(alias);
+ WRITE_LOCATION_FIELD(location);
}
static void
{
WRITE_NODE_TYPE("NOTIFY");
- WRITE_NODE_FIELD(relation);
+ WRITE_STRING_FIELD(conditionname);
}
static void
{
WRITE_NODE_TYPE("SORTBY");
+ WRITE_NODE_FIELD(node);
WRITE_ENUM_FIELD(sortby_dir, SortByDir);
WRITE_ENUM_FIELD(sortby_nulls, SortByNulls);
WRITE_NODE_FIELD(useOp);
- WRITE_NODE_FIELD(node);
+ WRITE_LOCATION_FIELD(location);
}
static void
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.213 2008/08/28 23:09:46 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.214 2008/09/01 20:42:44 tgl Exp $
*
* NOTES
* Path and Plan nodes do not have any readfuncs support, because we
{
READ_LOCALS(NotifyStmt);
- READ_NODE_FIELD(relation);
+ READ_STRING_FIELD(conditionname);
READ_DONE();
}
READ_ENUM_FIELD(inhOpt, InhOption);
READ_BOOL_FIELD(istemp);
READ_NODE_FIELD(alias);
+ READ_LOCATION_FIELD(location);
READ_DONE();
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.150 2008/08/25 22:42:33 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.151 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
break;
case RTE_FUNCTION:
- expandRTE(rte, varno, 0, true /* include dropped */ ,
+ expandRTE(rte, varno, 0, -1, true /* include dropped */ ,
NULL, &colvars);
foreach(l, colvars)
{
break;
case RTE_VALUES:
- expandRTE(rte, varno, 0, false /* dropped not applicable */ ,
+ expandRTE(rte, varno, 0, -1, false /* dropped not applicable */ ,
NULL, &colvars);
foreach(l, colvars)
{
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/optimizer/util/var.c,v 1.78 2008/08/28 23:09:46 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/util/var.c,v 1.79 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
typedef struct
{
- int varno;
- int varattno;
+ int var_location;
int sublevels_up;
-} contain_var_reference_context;
+} locate_var_of_level_context;
+
+typedef struct
+{
+ int var_location;
+ int relid;
+ int sublevels_up;
+} locate_var_of_relation_context;
typedef struct
{
static bool pull_varnos_walker(Node *node,
pull_varnos_context *context);
static bool pull_varattnos_walker(Node *node, Bitmapset **varattnos);
-static bool contain_var_reference_walker(Node *node,
- contain_var_reference_context *context);
static bool contain_var_clause_walker(Node *node, void *context);
static bool contain_vars_of_level_walker(Node *node, int *sublevels_up);
-static bool contain_vars_above_level_walker(Node *node, int *sublevels_up);
+static bool locate_var_of_level_walker(Node *node,
+ locate_var_of_level_context *context);
+static bool locate_var_of_relation_walker(Node *node,
+ locate_var_of_relation_context *context);
static bool find_minimum_var_level_walker(Node *node,
find_minimum_var_level_context *context);
static bool pull_var_clause_walker(Node *node,
(void *) context);
}
+
/*
* pull_varattnos
* Find all the distinct attribute numbers present in an expression tree,
}
-/*
- * contain_var_reference
- *
- * Detect whether a parsetree contains any references to a specified
- * attribute of a specified rtable entry.
- *
- * NOTE: this is used on not-yet-planned expressions. It may therefore find
- * bare SubLinks, and if so it needs to recurse into them to look for uplevel
- * references to the desired rtable entry! But when we find a completed
- * SubPlan, we only need to look at the parameters passed to the subplan.
- */
-bool
-contain_var_reference(Node *node, int varno, int varattno, int levelsup)
-{
- contain_var_reference_context context;
-
- context.varno = varno;
- context.varattno = varattno;
- context.sublevels_up = levelsup;
-
- /*
- * Must be prepared to start with a Query or a bare expression tree; if
- * it's a Query, we don't want to increment sublevels_up.
- */
- return query_or_expression_tree_walker(node,
- contain_var_reference_walker,
- (void *) &context,
- 0);
-}
-
-static bool
-contain_var_reference_walker(Node *node,
- contain_var_reference_context *context)
-{
- if (node == NULL)
- return false;
- if (IsA(node, Var))
- {
- Var *var = (Var *) node;
-
- if (var->varno == context->varno &&
- var->varattno == context->varattno &&
- var->varlevelsup == context->sublevels_up)
- return true;
- return false;
- }
- if (IsA(node, Query))
- {
- /* Recurse into RTE subquery or not-yet-planned sublink subquery */
- bool result;
-
- context->sublevels_up++;
- result = query_tree_walker((Query *) node,
- contain_var_reference_walker,
- (void *) context, 0);
- context->sublevels_up--;
- return result;
- }
- return expression_tree_walker(node, contain_var_reference_walker,
- (void *) context);
-}
-
-
/*
* contain_var_clause
* Recursively scan a clause to discover whether it contains any Var nodes
return expression_tree_walker(node, contain_var_clause_walker, context);
}
+
/*
* contain_vars_of_level
* Recursively scan a clause to discover whether it contains any Var nodes
(void *) sublevels_up);
}
+
/*
- * contain_vars_above_level
- * Recursively scan a clause to discover whether it contains any Var nodes
- * above the specified query level. (For example, pass zero to detect
- * all nonlocal Vars.)
+ * locate_var_of_level
+ * Find the parse location of any Var of the specified query level.
*
- * Returns true if any such Var found.
+ * Returns -1 if no such Var is in the querytree, or if they all have
+ * unknown parse location. (The former case is probably caller error,
+ * but we don't bother to distinguish it from the latter case.)
*
* Will recurse into sublinks. Also, may be invoked directly on a Query.
+ *
+ * Note: it might seem appropriate to merge this functionality into
+ * contain_vars_of_level, but that would complicate that function's API.
+ * Currently, the only uses of this function are for error reporting,
+ * and so shaving cycles probably isn't very important.
*/
-bool
-contain_vars_above_level(Node *node, int levelsup)
+int
+locate_var_of_level(Node *node, int levelsup)
{
- int sublevels_up = levelsup;
+ locate_var_of_level_context context;
- return query_or_expression_tree_walker(node,
- contain_vars_above_level_walker,
- (void *) &sublevels_up,
+ context.var_location = -1; /* in case we find nothing */
+ context.sublevels_up = levelsup;
+
+ (void) query_or_expression_tree_walker(node,
+ locate_var_of_level_walker,
+ (void *) &context,
0);
+
+ return context.var_location;
}
static bool
-contain_vars_above_level_walker(Node *node, int *sublevels_up)
+locate_var_of_level_walker(Node *node,
+ locate_var_of_level_context *context)
{
if (node == NULL)
return false;
if (IsA(node, Var))
{
- if (((Var *) node)->varlevelsup > *sublevels_up)
+ Var *var = (Var *) node;
+
+ if (var->varlevelsup == context->sublevels_up &&
+ var->location >= 0)
+ {
+ context->var_location = var->location;
return true; /* abort tree traversal and return true */
+ }
+ return false;
+ }
+ if (IsA(node, CurrentOfExpr))
+ {
+ /* since CurrentOfExpr doesn't carry location, nothing we can do */
+ return false;
}
if (IsA(node, Query))
{
/* Recurse into subselects */
bool result;
- (*sublevels_up)++;
+ context->sublevels_up++;
result = query_tree_walker((Query *) node,
- contain_vars_above_level_walker,
- (void *) sublevels_up,
+ locate_var_of_level_walker,
+ (void *) context,
0);
- (*sublevels_up)--;
+ context->sublevels_up--;
return result;
}
return expression_tree_walker(node,
- contain_vars_above_level_walker,
- (void *) sublevels_up);
+ locate_var_of_level_walker,
+ (void *) context);
+}
+
+
+/*
+ * locate_var_of_relation
+ * Find the parse location of any Var of the specified relation.
+ *
+ * Returns -1 if no such Var is in the querytree, or if they all have
+ * unknown parse location.
+ *
+ * Will recurse into sublinks. Also, may be invoked directly on a Query.
+ */
+int
+locate_var_of_relation(Node *node, int relid, int levelsup)
+{
+ locate_var_of_relation_context context;
+
+ context.var_location = -1; /* in case we find nothing */
+ context.relid = relid;
+ context.sublevels_up = levelsup;
+
+ (void) query_or_expression_tree_walker(node,
+ locate_var_of_relation_walker,
+ (void *) &context,
+ 0);
+
+ return context.var_location;
+}
+
+static bool
+locate_var_of_relation_walker(Node *node,
+ locate_var_of_relation_context *context)
+{
+ if (node == NULL)
+ return false;
+ if (IsA(node, Var))
+ {
+ Var *var = (Var *) node;
+
+ if (var->varno == context->relid &&
+ var->varlevelsup == context->sublevels_up &&
+ var->location >= 0)
+ {
+ context->var_location = var->location;
+ return true; /* abort tree traversal and return true */
+ }
+ return false;
+ }
+ if (IsA(node, CurrentOfExpr))
+ {
+ /* since CurrentOfExpr doesn't carry location, nothing we can do */
+ return false;
+ }
+ if (IsA(node, Query))
+ {
+ /* Recurse into subselects */
+ bool result;
+
+ context->sublevels_up++;
+ result = query_tree_walker((Query *) node,
+ locate_var_of_relation_walker,
+ (void *) context,
+ 0);
+ context->sublevels_up--;
+ return result;
+ }
+ return expression_tree_walker(node,
+ locate_var_of_relation_walker,
+ (void *) context);
}
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.378 2008/08/28 23:09:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.379 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parsetree.h"
+#include "rewrite/rewriteManip.h"
#include "utils/rel.h"
-typedef struct
-{
- Oid *paramTypes;
- int numParams;
-} check_parameter_resolution_context;
-
-
static Query *transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt);
static Query *transformInsertStmt(ParseState *pstate, InsertStmt *stmt);
static List *transformInsertRow(ParseState *pstate, List *exprlist,
DeclareCursorStmt *stmt);
static Query *transformExplainStmt(ParseState *pstate,
ExplainStmt *stmt);
-static void transformLockingClause(Query *qry, LockingClause *lc);
-static bool check_parameter_resolution_walker(Node *node,
- check_parameter_resolution_context *context);
+static void transformLockingClause(ParseState *pstate,
+ Query *qry, LockingClause *lc);
+static bool check_parameter_resolution_walker(Node *node, ParseState *pstate);
/*
query = transformStmt(pstate, parseTree);
+ /* make sure all is well with parameter types */
+ if (pstate->p_numparams > 0)
+ check_parameter_resolution_walker((Node *) query, pstate);
+
*paramTypes = pstate->p_paramtypes;
*numParams = pstate->p_numparams;
free_parsestate(pstate);
- /* make sure all is well with parameter types */
- if (*numParams > 0)
- {
- check_parameter_resolution_context context;
-
- context.paramTypes = *paramTypes;
- context.numParams = *numParams;
- check_parameter_resolution_walker((Node *) query, &context);
- }
-
return query;
}
free_parsestate(sub_pstate);
/* The grammar should have produced a SELECT, but it might have INTO */
- Assert(IsA(selectQuery, Query));
- Assert(selectQuery->commandType == CMD_SELECT);
- Assert(selectQuery->utilityStmt == NULL);
+ if (!IsA(selectQuery, Query) ||
+ selectQuery->commandType != CMD_SELECT ||
+ selectQuery->utilityStmt != NULL)
+ elog(ERROR, "unexpected non-SELECT command in INSERT ... SELECT");
if (selectQuery->intoClause)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("INSERT ... SELECT cannot specify INTO")));
+ errmsg("INSERT ... SELECT cannot specify INTO"),
+ parser_errposition(pstate,
+ exprLocation((Node *) selectQuery->intoClause))));
/*
* Make the source be a subquery in the INSERT's rangetable, and add
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("VALUES lists must all be the same length")));
+ errmsg("VALUES lists must all be the same length"),
+ parser_errposition(pstate,
+ exprLocation((Node *) sublist))));
}
/* Prepare row for assignment to target table */
if (pstate->p_joinlist != NIL)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("VALUES must not contain table references")));
+ errmsg("VALUES must not contain table references"),
+ parser_errposition(pstate,
+ locate_var_of_level((Node *) exprsLists, 0))));
/*
* Another thing we can't currently support is NEW/OLD references in
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("VALUES must not contain OLD or NEW references"),
- errhint("Use SELECT ... UNION ALL ... instead.")));
+ errhint("Use SELECT ... UNION ALL ... instead."),
+ parser_errposition(pstate,
+ locate_var_of_level((Node *) exprsLists, 0))));
/*
* Generate the VALUES RTE
/*
* Generate list of Vars referencing the RTE
*/
- expandRTE(rte, rtr->rtindex, 0, false, NULL, &exprList);
+ expandRTE(rte, rtr->rtindex, 0, -1, false, NULL, &exprList);
}
else
{
if (pstate->p_hasAggs)
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("cannot use aggregate function in VALUES")));
+ errmsg("cannot use aggregate function in VALUES"),
+ parser_errposition(pstate,
+ locate_agg_of_level((Node *) qry, 0))));
return qry;
}
if (list_length(exprlist) > list_length(icolumns))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("INSERT has more expressions than target columns")));
+ errmsg("INSERT has more expressions than target columns"),
+ parser_errposition(pstate,
+ exprLocation(list_nth(exprlist,
+ list_length(icolumns))))));
if (stmtcols != NIL &&
list_length(exprlist) < list_length(icolumns))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("INSERT has more target columns than expressions")));
+ errmsg("INSERT has more target columns than expressions"),
+ parser_errposition(pstate,
+ exprLocation(list_nth(icolumns,
+ list_length(exprlist))))));
/*
* Prepare columns for assignment to target table.
foreach(l, stmt->lockingClause)
{
- transformLockingClause(qry, (LockingClause *) lfirst(l));
+ transformLockingClause(pstate, qry, (LockingClause *) lfirst(l));
}
return qry;
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("VALUES lists must all be the same length")));
+ errmsg("VALUES lists must all be the same length"),
+ parser_errposition(pstate,
+ exprLocation((Node *) sublist))));
}
exprsLists = lappend(exprsLists, sublist);
* Generate a targetlist as though expanding "*"
*/
Assert(pstate->p_next_resno == 1);
- qry->targetList = expandRelAttrs(pstate, rte, rtr->rtindex, 0);
+ qry->targetList = expandRelAttrs(pstate, rte, rtr->rtindex, 0, -1);
/*
* The grammar allows attaching ORDER BY, LIMIT, and FOR UPDATE to a
if (list_length(pstate->p_joinlist) != 1)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("VALUES must not contain table references")));
+ errmsg("VALUES must not contain table references"),
+ parser_errposition(pstate,
+ locate_var_of_level((Node *) newExprsLists, 0))));
/*
* Another thing we can't currently support is NEW/OLD references in rules
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("VALUES must not contain OLD or NEW references"),
- errhint("Use SELECT ... UNION ALL ... instead.")));
+ errhint("Use SELECT ... UNION ALL ... instead."),
+ parser_errposition(pstate,
+ locate_var_of_level((Node *) newExprsLists, 0))));
qry->rtable = pstate->p_rtable;
qry->jointree = makeFromExpr(pstate->p_joinlist, NULL);
if (pstate->p_hasAggs)
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("cannot use aggregate function in VALUES")));
+ errmsg("cannot use aggregate function in VALUES"),
+ parser_errposition(pstate,
+ locate_agg_of_level((Node *) newExprsLists, 0))));
return qry;
}
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("invalid UNION/INTERSECT/EXCEPT ORDER BY clause"),
errdetail("Only result column names can be used, not expressions or functions."),
- errhint("Add the expression/function to every SELECT, or move the UNION into a FROM clause.")));
+ errhint("Add the expression/function to every SELECT, or move the UNION into a FROM clause."),
+ parser_errposition(pstate,
+ exprLocation(list_nth(qry->targetList, tllen)))));
qry->limitOffset = transformLimitClause(pstate, limitOffset,
"OFFSET");
foreach(l, lockingClause)
{
- transformLockingClause(qry, (LockingClause *) lfirst(l));
+ transformLockingClause(pstate, qry, (LockingClause *) lfirst(l));
}
return qry;
* In addition to returning the transformed node, we return a list of
* expression nodes showing the type, typmod, and location (for error messages)
* of each output column of the set-op node. This is used only during the
- * internal recursion of this function. We use SetToDefault nodes for
- * this purpose, since they carry exactly the fields needed, but any other
- * expression node type would do as well.
+ * internal recursion of this function. At the upper levels we use
+ * SetToDefault nodes for this purpose, since they carry exactly the fields
+ * needed, but any other expression node type would do as well.
*/
static Node *
transformSetOperationTree(ParseState *pstate, SelectStmt *stmt,
if (stmt->intoClause)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT")));
+ errmsg("INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"),
+ parser_errposition(pstate,
+ exprLocation((Node *) stmt->intoClause))));
+
/* We don't support FOR UPDATE/SHARE with set ops at the moment. */
if (stmt->lockingClause)
ereport(ERROR,
if (contain_vars_of_level((Node *) selectQuery, 1))
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
- errmsg("UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level")));
+ errmsg("UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"),
+ parser_errposition(pstate,
+ locate_var_of_level((Node *) selectQuery, 1))));
}
/*
- * Extract information about the result columns.
+ * Extract a list of the result expressions for upper-level checking.
*/
*colInfo = NIL;
foreach(tl, selectQuery->targetList)
{
TargetEntry *tle = (TargetEntry *) lfirst(tl);
- SetToDefault *cinfo;
- if (tle->resjunk)
- continue;
- cinfo = makeNode(SetToDefault);
- cinfo->typeId = exprType((Node *) tle->expr);
- cinfo->typeMod = exprTypmod((Node *) tle->expr);
- cinfo->location = exprLocation((Node *) tle->expr);
- *colInfo = lappend(*colInfo, cinfo);
+ if (!tle->resjunk)
+ *colInfo = lappend(*colInfo, tle->expr);
}
/*
op->groupClauses = NIL;
forboth(lci, lcolinfo, rci, rcolinfo)
{
- SetToDefault *lcolinfo = (SetToDefault *) lfirst(lci);
- SetToDefault *rcolinfo = (SetToDefault *) lfirst(rci);
- Oid lcoltype = lcolinfo->typeId;
- Oid rcoltype = rcolinfo->typeId;
- int32 lcoltypmod = lcolinfo->typeMod;
- int32 rcoltypmod = rcolinfo->typeMod;
+ Node *lcolinfo = (Node *) lfirst(lci);
+ Node *rcolinfo = (Node *) lfirst(rci);
+ Oid lcoltype = exprType(lcolinfo);
+ Oid rcoltype = exprType(rcolinfo);
+ int32 lcoltypmod = exprTypmod(lcolinfo);
+ int32 rcoltypmod = exprTypmod(rcolinfo);
Node *bestexpr;
SetToDefault *rescolinfo;
Oid rescoltype;
rescoltypmod = -1;
/* verify the coercions are actually possible */
- if (lcoltype != UNKNOWNOID)
- (void) coerce_to_common_type(pstate, (Node *) lcolinfo,
- rescoltype, context);
- if (rcoltype != UNKNOWNOID)
- (void) coerce_to_common_type(pstate, (Node *) rcolinfo,
- rescoltype, context);
+ (void) coerce_to_common_type(pstate, lcolinfo,
+ rescoltype, context);
+ (void) coerce_to_common_type(pstate, rcolinfo,
+ rescoltype, context);
/* emit results */
rescolinfo = makeNode(SetToDefault);
rescolinfo->typeId = rescoltype;
rescolinfo->typeMod = rescoltypmod;
- rescolinfo->location = ((SetToDefault *) bestexpr)->location;
+ rescolinfo->location = exprLocation(bestexpr);
*colInfo = lappend(*colInfo, rescolinfo);
op->colTypes = lappend_oid(op->colTypes, rescoltype);
SortGroupClause *grpcl = makeNode(SortGroupClause);
Oid sortop;
Oid eqop;
+ ParseCallbackState pcbstate;
+
+ setup_parser_errposition_callback(&pcbstate, pstate,
+ rescolinfo->location);
/* determine the eqop and optional sortop */
get_sort_group_operators(rescoltype,
false, true, false,
&sortop, &eqop, NULL);
+ cancel_parser_errposition_callback(&pcbstate);
+
/* we don't have a tlist yet, so can't assign sortgrouprefs */
grpcl->tleSortGroupRef = 0;
grpcl->eqop = eqop;
if (pstate->p_hasAggs)
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("cannot use aggregate function in UPDATE")));
+ errmsg("cannot use aggregate function in UPDATE"),
+ parser_errposition(pstate,
+ locate_agg_of_level((Node *) qry, 0))));
/*
* Now we are done with SELECT-like processing, and can get on with
if (pstate->p_hasAggs)
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("cannot use aggregate function in RETURNING")));
+ errmsg("cannot use aggregate function in RETURNING"),
+ parser_errposition(pstate,
+ locate_agg_of_level((Node *) rlist, 0))));
/* no new relation references please */
if (list_length(pstate->p_rtable) != length_rtable)
+ {
+ int vlocation = -1;
+ int relid;
+
+ /* try to locate such a reference to point to */
+ for (relid = length_rtable + 1; relid <= list_length(pstate->p_rtable); relid++)
+ {
+ vlocation = locate_var_of_relation((Node *) rlist, relid, 0);
+ if (vlocation >= 0)
+ break;
+ }
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("RETURNING cannot contain references to other relations")));
+ errmsg("RETURNING cannot contain references to other relations"),
+ parser_errposition(pstate, vlocation)));
+ }
/* mark column origins */
markTargetListOrigins(pstate, rlist);
result = transformStmt(pstate, stmt->query);
+ /* Grammar should not have allowed anything but SELECT */
if (!IsA(result, Query) ||
result->commandType != CMD_SELECT ||
result->utilityStmt != NULL)
- elog(ERROR, "unexpected non-SELECT command in cursor statement");
+ elog(ERROR, "unexpected non-SELECT command in DECLARE CURSOR");
/* But we must explicitly disallow DECLARE CURSOR ... SELECT INTO */
if (result->intoClause)
ereport(ERROR,
(errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
- errmsg("DECLARE CURSOR cannot specify INTO")));
+ errmsg("DECLARE CURSOR cannot specify INTO"),
+ parser_errposition(pstate,
+ exprLocation((Node *) result->intoClause))));
/* FOR UPDATE and WITH HOLD are not compatible */
if (result->rowMarks != NIL && (stmt->options & CURSOR_OPT_HOLD))
* This basically involves replacing names by integer relids.
*
* NB: if you need to change this, see also markQueryForLocking()
- * in rewriteHandler.c.
+ * in rewriteHandler.c, and isLockedRel() in parse_relation.c.
*/
static void
-transformLockingClause(Query *qry, LockingClause *lc)
+transformLockingClause(ParseState *pstate, Query *qry, LockingClause *lc)
{
List *lockedRels = lc->lockedRels;
ListCell *l;
* FOR UPDATE/SHARE of subquery is propagated to all of
* subquery's rels
*/
- transformLockingClause(rte->subquery, allrels);
+ transformLockingClause(pstate, rte->subquery, allrels);
break;
default:
/* ignore JOIN, SPECIAL, FUNCTION RTEs */
/* just the named tables */
foreach(l, lockedRels)
{
- char *relname = strVal(lfirst(l));
+ RangeVar *thisrel = (RangeVar *) lfirst(l);
+
+ /* For simplicity we insist on unqualified alias names here */
+ if (thisrel->catalogname || thisrel->schemaname)
+ ereport(ERROR,
+ (errcode(ERRCODE_SYNTAX_ERROR),
+ errmsg("SELECT FOR UPDATE/SHARE must specify unqualified relation names"),
+ parser_errposition(pstate, thisrel->location)));
i = 0;
foreach(rt, qry->rtable)
RangeTblEntry *rte = (RangeTblEntry *) lfirst(rt);
++i;
- if (strcmp(rte->eref->aliasname, relname) == 0)
+ if (strcmp(rte->eref->aliasname, thisrel->relname) == 0)
{
switch (rte->rtekind)
{
* FOR UPDATE/SHARE of subquery is propagated to
* all of subquery's rels
*/
- transformLockingClause(rte->subquery, allrels);
+ transformLockingClause(pstate, rte->subquery, allrels);
break;
case RTE_JOIN:
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("SELECT FOR UPDATE/SHARE cannot be applied to a join")));
+ errmsg("SELECT FOR UPDATE/SHARE cannot be applied to a join"),
+ parser_errposition(pstate, thisrel->location)));
break;
case RTE_SPECIAL:
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD")));
+ errmsg("SELECT FOR UPDATE/SHARE cannot be applied to NEW or OLD"),
+ parser_errposition(pstate, thisrel->location)));
break;
case RTE_FUNCTION:
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("SELECT FOR UPDATE/SHARE cannot be applied to a function")));
+ errmsg("SELECT FOR UPDATE/SHARE cannot be applied to a function"),
+ parser_errposition(pstate, thisrel->location)));
break;
case RTE_VALUES:
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("SELECT FOR UPDATE/SHARE cannot be applied to VALUES")));
+ errmsg("SELECT FOR UPDATE/SHARE cannot be applied to VALUES"),
+ parser_errposition(pstate, thisrel->location)));
break;
default:
elog(ERROR, "unrecognized RTE type: %d",
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_TABLE),
errmsg("relation \"%s\" in FOR UPDATE/SHARE clause not found in FROM clause",
- relname)));
+ thisrel->relname),
+ parser_errposition(pstate, thisrel->location)));
}
}
}
* and yet other instances seen later might have gotten coerced.
*/
static bool
-check_parameter_resolution_walker(Node *node,
- check_parameter_resolution_context *context)
+check_parameter_resolution_walker(Node *node, ParseState *pstate)
{
if (node == NULL)
return false;
int paramno = param->paramid;
if (paramno <= 0 || /* shouldn't happen, but... */
- paramno > context->numParams)
+ paramno > pstate->p_numparams)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_PARAMETER),
- errmsg("there is no parameter $%d", paramno)));
+ errmsg("there is no parameter $%d", paramno),
+ parser_errposition(pstate, param->location)));
- if (param->paramtype != context->paramTypes[paramno - 1])
+ if (param->paramtype != pstate->p_paramtypes[paramno - 1])
ereport(ERROR,
(errcode(ERRCODE_AMBIGUOUS_PARAMETER),
errmsg("could not determine data type of parameter $%d",
- paramno)));
+ paramno),
+ parser_errposition(pstate, param->location)));
}
return false;
}
/* Recurse into RTE subquery or not-yet-planned sublink subquery */
return query_tree_walker((Query *) node,
check_parameter_resolution_walker,
- (void *) context, 0);
+ (void *) pstate, 0);
}
return expression_tree_walker(node, check_parameter_resolution_walker,
- (void *) context);
+ (void *) pstate);
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.620 2008/08/30 01:39:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.621 2008/09/01 20:42:44 tgl Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
#include "catalog/namespace.h"
#include "commands/defrem.h"
#include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
#include "parser/gramparse.h"
#include "storage/lmgr.h"
#include "utils/date.h"
if (($3 & ~(INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE))) != 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("time zone interval must be HOUR or HOUR TO MINUTE")));
+ errmsg("time zone interval must be HOUR or HOUR TO MINUTE"),
+ scanner_errposition(@3)));
t->typmods = list_make1(makeIntConst($3, @3));
}
$$ = makeStringConstCast($2, @2, t);
&& (($6 & ~(INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE))) != 0))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("time zone interval must be HOUR or HOUR TO MINUTE")));
+ errmsg("time zone interval must be HOUR or HOUR TO MINUTE"),
+ scanner_errposition(@6)));
t->typmods = list_make2(makeIntConst($6, @6),
makeIntConst($3, @3));
$$ = makeStringConstCast($5, @5, t);
{
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("MATCH PARTIAL not yet implemented")));
+ errmsg("MATCH PARTIAL not yet implemented"),
+ scanner_errposition(@1)));
$$ = FKCONSTR_MATCH_PARTIAL;
}
| MATCH SIMPLE
if (n->intoClause != NULL)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("CREATE TABLE AS cannot specify INTO")));
+ errmsg("CREATE TABLE AS cannot specify INTO"),
+ scanner_errposition(exprLocation((Node *) n->intoClause))));
$4->rel->istemp = $2;
n->intoClause = $4;
$$ = $6;
if ($1 == 0 && $2 != 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
+ errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE"),
+ scanner_errposition(@1)));
$$ = $1 | $2;
}
| ConstraintTimeSpec
if ($2 == 0 && $1 != 0)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
+ errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE"),
+ scanner_errposition(@1)));
$$ = $1 | $2;
}
| /*EMPTY*/
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("improper qualified name (too many dotted names): %s",
- NameListToString($3))));
+ NameListToString($3)),
+ scanner_errposition(@3)));
break;
}
+ r->location = @3;
n->typevar = r;
n->coldeflist = $6;
$$ = (Node *)n;
n->number = $2;
$$ = (Node *) n;
}
- | OPERATOR Iconst any_operator '(' oper_argtypes ')' opt_recheck
+ | OPERATOR Iconst any_operator oper_argtypes opt_recheck
{
CreateOpClassItem *n = makeNode(CreateOpClassItem);
n->itemtype = OPCLASS_ITEM_OPERATOR;
n->name = $3;
- n->args = $5;
+ n->args = $4;
n->number = $2;
$$ = (Node *) n;
}
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("RECHECK is no longer supported"),
- errhint("Update your data type.")));
+ errhint("Update your data type."),
+ scanner_errposition(@1)));
$$ = TRUE;
}
| /*EMPTY*/ { $$ = FALSE; }
n->comment = $7;
$$ = (Node *) n;
}
- | COMMENT ON OPERATOR any_operator '(' oper_argtypes ')'
- IS comment_text
+ | COMMENT ON OPERATOR any_operator oper_argtypes IS comment_text
{
CommentStmt *n = makeNode(CommentStmt);
n->objtype = OBJECT_OPERATOR;
n->objname = $4;
- n->objargs = $6;
- n->comment = $9;
+ n->objargs = $5;
+ n->comment = $7;
$$ = (Node *) n;
}
| COMMENT ON CONSTRAINT name ON any_name IS comment_text
;
opt_asc_desc: ASC { $$ = SORTBY_ASC; }
- | DESC { $$ = SORTBY_DESC; }
- | /*EMPTY*/ { $$ = SORTBY_DEFAULT; }
+ | DESC { $$ = SORTBY_DESC; }
+ | /*EMPTY*/ { $$ = SORTBY_DEFAULT; }
;
opt_nulls_order: NULLS_FIRST { $$ = SORTBY_NULLS_FIRST; }
;
RemoveOperStmt:
- DROP OPERATOR any_operator '(' oper_argtypes ')' opt_drop_behavior
+ DROP OPERATOR any_operator oper_argtypes opt_drop_behavior
{
RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
n->kind = OBJECT_OPERATOR;
n->name = $3;
- n->args = $5;
- n->behavior = $7;
+ n->args = $4;
+ n->behavior = $5;
n->missing_ok = false;
$$ = (Node *)n;
}
- | DROP OPERATOR IF_P EXISTS any_operator '(' oper_argtypes ')' opt_drop_behavior
+ | DROP OPERATOR IF_P EXISTS any_operator oper_argtypes opt_drop_behavior
{
RemoveFuncStmt *n = makeNode(RemoveFuncStmt);
n->kind = OBJECT_OPERATOR;
n->name = $5;
- n->args = $7;
- n->behavior = $9;
+ n->args = $6;
+ n->behavior = $7;
n->missing_ok = true;
$$ = (Node *)n;
}
;
oper_argtypes:
- Typename
+ '(' Typename ')'
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("missing argument"),
- errhint("Use NONE to denote the missing argument of a unary operator.")));
+ errhint("Use NONE to denote the missing argument of a unary operator."),
+ scanner_errposition(@3)));
}
- | Typename ',' Typename
- { $$ = list_make2($1, $3); }
- | NONE ',' Typename /* left unary */
- { $$ = list_make2(NULL, $3); }
- | Typename ',' NONE /* right unary */
- { $$ = list_make2($1, NULL); }
+ | '(' Typename ',' Typename ')'
+ { $$ = list_make2($2, $4); }
+ | '(' NONE ',' Typename ')' /* left unary */
+ { $$ = list_make2(NULL, $4); }
+ | '(' Typename ',' NONE ')' /* right unary */
+ { $$ = list_make2($2, NULL); }
;
any_operator:
n->newowner = $7;
$$ = (Node *)n;
}
- | ALTER OPERATOR any_operator '(' oper_argtypes ')' OWNER TO RoleId
+ | ALTER OPERATOR any_operator oper_argtypes OWNER TO RoleId
{
AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
n->objectType = OBJECT_OPERATOR;
n->object = $3;
- n->objarg = $5;
- n->newowner = $9;
+ n->objarg = $4;
+ n->newowner = $7;
$$ = (Node *)n;
}
| ALTER OPERATOR CLASS any_name USING access_method OWNER TO RoleId
/*****************************************************************************
*
* QUERY:
- * NOTIFY <qualified_name> can appear both in rule bodies and
+ * NOTIFY <identifier> can appear both in rule bodies and
* as a query-level command
*
*****************************************************************************/
NotifyStmt: NOTIFY ColId
{
NotifyStmt *n = makeNode(NotifyStmt);
- n->relation = makeNode(RangeVar);
- n->relation->relname = $2;
- n->relation->schemaname = NULL;
+ n->conditionname = $2;
$$ = (Node *)n;
}
;
ListenStmt: LISTEN ColId
{
ListenStmt *n = makeNode(ListenStmt);
- n->relation = makeNode(RangeVar);
- n->relation->relname = $2;
- n->relation->schemaname = NULL;
+ n->conditionname = $2;
$$ = (Node *)n;
}
;
UNLISTEN ColId
{
UnlistenStmt *n = makeNode(UnlistenStmt);
- n->relation = makeNode(RangeVar);
- n->relation->relname = $2;
- n->relation->schemaname = NULL;
+ n->conditionname = $2;
$$ = (Node *)n;
}
| UNLISTEN '*'
{
UnlistenStmt *n = makeNode(UnlistenStmt);
- n->relation = NULL;
+ n->conditionname = NULL;
$$ = (Node *)n;
}
;
if (list_length($2) != list_length($5))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("number of columns does not match number of values")));
+ errmsg("number of columns does not match number of values"),
+ scanner_errposition(@1)));
forboth(col_cell, $2, val_cell, $5)
{
ResTarget *res_col = (ResTarget *) lfirst(col_cell);
$$->sortby_dir = SORTBY_USING;
$$->sortby_nulls = $4;
$$->useOp = $3;
+ $$->location = @3;
}
| a_expr opt_asc_desc opt_nulls_order
{
$$->sortby_dir = $2;
$$->sortby_nulls = $3;
$$->useOp = NIL;
+ $$->location = -1; /* no operator */
}
;
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("LIMIT #,# syntax is not supported"),
- errhint("Use separate LIMIT and OFFSET clauses.")));
+ errhint("Use separate LIMIT and OFFSET clauses."),
+ scanner_errposition(@1)));
}
;
;
locked_rels_list:
- OF name_list { $$ = $2; }
+ OF qualified_name_list { $$ = $2; }
| /* EMPTY */ { $$ = NIL; }
;
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("VALUES in FROM must have an alias"),
- errhint("For example, FROM (VALUES ...) [AS] foo.")));
+ errhint("For example, FROM (VALUES ...) [AS] foo."),
+ scanner_errposition(@1)));
else
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("subquery in FROM must have an alias"),
- errhint("For example, FROM (SELECT ...) [AS] foo.")));
+ errhint("For example, FROM (SELECT ...) [AS] foo."),
+ scanner_errposition(@1)));
$$ = NULL;
}
| select_with_parens alias_clause
if ($2 < 1)
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("precision for type float must be at least 1 bit")));
+ errmsg("precision for type float must be at least 1 bit"),
+ scanner_errposition(@2)));
else if ($2 <= 24)
$$ = SystemTypeName("float4");
else if ($2 <= 53)
else
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
- errmsg("precision for type float must be less than 54 bits")));
+ errmsg("precision for type float must be less than 54 bits"),
+ scanner_errposition(@2)));
}
| /*EMPTY*/
{
*/
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("UNIQUE predicate is not yet implemented")));
+ errmsg("UNIQUE predicate is not yet implemented"),
+ scanner_errposition(@1)));
}
| a_expr IS DOCUMENT_P %prec IS
{
$$->catalogname = NULL;
$$->schemaname = NULL;
$$->relname = $1;
+ $$->location = @1;
}
| relation_name indirection
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("improper qualified name (too many dotted names): %s",
- NameListToString(lcons(makeString($1), $2)))));
+ NameListToString(lcons(makeString($1), $2))),
+ scanner_errposition(@1)));
break;
}
+ $$->location = @1;
}
;
else
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("OLD used in query that is not in a rule")));
+ errmsg("OLD used in query that is not in a rule"),
+ scanner_errposition(@1)));
}
| NEW
{
else
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("NEW used in query that is not in a rule")));
+ errmsg("NEW used in query that is not in a rule"),
+ scanner_errposition(@1)));
}
;
else if (list_length(largs) != 2)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("wrong number of parameters on left side of OVERLAPS expression")));
+ errmsg("wrong number of parameters on left side of OVERLAPS expression"),
+ scanner_errposition(location)));
if (list_length(rargs) == 1)
rargs = lappend(rargs, rargs);
else if (list_length(rargs) != 2)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("wrong number of parameters on right side of OVERLAPS expression")));
+ errmsg("wrong number of parameters on right side of OVERLAPS expression"),
+ scanner_errposition(location)));
n->args = list_concat(largs, rargs);
n->agg_star = FALSE;
n->agg_distinct = FALSE;
if (stmt->sortClause)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("multiple ORDER BY clauses not allowed")));
+ errmsg("multiple ORDER BY clauses not allowed"),
+ scanner_errposition(exprLocation((Node *) sortClause))));
stmt->sortClause = sortClause;
}
/* We can handle multiple locking clauses, though */
if (stmt->limitOffset)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("multiple OFFSET clauses not allowed")));
+ errmsg("multiple OFFSET clauses not allowed"),
+ scanner_errposition(exprLocation(limitOffset))));
stmt->limitOffset = limitOffset;
}
if (limitCount)
if (stmt->limitCount)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("multiple LIMIT clauses not allowed")));
+ errmsg("multiple LIMIT clauses not allowed"),
+ scanner_errposition(exprLocation(limitCount))));
stmt->limitCount = limitCount;
}
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.82 2008/08/28 23:09:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.83 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
if (checkExprHasAggs((Node *) agg->args))
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("aggregate function calls cannot be nested")));
+ errmsg("aggregate function calls cannot be nested"),
+ parser_errposition(pstate,
+ locate_agg_of_level((Node *) agg->args, 0))));
}
if (min_varlevel < 0)
if (checkExprHasAggs(qry->jointree->quals))
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("aggregates not allowed in WHERE clause")));
+ errmsg("aggregates not allowed in WHERE clause"),
+ parser_errposition(pstate,
+ locate_agg_of_level(qry->jointree->quals, 0))));
if (checkExprHasAggs((Node *) qry->jointree->fromlist))
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("aggregates not allowed in JOIN conditions")));
+ errmsg("aggregates not allowed in JOIN conditions"),
+ parser_errposition(pstate,
+ locate_agg_of_level((Node *) qry->jointree->fromlist, 0))));
/*
* No aggregates allowed in GROUP BY clauses, either.
if (checkExprHasAggs(expr))
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("aggregates not allowed in GROUP BY clause")));
+ errmsg("aggregates not allowed in GROUP BY clause"),
+ parser_errposition(pstate,
+ locate_agg_of_level(expr, 0))));
groupClauses = lcons(expr, groupClauses);
}
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
errmsg("column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function",
- rte->eref->aliasname, attname)));
+ rte->eref->aliasname, attname),
+ parser_errposition(context->pstate, var->location)));
else
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
errmsg("subquery uses ungrouped column \"%s.%s\" from outer query",
- rte->eref->aliasname, attname)));
-
+ rte->eref->aliasname, attname),
+ parser_errposition(context->pstate, var->location)));
}
if (IsA(node, Query))
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.178 2008/08/30 01:39:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.179 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
Var *l_colvar, Var *r_colvar);
static TargetEntry *findTargetlistEntry(ParseState *pstate, Node *node,
List **tlist, int clause);
+static int get_matching_location(int sortgroupref,
+ List *sortgrouprefs, List *exprs);
static List *addTargetToSortList(ParseState *pstate, TargetEntry *tle,
- List *sortlist, List *targetlist,
- SortByDir sortby_dir, SortByNulls sortby_nulls,
- List *sortby_opname, bool resolveUnknown);
+ List *sortlist, List *targetlist, SortBy *sortby,
+ bool resolveUnknown);
static List *addTargetToGroupList(ParseState *pstate, TargetEntry *tle,
- List *grouplist, List *targetlist,
+ List *grouplist, List *targetlist, int location,
bool resolveUnknown);
* free_parsestate() will eventually do the corresponding heap_close(),
* but *not* release the lock.
*/
- pstate->p_target_relation = heap_openrv(relation, RowExclusiveLock);
+ pstate->p_target_relation = parserOpenTable(pstate, relation,
+ RowExclusiveLock);
/*
* Now build an RTE.
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("JOIN/ON clause refers to \"%s\", which is not part of JOIN",
- rt_fetch(varno, pstate->p_rtable)->eref->aliasname)));
+ rt_fetch(varno, pstate->p_rtable)->eref->aliasname),
+ parser_errposition(pstate,
+ locate_var_of_relation(result, varno, 0))));
}
bms_free(clause_varnos);
/*
* We require user to supply an alias for a subselect, per SQL92. To relax
* this, we'd have to be prepared to gin up a unique alias for an
- * unlabeled subselect.
+ * unlabeled subselect. (This is just elog, not ereport, because the
+ * grammar should have enforced it already.)
*/
if (r->alias == NULL)
- ereport(ERROR,
- (errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("subquery in FROM must have an alias")));
+ elog(ERROR, "subquery in FROM must have an alias");
/*
* Analyze and transform the subquery.
* Check that we got something reasonable. Many of these conditions are
* impossible given restrictions of the grammar, but check 'em anyway.
*/
- if (query->commandType != CMD_SELECT ||
+ if (!IsA(query, Query) ||
+ query->commandType != CMD_SELECT ||
query->utilityStmt != NULL)
- elog(ERROR, "expected SELECT query from subquery in FROM");
- if (query->intoClause != NULL)
+ elog(ERROR, "unexpected non-SELECT command in subquery in FROM");
+ if (query->intoClause)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("subquery in FROM cannot have SELECT INTO")));
+ errmsg("subquery in FROM cannot have SELECT INTO"),
+ parser_errposition(pstate,
+ exprLocation((Node *) query->intoClause))));
/*
* The subquery cannot make use of any variables from FROM items created
if (contain_vars_of_level((Node *) query, 1))
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
- errmsg("subquery in FROM cannot refer to other relations of same query level")));
+ errmsg("subquery in FROM cannot refer to other relations of same query level"),
+ parser_errposition(pstate,
+ locate_var_of_level((Node *) query, 1))));
}
/*
if (contain_vars_of_level(funcexpr, 0))
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
- errmsg("function expression in FROM cannot refer to other relations of same query level")));
+ errmsg("function expression in FROM cannot refer to other relations of same query level"),
+ parser_errposition(pstate,
+ locate_var_of_level(funcexpr, 0))));
}
/*
if (checkExprHasAggs(funcexpr))
ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR),
- errmsg("cannot use aggregate function in function expression in FROM")));
+ errmsg("cannot use aggregate function in function expression in FROM"),
+ parser_errposition(pstate,
+ locate_agg_of_level(funcexpr, 0))));
}
/*
*
* Note: expandRTE returns new lists, safe for me to modify
*/
- expandRTE(l_rte, l_rtindex, 0, false,
+ expandRTE(l_rte, l_rtindex, 0, -1, false,
&l_colnames, &l_colvars);
- expandRTE(r_rte, r_rtindex, 0, false,
+ expandRTE(r_rte, r_rtindex, 0, -1, false,
&r_colnames, &r_colvars);
/*
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
/* translator: %s is name of a SQL construct, eg LIMIT */
errmsg("argument of %s must not contain variables",
- constructName)));
+ constructName),
+ parser_errposition(pstate,
+ locate_var_of_level(qual, 0))));
}
if (checkExprHasAggs(qual))
{
(errcode(ERRCODE_GROUPING_ERROR),
/* translator: %s is name of a SQL construct, eg LIMIT */
errmsg("argument of %s must not contain aggregates",
- constructName)));
+ constructName),
+ parser_errposition(pstate,
+ locate_agg_of_level(qual, 0))));
}
return qual;
if (!found)
result = addTargetToGroupList(pstate, tle,
result, *targetlist,
+ exprLocation(gexpr),
true);
}
targetlist, ORDER_CLAUSE);
sortlist = addTargetToSortList(pstate, tle,
- sortlist, *targetlist,
- sortby->sortby_dir,
- sortby->sortby_nulls,
- sortby->useOp,
+ sortlist, *targetlist, sortby,
resolveUnknown);
}
if (tle->resjunk)
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
- errmsg("for SELECT DISTINCT, ORDER BY expressions must appear in select list")));
+ errmsg("for SELECT DISTINCT, ORDER BY expressions must appear in select list"),
+ parser_errposition(pstate,
+ exprLocation((Node *) tle->expr))));
result = lappend(result, copyObject(scl));
}
continue; /* ignore junk */
result = addTargetToGroupList(pstate, tle,
result, *targetlist,
+ exprLocation((Node *) tle->expr),
true);
}
List **targetlist, List *sortClause)
{
List *result = NIL;
- ListCell *slitem;
- ListCell *dlitem;
- Bitmapset *refnos = NULL;
- int sortgroupref;
+ List *sortgrouprefs = NIL;
bool skipped_sortitem;
+ ListCell *lc;
+ ListCell *lc2;
/*
* Add all the DISTINCT ON expressions to the tlist (if not already
* present, they are added as resjunk items). Assign sortgroupref
- * numbers to them, and form a bitmapset of these numbers. (A
- * bitmapset is convenient here because we don't care about order
- * and we can discard duplicates.)
+ * numbers to them, and make a list of these numbers. (NB: we rely
+ * below on the sortgrouprefs list being one-for-one with the original
+ * distinctlist. Also notice that we could have duplicate DISTINCT ON
+ * expressions and hence duplicate entries in sortgrouprefs.)
*/
- foreach(dlitem, distinctlist)
+ foreach(lc, distinctlist)
{
- Node *dexpr = (Node *) lfirst(dlitem);
+ Node *dexpr = (Node *) lfirst(lc);
+ int sortgroupref;
TargetEntry *tle;
tle = findTargetlistEntry(pstate, dexpr,
targetlist, DISTINCT_ON_CLAUSE);
sortgroupref = assignSortGroupRef(tle, *targetlist);
- refnos = bms_add_member(refnos, sortgroupref);
+ sortgrouprefs = lappend_int(sortgrouprefs, sortgroupref);
}
/*
* skipped an ORDER BY item that wasn't in DISTINCT ON.
*/
skipped_sortitem = false;
- foreach(slitem, sortClause)
+ foreach(lc, sortClause)
{
- SortGroupClause *scl = (SortGroupClause *) lfirst(slitem);
+ SortGroupClause *scl = (SortGroupClause *) lfirst(lc);
- if (bms_is_member(scl->tleSortGroupRef, refnos))
+ if (list_member_int(sortgrouprefs, scl->tleSortGroupRef))
{
if (skipped_sortitem)
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
- errmsg("SELECT DISTINCT ON expressions must match initial ORDER BY expressions")));
+ errmsg("SELECT DISTINCT ON expressions must match initial ORDER BY expressions"),
+ parser_errposition(pstate,
+ get_matching_location(scl->tleSortGroupRef,
+ sortgrouprefs,
+ distinctlist))));
else
result = lappend(result, copyObject(scl));
}
* better to throw an error or warning here. But historically we've
* allowed it, so keep doing so.)
*/
- while ((sortgroupref = bms_first_member(refnos)) >= 0)
+ forboth(lc, distinctlist, lc2, sortgrouprefs)
{
+ Node *dexpr = (Node *) lfirst(lc);
+ int sortgroupref = lfirst_int(lc2);
TargetEntry *tle = get_sortgroupref_tle(sortgroupref, *targetlist);
if (targetIsInSortList(tle, InvalidOid, result))
if (skipped_sortitem)
ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
- errmsg("SELECT DISTINCT ON expressions must match initial ORDER BY expressions")));
+ errmsg("SELECT DISTINCT ON expressions must match initial ORDER BY expressions"),
+ parser_errposition(pstate, exprLocation(dexpr))));
result = addTargetToGroupList(pstate, tle,
result, *targetlist,
+ exprLocation(dexpr),
true);
}
return result;
}
+/*
+ * get_matching_location
+ * Get the exprLocation of the exprs member corresponding to the
+ * (first) member of sortgrouprefs that equals sortgroupref.
+ *
+ * This is used so that we can point at a troublesome DISTINCT ON entry.
+ * (Note that we need to use the original untransformed DISTINCT ON list
+ * item, as whatever TLE it corresponds to will very possibly have a
+ * parse location pointing to some matching entry in the SELECT list
+ * or ORDER BY list.)
+ */
+static int
+get_matching_location(int sortgroupref, List *sortgrouprefs, List *exprs)
+{
+ ListCell *lcs;
+ ListCell *lce;
+
+ forboth(lcs, sortgrouprefs, lce, exprs)
+ {
+ if (lfirst_int(lcs) == sortgroupref)
+ return exprLocation((Node *) lfirst(lce));
+ }
+ /* if no match, caller blew it */
+ elog(ERROR, "get_matching_location: no matching sortgroupref");
+ return -1; /* keep compiler quiet */
+}
+
/*
* addTargetToSortList
* If the given targetlist entry isn't already in the SortGroupClause
*/
static List *
addTargetToSortList(ParseState *pstate, TargetEntry *tle,
- List *sortlist, List *targetlist,
- SortByDir sortby_dir, SortByNulls sortby_nulls,
- List *sortby_opname, bool resolveUnknown)
+ List *sortlist, List *targetlist, SortBy *sortby,
+ bool resolveUnknown)
{
Oid restype = exprType((Node *) tle->expr);
Oid sortop;
Oid eqop;
bool reverse;
+ int location;
+ ParseCallbackState pcbstate;
/* if tlist item is an UNKNOWN literal, change it to TEXT */
if (restype == UNKNOWNOID && resolveUnknown)
restype = TEXTOID;
}
+ /*
+ * Rather than clutter the API of get_sort_group_operators and the other
+ * functions we're about to use, make use of error context callback to
+ * mark any error reports with a parse position. We point to the operator
+ * location if present, else to the expression being sorted. (NB: use
+ * the original untransformed expression here; the TLE entry might well
+ * point at a duplicate expression in the regular SELECT list.)
+ */
+ location = sortby->location;
+ if (location < 0)
+ location = exprLocation(sortby->node);
+ setup_parser_errposition_callback(&pcbstate, pstate, location);
+
/* determine the sortop, eqop, and directionality */
- switch (sortby_dir)
+ switch (sortby->sortby_dir)
{
case SORTBY_DEFAULT:
case SORTBY_ASC:
reverse = true;
break;
case SORTBY_USING:
- Assert(sortby_opname != NIL);
- sortop = compatible_oper_opid(sortby_opname,
+ Assert(sortby->useOp != NIL);
+ sortop = compatible_oper_opid(sortby->useOp,
restype,
restype,
false);
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("operator %s is not a valid ordering operator",
- strVal(llast(sortby_opname))),
+ strVal(llast(sortby->useOp))),
errhint("Ordering operators must be \"<\" or \">\" members of btree operator families.")));
break;
default:
- elog(ERROR, "unrecognized sortby_dir: %d", sortby_dir);
+ elog(ERROR, "unrecognized sortby_dir: %d", sortby->sortby_dir);
sortop = InvalidOid; /* keep compiler quiet */
eqop = InvalidOid;
reverse = false;
break;
}
+ cancel_parser_errposition_callback(&pcbstate);
+
/* avoid making duplicate sortlist entries */
if (!targetIsInSortList(tle, sortop, sortlist))
{
sortcl->eqop = eqop;
sortcl->sortop = sortop;
- switch (sortby_nulls)
+ switch (sortby->sortby_nulls)
{
case SORTBY_NULLS_DEFAULT:
/* NULLS FIRST is default for DESC; other way for ASC */
sortcl->nulls_first = false;
break;
default:
- elog(ERROR, "unrecognized sortby_nulls: %d", sortby_nulls);
+ elog(ERROR, "unrecognized sortby_nulls: %d",
+ sortby->sortby_nulls);
break;
}
* the TLE is considered "already in the list" if it appears there with any
* sorting semantics.
*
+ * location is the parse location to be fingered in event of trouble. Note
+ * that we can't rely on exprLocation(tle->expr), because that might point
+ * to a SELECT item that matches the GROUP BY item; it'd be pretty confusing
+ * to report such a location.
+ *
* If resolveUnknown is TRUE, convert TLEs of type UNKNOWN to TEXT. If not,
* do nothing (which implies the search for an equality operator will fail).
* pstate should be provided if resolveUnknown is TRUE, but can be NULL
*/
static List *
addTargetToGroupList(ParseState *pstate, TargetEntry *tle,
- List *grouplist, List *targetlist,
+ List *grouplist, List *targetlist, int location,
bool resolveUnknown)
{
Oid restype = exprType((Node *) tle->expr);
if (!targetIsInSortList(tle, InvalidOid, grouplist))
{
SortGroupClause *grpcl = makeNode(SortGroupClause);
+ ParseCallbackState pcbstate;
+
+ setup_parser_errposition_callback(&pcbstate, pstate, location);
/* determine the eqop and optional sortop */
get_sort_group_operators(restype,
false, true, false,
&sortop, &eqop, NULL);
+ cancel_parser_errposition_callback(&pcbstate);
+
grpcl->tleSortGroupRef = assignSortGroupRef(tle, targetlist);
grpcl->eqop = eqop;
grpcl->sortop = sortop;
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.165 2008/08/28 23:09:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.166 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
Oid baseTypeId;
int32 baseTypeMod;
Type targetType;
+ ParseCallbackState pcbstate;
/*
* If the target type is a domain, we want to call its base type's
else
newcon->location = location;
+ /*
+ * Set up to point at the constant's text if the input routine
+ * throws an error.
+ */
+ setup_parser_errposition_callback(&pcbstate, pstate, con->location);
+
/*
* We pass typmod -1 to the input routine, primarily because existing
* input routines follow implicit-coercion semantics for length
else
newcon->constvalue = stringTypeDatum(targetType, NULL, -1);
+ cancel_parser_errposition_callback(&pcbstate);
+
result = (Node *) newcon;
/* If target is a domain, apply constraints. */
paramno > toppstate->p_numparams)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_PARAMETER),
- errmsg("there is no parameter $%d", paramno)));
+ errmsg("there is no parameter $%d", paramno),
+ parser_errposition(pstate, param->location)));
if (toppstate->p_paramtypes[paramno - 1] == UNKNOWNOID)
{
paramno),
errdetail("%s versus %s",
format_type_be(toppstate->p_paramtypes[paramno - 1]),
- format_type_be(targetTypeId))));
+ format_type_be(targetTypeId)),
+ parser_errposition(pstate, param->location)));
}
param->paramtype = targetTypeId;
{
int rtindex = ((Var *) node)->varno;
int sublevels_up = ((Var *) node)->varlevelsup;
+ int vlocation = ((Var *) node)->location;
RangeTblEntry *rte;
rte = GetRTEByRangeTablePosn(pstate, rtindex, sublevels_up);
- expandRTE(rte, rtindex, sublevels_up, false,
+ expandRTE(rte, rtindex, sublevels_up, vlocation, false,
NULL, &args);
}
else
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.233 2008/08/30 01:39:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.234 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
A_Const *con = (A_Const *) expr;
Value *val = &con->val;
- result = (Node *) make_const(val, con->location);
+ result = (Node *) make_const(pstate, val, con->location);
break;
}
* "rel.*".
*/
if (refnameRangeTblEntry(pstate, NULL, name1,
+ cref->location,
&levels_up) != NULL)
node = transformWholeRowRef(pstate, NULL, name1,
cref->location);
* return a pointer to it.
*/
static Oid *
-find_param_type(ParseState *pstate, int paramno)
+find_param_type(ParseState *pstate, int paramno, int location)
{
Oid *result;
if (paramno <= 0) /* probably can't happen? */
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_PARAMETER),
- errmsg("there is no parameter $%d", paramno)));
+ errmsg("there is no parameter $%d", paramno),
+ parser_errposition(pstate, location)));
if (paramno > pstate->p_numparams)
{
if (!pstate->p_variableparams)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_PARAMETER),
- errmsg("there is no parameter $%d",
- paramno)));
+ errmsg("there is no parameter $%d", paramno),
+ parser_errposition(pstate, location)));
/* Okay to enlarge param array */
if (pstate->p_paramtypes)
pstate->p_paramtypes = (Oid *) repalloc(pstate->p_paramtypes,
transformParamRef(ParseState *pstate, ParamRef *pref)
{
int paramno = pref->number;
- Oid *pptype = find_param_type(pstate, paramno);
+ Oid *pptype = find_param_type(pstate, paramno, pref->location);
Param *param;
param = makeNode(Param);
pstate->p_hasSubLinks = true;
qtree = parse_sub_analyze(sublink->subselect, pstate);
- if (qtree->commandType != CMD_SELECT ||
- qtree->utilityStmt != NULL ||
- qtree->intoClause != NULL)
- elog(ERROR, "bad query in sub-select");
+
+ /*
+ * Check that we got something reasonable. Many of these conditions are
+ * impossible given restrictions of the grammar, but check 'em anyway.
+ */
+ if (!IsA(qtree, Query) ||
+ qtree->commandType != CMD_SELECT ||
+ qtree->utilityStmt != NULL)
+ elog(ERROR, "unexpected non-SELECT command in SubLink");
+ if (qtree->intoClause)
+ ereport(ERROR,
+ (errcode(ERRCODE_SYNTAX_ERROR),
+ errmsg("subquery cannot have SELECT INTO"),
+ parser_errposition(pstate,
+ exprLocation((Node *) qtree->intoClause))));
+
sublink->subselect = (Node *) qtree;
if (sublink->subLinkType == EXISTS_SUBLINK)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("could not find element type for data type %s",
- format_type_be(array_type))));
+ format_type_be(array_type)),
+ parser_errposition(pstate, a->location)));
}
else
{
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("could not find array type for data type %s",
- format_type_be(element_type))));
+ format_type_be(element_type)),
+ parser_errposition(pstate, a->location)));
}
coerce_hard = false;
}
/* If a parameter is used, it must be of type REFCURSOR */
if (cexpr->cursor_name == NULL)
{
- Oid *pptype = find_param_type(pstate, cexpr->cursor_param);
+ Oid *pptype = find_param_type(pstate, cexpr->cursor_param, -1);
if (pstate->p_variableparams && *pptype == UNKNOWNOID)
{
/* Look up the referenced RTE, creating it if needed */
- rte = refnameRangeTblEntry(pstate, schemaname, relname,
+ rte = refnameRangeTblEntry(pstate, schemaname, relname, location,
&sublevels_up);
if (rte == NULL)
- rte = addImplicitRTE(pstate, makeRangeVar(schemaname, relname),
- location);
+ rte = addImplicitRTE(pstate,
+ makeRangeVar(schemaname, relname, location));
vnum = RTERangeTablePosn(pstate, rte, &sublevels_up);
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.206 2008/08/28 23:09:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.207 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("could not find array type for data type %s",
- format_type_be(newa->element_typeid))));
+ format_type_be(newa->element_typeid)),
+ parser_errposition(pstate, exprLocation((Node *) vargs))));
newa->multidims = false;
newa->location = exprLocation((Node *) vargs);
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.102 2008/08/28 23:09:47 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.103 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#include "utils/varbit.h"
+static void pcb_error_callback(void *arg);
+
+
/*
* make_parsestate
* Allocate and initialize a new ParseState.
}
+/*
+ * setup_parser_errposition_callback
+ * Arrange for non-parser errors to report an error position
+ *
+ * Sometimes the parser calls functions that aren't part of the parser
+ * subsystem and can't reasonably be passed a ParseState; yet we would
+ * like any errors thrown in those functions to be tagged with a parse
+ * error location. Use this function to set up an error context stack
+ * entry that will accomplish that. Usage pattern:
+ *
+ * declare a local variable "ParseCallbackState pcbstate"
+ * ...
+ * setup_parser_errposition_callback(&pcbstate, pstate, location);
+ * call function that might throw error;
+ * cancel_parser_errposition_callback(&pcbstate);
+ */
+void
+setup_parser_errposition_callback(ParseCallbackState *pcbstate,
+ ParseState *pstate, int location)
+{
+ /* Setup error traceback support for ereport() */
+ pcbstate->pstate = pstate;
+ pcbstate->location = location;
+ pcbstate->errcontext.callback = pcb_error_callback;
+ pcbstate->errcontext.arg = (void *) pcbstate;
+ pcbstate->errcontext.previous = error_context_stack;
+ error_context_stack = &pcbstate->errcontext;
+}
+
+/*
+ * Cancel a previously-set-up errposition callback.
+ */
+void
+cancel_parser_errposition_callback(ParseCallbackState *pcbstate)
+{
+ /* Pop the error context stack */
+ error_context_stack = pcbstate->errcontext.previous;
+}
+
+/*
+ * Error context callback for inserting parser error location.
+ *
+ * Note that this will be called for *any* error occurring while the
+ * callback is installed. We avoid inserting an irrelevant error location
+ * if the error is a query cancel --- are there any other important cases?
+ */
+static void
+pcb_error_callback(void *arg)
+{
+ ParseCallbackState *pcbstate = (ParseCallbackState *) arg;
+
+ if (geterrcode() != ERRCODE_QUERY_CANCELED)
+ (void) parser_errposition(pcbstate->pstate, pcbstate->location);
+}
+
+
/*
* make_var
* Build a Var node for an attribute identified by RTE and attrno
* too many examples that fail if we try.
*/
Const *
-make_const(Value *value, int location)
+make_const(ParseState *pstate, Value *value, int location)
{
+ Const *con;
Datum val;
int64 val64;
Oid typeid;
int typelen;
bool typebyval;
- Const *con;
+ ParseCallbackState pcbstate;
switch (nodeTag(value))
{
}
else
{
+ /* arrange to report location if numeric_in() fails */
+ setup_parser_errposition_callback(&pcbstate, pstate, location);
val = DirectFunctionCall3(numeric_in,
CStringGetDatum(strVal(value)),
ObjectIdGetDatum(InvalidOid),
Int32GetDatum(-1));
+ cancel_parser_errposition_callback(&pcbstate);
typeid = NUMERICOID;
typelen = -1; /* variable len */
break;
case T_BitString:
+ /* arrange to report location if bit_in() fails */
+ setup_parser_errposition_callback(&pcbstate, pstate, location);
val = DirectFunctionCall3(bit_in,
CStringGetDatum(strVal(value)),
ObjectIdGetDatum(InvalidOid),
Int32GetDatum(-1));
+ cancel_parser_errposition_callback(&pcbstate);
typeid = BITOID;
typelen = -1;
typebyval = false;
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.134 2008/08/28 23:09:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.135 2008/09/01 20:42:44 tgl Exp $
*
*-------------------------------------------------------------------------
*/
bool add_missing_from;
static RangeTblEntry *scanNameSpaceForRefname(ParseState *pstate,
- const char *refname);
-static RangeTblEntry *scanNameSpaceForRelid(ParseState *pstate, Oid relid);
+ const char *refname, int location);
+static RangeTblEntry *scanNameSpaceForRelid(ParseState *pstate, Oid relid,
+ int location);
static bool isLockedRel(ParseState *pstate, char *refname);
static void expandRelation(Oid relid, Alias *eref,
int rtindex, int sublevels_up,
- bool include_dropped,
+ int location, bool include_dropped,
List **colnames, List **colvars);
static void expandTupleDesc(TupleDesc tupdesc, Alias *eref,
int rtindex, int sublevels_up,
- bool include_dropped,
+ int location, bool include_dropped,
List **colnames, List **colvars);
static int specialAttNum(const char *attname);
-static void warnAutoRange(ParseState *pstate, RangeVar *relation,
- int location);
+static void warnAutoRange(ParseState *pstate, RangeVar *relation);
/*
refnameRangeTblEntry(ParseState *pstate,
const char *schemaname,
const char *refname,
+ int location,
int *sublevels_up)
{
Oid relId = InvalidOid;
RangeTblEntry *result;
if (OidIsValid(relId))
- result = scanNameSpaceForRelid(pstate, relId);
+ result = scanNameSpaceForRelid(pstate, relId, location);
else
- result = scanNameSpaceForRefname(pstate, refname);
+ result = scanNameSpaceForRefname(pstate, refname, location);
if (result)
return result;
* if no match. Raise error if multiple matches.
*/
static RangeTblEntry *
-scanNameSpaceForRefname(ParseState *pstate, const char *refname)
+scanNameSpaceForRefname(ParseState *pstate, const char *refname, int location)
{
RangeTblEntry *result = NULL;
ListCell *l;
ereport(ERROR,
(errcode(ERRCODE_AMBIGUOUS_ALIAS),
errmsg("table reference \"%s\" is ambiguous",
- refname)));
+ refname),
+ parser_errposition(pstate, location)));
result = rte;
}
}
* acts the way it does.
*/
static RangeTblEntry *
-scanNameSpaceForRelid(ParseState *pstate, Oid relid)
+scanNameSpaceForRelid(ParseState *pstate, Oid relid, int location)
{
RangeTblEntry *result = NULL;
ListCell *l;
ereport(ERROR,
(errcode(ERRCODE_AMBIGUOUS_ALIAS),
errmsg("table reference %u is ambiguous",
- relid)));
+ relid),
+ parser_errposition(pstate, location)));
result = rte;
}
}
RangeTblEntry *rte;
int sublevels_up;
- rte = refnameRangeTblEntry(pstate, schemaname, refname, &sublevels_up);
+ rte = refnameRangeTblEntry(pstate, schemaname, refname, location,
+ &sublevels_up);
if (rte == NULL)
{
if (!implicitRTEOK)
return NULL;
- rte = addImplicitRTE(pstate, makeRangeVar(schemaname, refname),
- location);
+ rte = addImplicitRTE(pstate,
+ makeRangeVar(schemaname, refname, location));
}
return scanRTEForColumn(pstate, rte, colname, location);
eref->colnames = list_make1(makeString(eref->aliasname));
}
+/*
+ * Open a table during parse analysis
+ *
+ * This is essentially just the same as heap_openrv(), except that it
+ * arranges to include the RangeVar's parse location in any resulting error.
+ *
+ * Note: properly, lockmode should be declared LOCKMODE not int, but that
+ * would require importing storage/lock.h into parse_relation.h. Since
+ * LOCKMODE is typedef'd as int anyway, that seems like overkill.
+ */
+Relation
+parserOpenTable(ParseState *pstate, const RangeVar *relation, int lockmode)
+{
+ Relation rel;
+ ParseCallbackState pcbstate;
+
+ setup_parser_errposition_callback(&pcbstate, pstate, relation->location);
+ rel = heap_openrv(relation, lockmode);
+ cancel_parser_errposition_callback(&pcbstate);
+ return rel;
+}
+
/*
* Add an entry for a relation to the pstate's range table (p_rtable).
*
* depending on whether we're doing SELECT FOR UPDATE/SHARE.
*/
lockmode = isLockedRel(pstate, refname) ? RowShareLock : AccessShareLock;
- rel = heap_openrv(relation, lockmode);
+ rel = parserOpenTable(pstate, relation, lockmode);
rte->relid = RelationGetRelid(rel);
/*
if (functypclass != TYPEFUNC_RECORD)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("a column definition list is only allowed for functions returning \"record\"")));
+ errmsg("a column definition list is only allowed for functions returning \"record\""),
+ parser_errposition(pstate, exprLocation(funcexpr))));
}
else
{
if (functypclass == TYPEFUNC_RECORD)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("a column definition list is required for functions returning \"record\"")));
+ errmsg("a column definition list is required for functions returning \"record\""),
+ parser_errposition(pstate, exprLocation(funcexpr))));
}
if (functypclass == TYPEFUNC_COMPOSITE)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
errmsg("column \"%s\" cannot be declared SETOF",
- attrname)));
+ attrname),
+ parser_errposition(pstate, n->typename->location)));
attrtype = typenameTypeId(pstate, n->typename, &attrtypmod);
eref->colnames = lappend(eref->colnames, makeString(attrname));
rte->funccoltypes = lappend_oid(rte->funccoltypes, attrtype);
projects / users / gsingh / postgres.git / commitdiff