@@ -144,23 +144,22 @@ IsConstValue(Node *node, const WalkerContext *context)
144144static Const *
145145ExtractConst (Node * node ,const WalkerContext * context )
146146{
147- ExprState * estate ;
147+ ExprState * estate ;
148+ ExprContext * econtext = context -> econtext ;
148149
149- Datum value ;
150- bool isnull ;
150+ Datum value ;
151+ bool isnull ;
151152
152- Oid typid ,
153- collid ;
154- int typmod ;
153+ Oid typid ,
154+ collid ;
155+ int typmod ;
155156
156157/* Fast path for Consts */
157158if (IsA (node ,Const ))
158159return (Const * )node ;
159160
160- /* Evaluate expression */
161- estate = ExecInitExpr ((Expr * )node ,NULL );
162- value = ExecEvalExprCompat (estate ,context -> econtext ,& isnull ,
163- mult_result_handler );
161+ /* Just a paranoid check */
162+ Assert (IsConstValue (node ,context ));
164163
165164switch (nodeTag (node ))
166165{
@@ -171,6 +170,9 @@ ExtractConst(Node *node, const WalkerContext *context)
171170typid = param -> paramtype ;
172171typmod = param -> paramtypmod ;
173172collid = param -> paramcollid ;
173+
174+ /* It must be provided */
175+ Assert (WcxtHasExprContext (context ));
174176}
175177break ;
176178
@@ -179,15 +181,33 @@ ExtractConst(Node *node, const WalkerContext *context)
179181RowExpr * row = (RowExpr * )node ;
180182
181183typid = row -> row_typeid ;
182- typmod = - 1 ;
184+ typmod = -1 ;
183185collid = InvalidOid ;
186+
187+ #if PG_VERSION_NUM >=100000
188+ /* If there's no context - create it! */
189+ if (!WcxtHasExprContext (context ))
190+ econtext = CreateStandaloneExprContext ();
191+ #endif
184192}
185193break ;
186194
187195default :
188- elog (ERROR ,"error in function " CppAsString (ExtractConst ));;
196+ elog (ERROR ,"error in function " CppAsString (ExtractConst ));
189197}
190198
199+ /* Evaluate expression */
200+ estate = ExecInitExpr ((Expr * )node ,NULL );
201+ value = ExecEvalExprCompat (estate ,econtext ,& isnull ,
202+ mult_result_handler );
203+
204+ #if PG_VERSION_NUM >=100000
205+ /* Free temp econtext if needed */
206+ if (econtext && !WcxtHasExprContext (context ))
207+ FreeExprContext (econtext , true);
208+ #endif
209+
210+ /* Finally return Const */
191211return makeConst (typid ,typmod ,collid ,get_typlen (typid ),
192212value ,isnull ,get_typbyval (typid ));
193213}