Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c856cd1

Browse files
committed
remove unnecessary code, fix tests
1 parent 7d1bf40 commit c856cd1

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

expected/pathman_expressions.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,32 +109,32 @@ SELECT add_to_pathman_config('test_exprs.composite',
109109
(1 row)
110110

111111
SELECT add_range_partition('test_exprs.composite',
112-
'(1, ''a'')'::test_exprs.composite,
113-
'(10, ''a'')'::test_exprs.composite);
112+
'(1,a)'::test_exprs.composite,
113+
'(10,a)'::test_exprs.composite);
114114
add_range_partition
115115
------------------------
116116
test_exprs.composite_1
117117
(1 row)
118118

119119
SELECT add_range_partition('test_exprs.composite',
120-
'(10, ''a'')'::test_exprs.composite,
121-
'(20, ''a'')'::test_exprs.composite);
120+
'(10,a)'::test_exprs.composite,
121+
'(20,a)'::test_exprs.composite);
122122
add_range_partition
123123
------------------------
124124
test_exprs.composite_2
125125
(1 row)
126126

127127
SELECT add_range_partition('test_exprs.composite',
128-
'(20, ''a'')'::test_exprs.composite,
129-
'(30, ''a'')'::test_exprs.composite);
128+
'(20,a)'::test_exprs.composite,
129+
'(30,a)'::test_exprs.composite);
130130
add_range_partition
131131
------------------------
132132
test_exprs.composite_3
133133
(1 row)
134134

135135
SELECT add_range_partition('test_exprs.composite',
136-
'(30, ''a'')'::test_exprs.composite,
137-
'(40, ''a'')'::test_exprs.composite);
136+
'(30,a)'::test_exprs.composite,
137+
'(40,a)'::test_exprs.composite);
138138
add_range_partition
139139
------------------------
140140
test_exprs.composite_4

sql/pathman_expressions.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ SELECT add_to_pathman_config('test_exprs.composite',
4343
'(a, b)::test_exprs.composite',
4444
NULL);
4545
SELECT add_range_partition('test_exprs.composite',
46-
'(1, ''a'')'::test_exprs.composite,
47-
'(10, ''a'')'::test_exprs.composite);
46+
'(1,a)'::test_exprs.composite,
47+
'(10,a)'::test_exprs.composite);
4848
SELECT add_range_partition('test_exprs.composite',
49-
'(10, ''a'')'::test_exprs.composite,
50-
'(20, ''a'')'::test_exprs.composite);
49+
'(10,a)'::test_exprs.composite,
50+
'(20,a)'::test_exprs.composite);
5151
SELECT add_range_partition('test_exprs.composite',
52-
'(20, ''a'')'::test_exprs.composite,
53-
'(30, ''a'')'::test_exprs.composite);
52+
'(20,a)'::test_exprs.composite,
53+
'(30,a)'::test_exprs.composite);
5454
SELECT add_range_partition('test_exprs.composite',
55-
'(30, ''a'')'::test_exprs.composite,
56-
'(40, ''a'')'::test_exprs.composite);
55+
'(30,a)'::test_exprs.composite,
56+
'(40,a)'::test_exprs.composite);
5757
SELECT expr FROM pathman_config; /* check expression */
5858
INSERT INTO test_exprs.composite VALUES(2, 'a');
5959
INSERT INTO test_exprs.composite VALUES(11, 'a');

src/pg_pathman.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,7 @@ ExtractConst(Node *node, const WalkerContext *context)
184184
break;
185185

186186
default:
187-
{
188-
/* Keep compiler happy */
189-
typid = InvalidOid;
190-
typmod = - 1;
191-
collid = InvalidOid;
192-
193-
elog(ERROR, "error in function " CppAsString(ExtractConst));
194-
}
195-
break;
187+
elog(ERROR, "error in function " CppAsString(ExtractConst));;
196188
}
197189

198190
return makeConst(typid, typmod, collid, get_typlen(typid),

0 commit comments

Comments
 (0)