Improve parsetree representation of special functions such as CURRENT_DATE.
We implement a dozen or so parameterless functions that the SQL standard defines special syntax for. Up to now, that was done by converting them into more or less ad-hoc constructs such as "'now'::text::date". That's messy for multiple reasons: it exposes what should be implementation details to users, and performance is worse than it needs to be in several cases. To improve matters, invent a new expression node type SQLValueFunction that can represent any of these parameterless functions. Bump catversion because this changes stored parsetrees for rules. Discussion: <30058.1463091294@sss.pgh.pa.us>
This commit is contained in:
parent
4bc4cfe3bd
commit
0bb51aa967
|
@ -2632,6 +2632,15 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
|
||||||
JumbleExpr(jstate, (Node *) mmexpr->args);
|
JumbleExpr(jstate, (Node *) mmexpr->args);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
{
|
||||||
|
SQLValueFunction *svf = (SQLValueFunction *) node;
|
||||||
|
|
||||||
|
APP_JUMB(svf->op);
|
||||||
|
/* type is fully determined by op */
|
||||||
|
APP_JUMB(svf->typmod);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
{
|
{
|
||||||
XmlExpr *xexpr = (XmlExpr *) node;
|
XmlExpr *xexpr = (XmlExpr *) node;
|
||||||
|
|
|
@ -53,8 +53,10 @@
|
||||||
#include "pgstat.h"
|
#include "pgstat.h"
|
||||||
#include "utils/acl.h"
|
#include "utils/acl.h"
|
||||||
#include "utils/builtins.h"
|
#include "utils/builtins.h"
|
||||||
|
#include "utils/date.h"
|
||||||
#include "utils/lsyscache.h"
|
#include "utils/lsyscache.h"
|
||||||
#include "utils/memutils.h"
|
#include "utils/memutils.h"
|
||||||
|
#include "utils/timestamp.h"
|
||||||
#include "utils/typcache.h"
|
#include "utils/typcache.h"
|
||||||
#include "utils/xml.h"
|
#include "utils/xml.h"
|
||||||
|
|
||||||
|
@ -147,6 +149,9 @@ static Datum ExecEvalCoalesce(CoalesceExprState *coalesceExpr,
|
||||||
static Datum ExecEvalMinMax(MinMaxExprState *minmaxExpr,
|
static Datum ExecEvalMinMax(MinMaxExprState *minmaxExpr,
|
||||||
ExprContext *econtext,
|
ExprContext *econtext,
|
||||||
bool *isNull, ExprDoneCond *isDone);
|
bool *isNull, ExprDoneCond *isDone);
|
||||||
|
static Datum ExecEvalSQLValueFunction(ExprState *svfExpr,
|
||||||
|
ExprContext *econtext,
|
||||||
|
bool *isNull, ExprDoneCond *isDone);
|
||||||
static Datum ExecEvalXml(XmlExprState *xmlExpr, ExprContext *econtext,
|
static Datum ExecEvalXml(XmlExprState *xmlExpr, ExprContext *econtext,
|
||||||
bool *isNull, ExprDoneCond *isDone);
|
bool *isNull, ExprDoneCond *isDone);
|
||||||
static Datum ExecEvalNullIf(FuncExprState *nullIfExpr,
|
static Datum ExecEvalNullIf(FuncExprState *nullIfExpr,
|
||||||
|
@ -3530,6 +3535,75 @@ ExecEvalMinMax(MinMaxExprState *minmaxExpr, ExprContext *econtext,
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ----------------------------------------------------------------
|
||||||
|
* ExecEvalSQLValueFunction
|
||||||
|
* ----------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
static Datum
|
||||||
|
ExecEvalSQLValueFunction(ExprState *svfExpr,
|
||||||
|
ExprContext *econtext,
|
||||||
|
bool *isNull, ExprDoneCond *isDone)
|
||||||
|
{
|
||||||
|
Datum result = (Datum) 0;
|
||||||
|
SQLValueFunction *svf = (SQLValueFunction *) svfExpr->expr;
|
||||||
|
FunctionCallInfoData fcinfo;
|
||||||
|
|
||||||
|
if (isDone)
|
||||||
|
*isDone = ExprSingleResult;
|
||||||
|
*isNull = false;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note: current_schema() can return NULL. current_user() etc currently
|
||||||
|
* cannot, but might as well code those cases the same way for safety.
|
||||||
|
*/
|
||||||
|
switch (svf->op)
|
||||||
|
{
|
||||||
|
case SVFOP_CURRENT_DATE:
|
||||||
|
result = DateADTGetDatum(GetSQLCurrentDate());
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIME:
|
||||||
|
case SVFOP_CURRENT_TIME_N:
|
||||||
|
result = TimeTzADTPGetDatum(GetSQLCurrentTime(svf->typmod));
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP:
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP_N:
|
||||||
|
result = TimestampTzGetDatum(GetSQLCurrentTimestamp(svf->typmod));
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIME:
|
||||||
|
case SVFOP_LOCALTIME_N:
|
||||||
|
result = TimeADTGetDatum(GetSQLLocalTime(svf->typmod));
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIMESTAMP:
|
||||||
|
case SVFOP_LOCALTIMESTAMP_N:
|
||||||
|
result = TimestampGetDatum(GetSQLLocalTimestamp(svf->typmod));
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_ROLE:
|
||||||
|
case SVFOP_CURRENT_USER:
|
||||||
|
case SVFOP_USER:
|
||||||
|
InitFunctionCallInfoData(fcinfo, NULL, 0, InvalidOid, NULL, NULL);
|
||||||
|
result = current_user(&fcinfo);
|
||||||
|
*isNull = fcinfo.isnull;
|
||||||
|
break;
|
||||||
|
case SVFOP_SESSION_USER:
|
||||||
|
InitFunctionCallInfoData(fcinfo, NULL, 0, InvalidOid, NULL, NULL);
|
||||||
|
result = session_user(&fcinfo);
|
||||||
|
*isNull = fcinfo.isnull;
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_CATALOG:
|
||||||
|
InitFunctionCallInfoData(fcinfo, NULL, 0, InvalidOid, NULL, NULL);
|
||||||
|
result = current_database(&fcinfo);
|
||||||
|
*isNull = fcinfo.isnull;
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_SCHEMA:
|
||||||
|
InitFunctionCallInfoData(fcinfo, NULL, 0, InvalidOid, NULL, NULL);
|
||||||
|
result = current_schema(&fcinfo);
|
||||||
|
*isNull = fcinfo.isnull;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/* ----------------------------------------------------------------
|
/* ----------------------------------------------------------------
|
||||||
* ExecEvalXml
|
* ExecEvalXml
|
||||||
* ----------------------------------------------------------------
|
* ----------------------------------------------------------------
|
||||||
|
@ -5086,6 +5160,10 @@ ExecInitExpr(Expr *node, PlanState *parent)
|
||||||
state = (ExprState *) mstate;
|
state = (ExprState *) mstate;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
state = (ExprState *) makeNode(ExprState);
|
||||||
|
state->evalfunc = ExecEvalSQLValueFunction;
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
{
|
{
|
||||||
XmlExpr *xexpr = (XmlExpr *) node;
|
XmlExpr *xexpr = (XmlExpr *) node;
|
||||||
|
|
|
@ -1752,6 +1752,22 @@ _copyMinMaxExpr(const MinMaxExpr *from)
|
||||||
return newnode;
|
return newnode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* _copySQLValueFunction
|
||||||
|
*/
|
||||||
|
static SQLValueFunction *
|
||||||
|
_copySQLValueFunction(const SQLValueFunction *from)
|
||||||
|
{
|
||||||
|
SQLValueFunction *newnode = makeNode(SQLValueFunction);
|
||||||
|
|
||||||
|
COPY_SCALAR_FIELD(op);
|
||||||
|
COPY_SCALAR_FIELD(type);
|
||||||
|
COPY_SCALAR_FIELD(typmod);
|
||||||
|
COPY_LOCATION_FIELD(location);
|
||||||
|
|
||||||
|
return newnode;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* _copyXmlExpr
|
* _copyXmlExpr
|
||||||
*/
|
*/
|
||||||
|
@ -4525,6 +4541,9 @@ copyObject(const void *from)
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
retval = _copyMinMaxExpr(from);
|
retval = _copyMinMaxExpr(from);
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
retval = _copySQLValueFunction(from);
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
retval = _copyXmlExpr(from);
|
retval = _copyXmlExpr(from);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -619,6 +619,17 @@ _equalMinMaxExpr(const MinMaxExpr *a, const MinMaxExpr *b)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
_equalSQLValueFunction(const SQLValueFunction *a, const SQLValueFunction *b)
|
||||||
|
{
|
||||||
|
COMPARE_SCALAR_FIELD(op);
|
||||||
|
COMPARE_SCALAR_FIELD(type);
|
||||||
|
COMPARE_SCALAR_FIELD(typmod);
|
||||||
|
COMPARE_LOCATION_FIELD(location);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
_equalXmlExpr(const XmlExpr *a, const XmlExpr *b)
|
_equalXmlExpr(const XmlExpr *a, const XmlExpr *b)
|
||||||
{
|
{
|
||||||
|
@ -2842,6 +2853,9 @@ equal(const void *a, const void *b)
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
retval = _equalMinMaxExpr(a, b);
|
retval = _equalMinMaxExpr(a, b);
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
retval = _equalSQLValueFunction(a, b);
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
retval = _equalXmlExpr(a, b);
|
retval = _equalXmlExpr(a, b);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -218,6 +218,9 @@ exprType(const Node *expr)
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
type = ((const MinMaxExpr *) expr)->minmaxtype;
|
type = ((const MinMaxExpr *) expr)->minmaxtype;
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
type = ((const SQLValueFunction *) expr)->type;
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
if (((const XmlExpr *) expr)->op == IS_DOCUMENT)
|
if (((const XmlExpr *) expr)->op == IS_DOCUMENT)
|
||||||
type = BOOLOID;
|
type = BOOLOID;
|
||||||
|
@ -479,6 +482,8 @@ exprTypmod(const Node *expr)
|
||||||
return typmod;
|
return typmod;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
return ((const SQLValueFunction *) expr)->typmod;
|
||||||
case T_CoerceToDomain:
|
case T_CoerceToDomain:
|
||||||
return ((const CoerceToDomain *) expr)->resulttypmod;
|
return ((const CoerceToDomain *) expr)->resulttypmod;
|
||||||
case T_CoerceToDomainValue:
|
case T_CoerceToDomainValue:
|
||||||
|
@ -718,6 +723,8 @@ expression_returns_set_walker(Node *node, void *context)
|
||||||
return false;
|
return false;
|
||||||
if (IsA(node, MinMaxExpr))
|
if (IsA(node, MinMaxExpr))
|
||||||
return false;
|
return false;
|
||||||
|
if (IsA(node, SQLValueFunction))
|
||||||
|
return false;
|
||||||
if (IsA(node, XmlExpr))
|
if (IsA(node, XmlExpr))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -883,6 +890,9 @@ exprCollation(const Node *expr)
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
coll = ((const MinMaxExpr *) expr)->minmaxcollid;
|
coll = ((const MinMaxExpr *) expr)->minmaxcollid;
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
coll = InvalidOid; /* all cases return non-collatable types */
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1091,6 +1101,9 @@ exprSetCollation(Node *expr, Oid collation)
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
((MinMaxExpr *) expr)->minmaxcollid = collation;
|
((MinMaxExpr *) expr)->minmaxcollid = collation;
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
Assert(!OidIsValid(collation)); /* no collatable results */
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
Assert((((XmlExpr *) expr)->op == IS_XMLSERIALIZE) ?
|
Assert((((XmlExpr *) expr)->op == IS_XMLSERIALIZE) ?
|
||||||
(collation == DEFAULT_COLLATION_OID) :
|
(collation == DEFAULT_COLLATION_OID) :
|
||||||
|
@ -1364,6 +1377,10 @@ exprLocation(const Node *expr)
|
||||||
/* GREATEST/LEAST keyword should always be the first thing */
|
/* GREATEST/LEAST keyword should always be the first thing */
|
||||||
loc = ((const MinMaxExpr *) expr)->location;
|
loc = ((const MinMaxExpr *) expr)->location;
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
/* function keyword should always be the first thing */
|
||||||
|
loc = ((const SQLValueFunction *) expr)->location;
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
{
|
{
|
||||||
const XmlExpr *xexpr = (const XmlExpr *) expr;
|
const XmlExpr *xexpr = (const XmlExpr *) expr;
|
||||||
|
@ -1633,9 +1650,10 @@ set_sa_opfuncid(ScalarArrayOpExpr *opexpr)
|
||||||
* for themselves, in case additional checks should be made, or because they
|
* for themselves, in case additional checks should be made, or because they
|
||||||
* have special rules about which parts of the tree need to be visited.
|
* have special rules about which parts of the tree need to be visited.
|
||||||
*
|
*
|
||||||
* Note: we ignore MinMaxExpr, XmlExpr, and CoerceToDomain nodes, because they
|
* Note: we ignore MinMaxExpr, SQLValueFunction, XmlExpr, and CoerceToDomain
|
||||||
* do not contain SQL function OIDs. However, they can invoke SQL-visible
|
* nodes, because they do not contain SQL function OIDs. However, they can
|
||||||
* functions, so callers should take thought about how to treat them.
|
* invoke SQL-visible functions, so callers should take thought about how to
|
||||||
|
* treat them.
|
||||||
*/
|
*/
|
||||||
bool
|
bool
|
||||||
check_functions_in_node(Node *node, check_function_callback checker,
|
check_functions_in_node(Node *node, check_function_callback checker,
|
||||||
|
@ -1859,6 +1877,7 @@ expression_tree_walker(Node *node,
|
||||||
case T_CaseTestExpr:
|
case T_CaseTestExpr:
|
||||||
case T_SetToDefault:
|
case T_SetToDefault:
|
||||||
case T_CurrentOfExpr:
|
case T_CurrentOfExpr:
|
||||||
|
case T_SQLValueFunction:
|
||||||
case T_RangeTblRef:
|
case T_RangeTblRef:
|
||||||
case T_SortGroupClause:
|
case T_SortGroupClause:
|
||||||
/* primitive node types with no expression subnodes */
|
/* primitive node types with no expression subnodes */
|
||||||
|
@ -2433,6 +2452,7 @@ expression_tree_mutator(Node *node,
|
||||||
case T_CaseTestExpr:
|
case T_CaseTestExpr:
|
||||||
case T_SetToDefault:
|
case T_SetToDefault:
|
||||||
case T_CurrentOfExpr:
|
case T_CurrentOfExpr:
|
||||||
|
case T_SQLValueFunction:
|
||||||
case T_RangeTblRef:
|
case T_RangeTblRef:
|
||||||
case T_SortGroupClause:
|
case T_SortGroupClause:
|
||||||
return (Node *) copyObject(node);
|
return (Node *) copyObject(node);
|
||||||
|
@ -3197,6 +3217,7 @@ raw_expression_tree_walker(Node *node,
|
||||||
{
|
{
|
||||||
case T_SetToDefault:
|
case T_SetToDefault:
|
||||||
case T_CurrentOfExpr:
|
case T_CurrentOfExpr:
|
||||||
|
case T_SQLValueFunction:
|
||||||
case T_Integer:
|
case T_Integer:
|
||||||
case T_Float:
|
case T_Float:
|
||||||
case T_String:
|
case T_String:
|
||||||
|
|
|
@ -1423,6 +1423,17 @@ _outMinMaxExpr(StringInfo str, const MinMaxExpr *node)
|
||||||
WRITE_LOCATION_FIELD(location);
|
WRITE_LOCATION_FIELD(location);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_outSQLValueFunction(StringInfo str, const SQLValueFunction *node)
|
||||||
|
{
|
||||||
|
WRITE_NODE_TYPE("SQLVALUEFUNCTION");
|
||||||
|
|
||||||
|
WRITE_ENUM_FIELD(op, SQLValueFunctionOp);
|
||||||
|
WRITE_OID_FIELD(type);
|
||||||
|
WRITE_INT_FIELD(typmod);
|
||||||
|
WRITE_LOCATION_FIELD(location);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_outXmlExpr(StringInfo str, const XmlExpr *node)
|
_outXmlExpr(StringInfo str, const XmlExpr *node)
|
||||||
{
|
{
|
||||||
|
@ -3522,6 +3533,9 @@ outNode(StringInfo str, const void *obj)
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
_outMinMaxExpr(str, obj);
|
_outMinMaxExpr(str, obj);
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
_outSQLValueFunction(str, obj);
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
_outXmlExpr(str, obj);
|
_outXmlExpr(str, obj);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1041,6 +1041,22 @@ _readMinMaxExpr(void)
|
||||||
READ_DONE();
|
READ_DONE();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* _readSQLValueFunction
|
||||||
|
*/
|
||||||
|
static SQLValueFunction *
|
||||||
|
_readSQLValueFunction(void)
|
||||||
|
{
|
||||||
|
READ_LOCALS(SQLValueFunction);
|
||||||
|
|
||||||
|
READ_ENUM_FIELD(op, SQLValueFunctionOp);
|
||||||
|
READ_OID_FIELD(type);
|
||||||
|
READ_INT_FIELD(typmod);
|
||||||
|
READ_LOCATION_FIELD(location);
|
||||||
|
|
||||||
|
READ_DONE();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* _readXmlExpr
|
* _readXmlExpr
|
||||||
*/
|
*/
|
||||||
|
@ -2348,6 +2364,8 @@ parseNodeString(void)
|
||||||
return_value = _readCoalesceExpr();
|
return_value = _readCoalesceExpr();
|
||||||
else if (MATCH("MINMAX", 6))
|
else if (MATCH("MINMAX", 6))
|
||||||
return_value = _readMinMaxExpr();
|
return_value = _readMinMaxExpr();
|
||||||
|
else if (MATCH("SQLVALUEFUNCTION", 16))
|
||||||
|
return_value = _readSQLValueFunction();
|
||||||
else if (MATCH("XMLEXPR", 7))
|
else if (MATCH("XMLEXPR", 7))
|
||||||
return_value = _readXmlExpr();
|
return_value = _readXmlExpr();
|
||||||
else if (MATCH("NULLTEST", 8))
|
else if (MATCH("NULLTEST", 8))
|
||||||
|
|
|
@ -962,6 +962,12 @@ contain_mutable_functions_walker(Node *node, void *context)
|
||||||
context))
|
context))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
if (IsA(node, SQLValueFunction))
|
||||||
|
{
|
||||||
|
/* all variants of SQLValueFunction are stable */
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* It should be safe to treat MinMaxExpr as immutable, because it will
|
* It should be safe to treat MinMaxExpr as immutable, because it will
|
||||||
* depend on a non-cross-type btree comparison function, and those should
|
* depend on a non-cross-type btree comparison function, and those should
|
||||||
|
@ -1031,7 +1037,8 @@ contain_volatile_functions_walker(Node *node, void *context)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* See notes in contain_mutable_functions_walker about why we treat
|
* See notes in contain_mutable_functions_walker about why we treat
|
||||||
* MinMaxExpr, XmlExpr, and CoerceToDomain as immutable.
|
* MinMaxExpr, XmlExpr, and CoerceToDomain as immutable, while
|
||||||
|
* SQLValueFunction is stable. Hence, none of them are of interest here.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Recurse to check arguments */
|
/* Recurse to check arguments */
|
||||||
|
@ -1076,7 +1083,8 @@ contain_volatile_functions_not_nextval_walker(Node *node, void *context)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* See notes in contain_mutable_functions_walker about why we treat
|
* See notes in contain_mutable_functions_walker about why we treat
|
||||||
* MinMaxExpr, XmlExpr, and CoerceToDomain as immutable.
|
* MinMaxExpr, XmlExpr, and CoerceToDomain as immutable, while
|
||||||
|
* SQLValueFunction is stable. Hence, none of them are of interest here.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Recurse to check arguments */
|
/* Recurse to check arguments */
|
||||||
|
@ -1143,7 +1151,8 @@ has_parallel_hazard_walker(Node *node, has_parallel_hazard_arg *context)
|
||||||
* (Note: in principle that's wrong because a domain constraint could
|
* (Note: in principle that's wrong because a domain constraint could
|
||||||
* contain a parallel-unsafe function; but useful constraints probably
|
* contain a parallel-unsafe function; but useful constraints probably
|
||||||
* never would have such, and assuming they do would cripple use of
|
* never would have such, and assuming they do would cripple use of
|
||||||
* parallel query in the presence of domain types.)
|
* parallel query in the presence of domain types.) SQLValueFunction
|
||||||
|
* should be safe in all cases.
|
||||||
*/
|
*/
|
||||||
if (IsA(node, CoerceToDomain))
|
if (IsA(node, CoerceToDomain))
|
||||||
{
|
{
|
||||||
|
@ -1458,6 +1467,7 @@ contain_leaked_vars_walker(Node *node, void *context)
|
||||||
case T_CaseTestExpr:
|
case T_CaseTestExpr:
|
||||||
case T_RowExpr:
|
case T_RowExpr:
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
|
case T_SQLValueFunction:
|
||||||
case T_NullTest:
|
case T_NullTest:
|
||||||
case T_BooleanTest:
|
case T_BooleanTest:
|
||||||
case T_List:
|
case T_List:
|
||||||
|
|
|
@ -165,6 +165,8 @@ static Node *makeAndExpr(Node *lexpr, Node *rexpr, int location);
|
||||||
static Node *makeOrExpr(Node *lexpr, Node *rexpr, int location);
|
static Node *makeOrExpr(Node *lexpr, Node *rexpr, int location);
|
||||||
static Node *makeNotExpr(Node *expr, int location);
|
static Node *makeNotExpr(Node *expr, int location);
|
||||||
static Node *makeAArrayExpr(List *elements, int location);
|
static Node *makeAArrayExpr(List *elements, int location);
|
||||||
|
static Node *makeSQLValueFunction(SQLValueFunctionOp op, int32 typmod,
|
||||||
|
int location);
|
||||||
static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args,
|
static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args,
|
||||||
List *args, int location);
|
List *args, int location);
|
||||||
static List *mergeTableFuncParameters(List *func_args, List *columns);
|
static List *mergeTableFuncParameters(List *func_args, List *columns);
|
||||||
|
@ -12330,143 +12332,63 @@ func_expr_common_subexpr:
|
||||||
}
|
}
|
||||||
| CURRENT_DATE
|
| CURRENT_DATE
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_DATE, -1, @1);
|
||||||
* Translate as "'now'::text::date".
|
|
||||||
*
|
|
||||||
* We cannot use "'now'::date" because coerce_type() will
|
|
||||||
* immediately reduce that to a constant representing
|
|
||||||
* today's date. We need to delay the conversion until
|
|
||||||
* runtime, else the wrong things will happen when
|
|
||||||
* CURRENT_DATE is used in a column default value or rule.
|
|
||||||
*
|
|
||||||
* This could be simplified if we had a way to generate
|
|
||||||
* an expression tree representing runtime application
|
|
||||||
* of type-input conversion functions. (As of PG 7.3
|
|
||||||
* that is actually possible, but not clear that we want
|
|
||||||
* to rely on it.)
|
|
||||||
*
|
|
||||||
* The token location is attached to the run-time
|
|
||||||
* typecast, not to the Const, for the convenience of
|
|
||||||
* pg_stat_statements (which doesn't want these constructs
|
|
||||||
* to appear to be replaceable constants).
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
$$ = makeTypeCast(n, SystemTypeName("date"), @1);
|
|
||||||
}
|
}
|
||||||
| CURRENT_TIME
|
| CURRENT_TIME
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_TIME, -1, @1);
|
||||||
* Translate as "'now'::text::timetz".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
$$ = makeTypeCast(n, SystemTypeName("timetz"), @1);
|
|
||||||
}
|
}
|
||||||
| CURRENT_TIME '(' Iconst ')'
|
| CURRENT_TIME '(' Iconst ')'
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_TIME_N, $3, @1);
|
||||||
* Translate as "'now'::text::timetz(n)".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
TypeName *d;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
d = SystemTypeName("timetz");
|
|
||||||
d->typmods = list_make1(makeIntConst($3, @3));
|
|
||||||
$$ = makeTypeCast(n, d, @1);
|
|
||||||
}
|
}
|
||||||
| CURRENT_TIMESTAMP
|
| CURRENT_TIMESTAMP
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_TIMESTAMP, -1, @1);
|
||||||
* Translate as "now()", since we have a function that
|
|
||||||
* does exactly what is needed.
|
|
||||||
*/
|
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("now"), NIL, @1);
|
|
||||||
}
|
}
|
||||||
| CURRENT_TIMESTAMP '(' Iconst ')'
|
| CURRENT_TIMESTAMP '(' Iconst ')'
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_TIMESTAMP_N, $3, @1);
|
||||||
* Translate as "'now'::text::timestamptz(n)".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
TypeName *d;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
d = SystemTypeName("timestamptz");
|
|
||||||
d->typmods = list_make1(makeIntConst($3, @3));
|
|
||||||
$$ = makeTypeCast(n, d, @1);
|
|
||||||
}
|
}
|
||||||
| LOCALTIME
|
| LOCALTIME
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_LOCALTIME, -1, @1);
|
||||||
* Translate as "'now'::text::time".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
$$ = makeTypeCast((Node *)n, SystemTypeName("time"), @1);
|
|
||||||
}
|
}
|
||||||
| LOCALTIME '(' Iconst ')'
|
| LOCALTIME '(' Iconst ')'
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_LOCALTIME_N, $3, @1);
|
||||||
* Translate as "'now'::text::time(n)".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
TypeName *d;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
d = SystemTypeName("time");
|
|
||||||
d->typmods = list_make1(makeIntConst($3, @3));
|
|
||||||
$$ = makeTypeCast((Node *)n, d, @1);
|
|
||||||
}
|
}
|
||||||
| LOCALTIMESTAMP
|
| LOCALTIMESTAMP
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_LOCALTIMESTAMP, -1, @1);
|
||||||
* Translate as "'now'::text::timestamp".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
$$ = makeTypeCast(n, SystemTypeName("timestamp"), @1);
|
|
||||||
}
|
}
|
||||||
| LOCALTIMESTAMP '(' Iconst ')'
|
| LOCALTIMESTAMP '(' Iconst ')'
|
||||||
{
|
{
|
||||||
/*
|
$$ = makeSQLValueFunction(SVFOP_LOCALTIMESTAMP_N, $3, @1);
|
||||||
* Translate as "'now'::text::timestamp(n)".
|
|
||||||
* See comments for CURRENT_DATE.
|
|
||||||
*/
|
|
||||||
Node *n;
|
|
||||||
TypeName *d;
|
|
||||||
n = makeStringConstCast("now", -1, SystemTypeName("text"));
|
|
||||||
d = SystemTypeName("timestamp");
|
|
||||||
d->typmods = list_make1(makeIntConst($3, @3));
|
|
||||||
$$ = makeTypeCast(n, d, @1);
|
|
||||||
}
|
}
|
||||||
| CURRENT_ROLE
|
| CURRENT_ROLE
|
||||||
{
|
{
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("current_user"), NIL, @1);
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_ROLE, -1, @1);
|
||||||
}
|
}
|
||||||
| CURRENT_USER
|
| CURRENT_USER
|
||||||
{
|
{
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("current_user"), NIL, @1);
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_USER, -1, @1);
|
||||||
}
|
}
|
||||||
| SESSION_USER
|
| SESSION_USER
|
||||||
{
|
{
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("session_user"), NIL, @1);
|
$$ = makeSQLValueFunction(SVFOP_SESSION_USER, -1, @1);
|
||||||
}
|
}
|
||||||
| USER
|
| USER
|
||||||
{
|
{
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("current_user"), NIL, @1);
|
$$ = makeSQLValueFunction(SVFOP_USER, -1, @1);
|
||||||
}
|
}
|
||||||
| CURRENT_CATALOG
|
| CURRENT_CATALOG
|
||||||
{
|
{
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("current_database"), NIL, @1);
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_CATALOG, -1, @1);
|
||||||
}
|
}
|
||||||
| CURRENT_SCHEMA
|
| CURRENT_SCHEMA
|
||||||
{
|
{
|
||||||
$$ = (Node *) makeFuncCall(SystemFuncName("current_schema"), NIL, @1);
|
$$ = makeSQLValueFunction(SVFOP_CURRENT_SCHEMA, -1, @1);
|
||||||
}
|
}
|
||||||
| CAST '(' a_expr AS Typename ')'
|
| CAST '(' a_expr AS Typename ')'
|
||||||
{ $$ = makeTypeCast($3, $5, @1); }
|
{ $$ = makeTypeCast($3, $5, @1); }
|
||||||
|
@ -14710,6 +14632,18 @@ makeAArrayExpr(List *elements, int location)
|
||||||
return (Node *) n;
|
return (Node *) n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Node *
|
||||||
|
makeSQLValueFunction(SQLValueFunctionOp op, int32 typmod, int location)
|
||||||
|
{
|
||||||
|
SQLValueFunction *svf = makeNode(SQLValueFunction);
|
||||||
|
|
||||||
|
svf->op = op;
|
||||||
|
/* svf->type will be filled during parse analysis */
|
||||||
|
svf->typmod = typmod;
|
||||||
|
svf->location = location;
|
||||||
|
return (Node *) svf;
|
||||||
|
}
|
||||||
|
|
||||||
static Node *
|
static Node *
|
||||||
makeXmlExpr(XmlExprOp op, char *name, List *named_args, List *args,
|
makeXmlExpr(XmlExprOp op, char *name, List *named_args, List *args,
|
||||||
int location)
|
int location)
|
||||||
|
|
|
@ -34,7 +34,9 @@
|
||||||
#include "parser/parse_type.h"
|
#include "parser/parse_type.h"
|
||||||
#include "parser/parse_agg.h"
|
#include "parser/parse_agg.h"
|
||||||
#include "utils/builtins.h"
|
#include "utils/builtins.h"
|
||||||
|
#include "utils/date.h"
|
||||||
#include "utils/lsyscache.h"
|
#include "utils/lsyscache.h"
|
||||||
|
#include "utils/timestamp.h"
|
||||||
#include "utils/xml.h"
|
#include "utils/xml.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -107,6 +109,8 @@ static Node *transformArrayExpr(ParseState *pstate, A_ArrayExpr *a,
|
||||||
static Node *transformRowExpr(ParseState *pstate, RowExpr *r);
|
static Node *transformRowExpr(ParseState *pstate, RowExpr *r);
|
||||||
static Node *transformCoalesceExpr(ParseState *pstate, CoalesceExpr *c);
|
static Node *transformCoalesceExpr(ParseState *pstate, CoalesceExpr *c);
|
||||||
static Node *transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m);
|
static Node *transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m);
|
||||||
|
static Node *transformSQLValueFunction(ParseState *pstate,
|
||||||
|
SQLValueFunction *svf);
|
||||||
static Node *transformXmlExpr(ParseState *pstate, XmlExpr *x);
|
static Node *transformXmlExpr(ParseState *pstate, XmlExpr *x);
|
||||||
static Node *transformXmlSerialize(ParseState *pstate, XmlSerialize *xs);
|
static Node *transformXmlSerialize(ParseState *pstate, XmlSerialize *xs);
|
||||||
static Node *transformBooleanTest(ParseState *pstate, BooleanTest *b);
|
static Node *transformBooleanTest(ParseState *pstate, BooleanTest *b);
|
||||||
|
@ -306,6 +310,11 @@ transformExprRecurse(ParseState *pstate, Node *expr)
|
||||||
result = transformMinMaxExpr(pstate, (MinMaxExpr *) expr);
|
result = transformMinMaxExpr(pstate, (MinMaxExpr *) expr);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
result = transformSQLValueFunction(pstate,
|
||||||
|
(SQLValueFunction *) expr);
|
||||||
|
break;
|
||||||
|
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
result = transformXmlExpr(pstate, (XmlExpr *) expr);
|
result = transformXmlExpr(pstate, (XmlExpr *) expr);
|
||||||
break;
|
break;
|
||||||
|
@ -2178,6 +2187,59 @@ transformMinMaxExpr(ParseState *pstate, MinMaxExpr *m)
|
||||||
return (Node *) newm;
|
return (Node *) newm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Node *
|
||||||
|
transformSQLValueFunction(ParseState *pstate, SQLValueFunction *svf)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* All we need to do is insert the correct result type and (where needed)
|
||||||
|
* validate the typmod, so we just modify the node in-place.
|
||||||
|
*/
|
||||||
|
switch (svf->op)
|
||||||
|
{
|
||||||
|
case SVFOP_CURRENT_DATE:
|
||||||
|
svf->type = DATEOID;
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIME:
|
||||||
|
svf->type = TIMETZOID;
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIME_N:
|
||||||
|
svf->type = TIMETZOID;
|
||||||
|
svf->typmod = anytime_typmod_check(true, svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP:
|
||||||
|
svf->type = TIMESTAMPTZOID;
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP_N:
|
||||||
|
svf->type = TIMESTAMPTZOID;
|
||||||
|
svf->typmod = anytimestamp_typmod_check(true, svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIME:
|
||||||
|
svf->type = TIMEOID;
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIME_N:
|
||||||
|
svf->type = TIMEOID;
|
||||||
|
svf->typmod = anytime_typmod_check(false, svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIMESTAMP:
|
||||||
|
svf->type = TIMESTAMPOID;
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIMESTAMP_N:
|
||||||
|
svf->type = TIMESTAMPOID;
|
||||||
|
svf->typmod = anytimestamp_typmod_check(false, svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_ROLE:
|
||||||
|
case SVFOP_CURRENT_USER:
|
||||||
|
case SVFOP_USER:
|
||||||
|
case SVFOP_SESSION_USER:
|
||||||
|
case SVFOP_CURRENT_CATALOG:
|
||||||
|
case SVFOP_CURRENT_SCHEMA:
|
||||||
|
svf->type = NAMEOID;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (Node *) svf;
|
||||||
|
}
|
||||||
|
|
||||||
static Node *
|
static Node *
|
||||||
transformXmlExpr(ParseState *pstate, XmlExpr *x)
|
transformXmlExpr(ParseState *pstate, XmlExpr *x)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1761,6 +1761,49 @@ FigureColnameInternal(Node *node, char **name)
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
/* make these act like a function or variable */
|
||||||
|
switch (((SQLValueFunction *) node)->op)
|
||||||
|
{
|
||||||
|
case SVFOP_CURRENT_DATE:
|
||||||
|
*name = "current_date";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_CURRENT_TIME:
|
||||||
|
case SVFOP_CURRENT_TIME_N:
|
||||||
|
*name = "current_time";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP:
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP_N:
|
||||||
|
*name = "current_timestamp";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_LOCALTIME:
|
||||||
|
case SVFOP_LOCALTIME_N:
|
||||||
|
*name = "localtime";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_LOCALTIMESTAMP:
|
||||||
|
case SVFOP_LOCALTIMESTAMP_N:
|
||||||
|
*name = "localtimestamp";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_CURRENT_ROLE:
|
||||||
|
*name = "current_role";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_CURRENT_USER:
|
||||||
|
*name = "current_user";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_USER:
|
||||||
|
*name = "user";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_SESSION_USER:
|
||||||
|
*name = "session_user";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_CURRENT_CATALOG:
|
||||||
|
*name = "current_catalog";
|
||||||
|
return 2;
|
||||||
|
case SVFOP_CURRENT_SCHEMA:
|
||||||
|
*name = "current_schema";
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
/* make SQL/XML functions act like a regular function */
|
/* make SQL/XML functions act like a regular function */
|
||||||
switch (((XmlExpr *) node)->op)
|
switch (((XmlExpr *) node)->op)
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#include "access/hash.h"
|
#include "access/hash.h"
|
||||||
|
#include "access/xact.h"
|
||||||
#include "libpq/pqformat.h"
|
#include "libpq/pqformat.h"
|
||||||
#include "miscadmin.h"
|
#include "miscadmin.h"
|
||||||
#include "parser/scansup.h"
|
#include "parser/scansup.h"
|
||||||
|
@ -51,7 +52,6 @@ static void AdjustTimeForTypmod(TimeADT *time, int32 typmod);
|
||||||
static int32
|
static int32
|
||||||
anytime_typmodin(bool istz, ArrayType *ta)
|
anytime_typmodin(bool istz, ArrayType *ta)
|
||||||
{
|
{
|
||||||
int32 typmod;
|
|
||||||
int32 *tl;
|
int32 *tl;
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
|
@ -66,22 +66,27 @@ anytime_typmodin(bool istz, ArrayType *ta)
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("invalid type modifier")));
|
errmsg("invalid type modifier")));
|
||||||
|
|
||||||
if (*tl < 0)
|
return anytime_typmod_check(istz, tl[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* exported so parse_expr.c can use it */
|
||||||
|
int32
|
||||||
|
anytime_typmod_check(bool istz, int32 typmod)
|
||||||
|
{
|
||||||
|
if (typmod < 0)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("TIME(%d)%s precision must not be negative",
|
errmsg("TIME(%d)%s precision must not be negative",
|
||||||
*tl, (istz ? " WITH TIME ZONE" : ""))));
|
typmod, (istz ? " WITH TIME ZONE" : ""))));
|
||||||
if (*tl > MAX_TIME_PRECISION)
|
if (typmod > MAX_TIME_PRECISION)
|
||||||
{
|
{
|
||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("TIME(%d)%s precision reduced to maximum allowed, %d",
|
errmsg("TIME(%d)%s precision reduced to maximum allowed, %d",
|
||||||
*tl, (istz ? " WITH TIME ZONE" : ""),
|
typmod, (istz ? " WITH TIME ZONE" : ""),
|
||||||
MAX_TIME_PRECISION)));
|
MAX_TIME_PRECISION)));
|
||||||
typmod = MAX_TIME_PRECISION;
|
typmod = MAX_TIME_PRECISION;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
typmod = *tl;
|
|
||||||
|
|
||||||
return typmod;
|
return typmod;
|
||||||
}
|
}
|
||||||
|
@ -298,6 +303,80 @@ EncodeSpecialDate(DateADT dt, char *str)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GetSQLCurrentDate -- implements CURRENT_DATE
|
||||||
|
*/
|
||||||
|
DateADT
|
||||||
|
GetSQLCurrentDate(void)
|
||||||
|
{
|
||||||
|
TimestampTz ts;
|
||||||
|
struct pg_tm tt,
|
||||||
|
*tm = &tt;
|
||||||
|
fsec_t fsec;
|
||||||
|
int tz;
|
||||||
|
|
||||||
|
ts = GetCurrentTransactionStartTimestamp();
|
||||||
|
|
||||||
|
if (timestamp2tm(ts, &tz, tm, &fsec, NULL, NULL) != 0)
|
||||||
|
ereport(ERROR,
|
||||||
|
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
|
||||||
|
errmsg("timestamp out of range")));
|
||||||
|
|
||||||
|
return date2j(tm->tm_year, tm->tm_mon, tm->tm_mday) - POSTGRES_EPOCH_JDATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GetSQLCurrentTime -- implements CURRENT_TIME, CURRENT_TIME(n)
|
||||||
|
*/
|
||||||
|
TimeTzADT *
|
||||||
|
GetSQLCurrentTime(int32 typmod)
|
||||||
|
{
|
||||||
|
TimeTzADT *result;
|
||||||
|
TimestampTz ts;
|
||||||
|
struct pg_tm tt,
|
||||||
|
*tm = &tt;
|
||||||
|
fsec_t fsec;
|
||||||
|
int tz;
|
||||||
|
|
||||||
|
ts = GetCurrentTransactionStartTimestamp();
|
||||||
|
|
||||||
|
if (timestamp2tm(ts, &tz, tm, &fsec, NULL, NULL) != 0)
|
||||||
|
ereport(ERROR,
|
||||||
|
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
|
||||||
|
errmsg("timestamp out of range")));
|
||||||
|
|
||||||
|
result = (TimeTzADT *) palloc(sizeof(TimeTzADT));
|
||||||
|
tm2timetz(tm, fsec, tz, result);
|
||||||
|
AdjustTimeForTypmod(&(result->time), typmod);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GetSQLLocalTime -- implements LOCALTIME, LOCALTIME(n)
|
||||||
|
*/
|
||||||
|
TimeADT
|
||||||
|
GetSQLLocalTime(int32 typmod)
|
||||||
|
{
|
||||||
|
TimeADT result;
|
||||||
|
TimestampTz ts;
|
||||||
|
struct pg_tm tt,
|
||||||
|
*tm = &tt;
|
||||||
|
fsec_t fsec;
|
||||||
|
int tz;
|
||||||
|
|
||||||
|
ts = GetCurrentTransactionStartTimestamp();
|
||||||
|
|
||||||
|
if (timestamp2tm(ts, &tz, tm, &fsec, NULL, NULL) != 0)
|
||||||
|
ereport(ERROR,
|
||||||
|
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
|
||||||
|
errmsg("timestamp out of range")));
|
||||||
|
|
||||||
|
tm2time(tm, fsec, &result);
|
||||||
|
AdjustTimeForTypmod(&result, typmod);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Comparison functions for dates
|
* Comparison functions for dates
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -6884,6 +6884,7 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags)
|
||||||
case T_RowExpr:
|
case T_RowExpr:
|
||||||
case T_CoalesceExpr:
|
case T_CoalesceExpr:
|
||||||
case T_MinMaxExpr:
|
case T_MinMaxExpr:
|
||||||
|
case T_SQLValueFunction:
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
case T_NullIfExpr:
|
case T_NullIfExpr:
|
||||||
case T_Aggref:
|
case T_Aggref:
|
||||||
|
@ -7871,6 +7872,67 @@ get_rule_expr(Node *node, deparse_context *context,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
{
|
||||||
|
SQLValueFunction *svf = (SQLValueFunction *) node;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note: this code knows that typmod for time, timestamp, and
|
||||||
|
* timestamptz just prints as integer.
|
||||||
|
*/
|
||||||
|
switch (svf->op)
|
||||||
|
{
|
||||||
|
case SVFOP_CURRENT_DATE:
|
||||||
|
appendStringInfoString(buf, "CURRENT_DATE");
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIME:
|
||||||
|
appendStringInfoString(buf, "CURRENT_TIME");
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIME_N:
|
||||||
|
appendStringInfo(buf, "CURRENT_TIME(%d)", svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP:
|
||||||
|
appendStringInfoString(buf, "CURRENT_TIMESTAMP");
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_TIMESTAMP_N:
|
||||||
|
appendStringInfo(buf, "CURRENT_TIMESTAMP(%d)",
|
||||||
|
svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIME:
|
||||||
|
appendStringInfoString(buf, "LOCALTIME");
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIME_N:
|
||||||
|
appendStringInfo(buf, "LOCALTIME(%d)", svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIMESTAMP:
|
||||||
|
appendStringInfoString(buf, "LOCALTIMESTAMP");
|
||||||
|
break;
|
||||||
|
case SVFOP_LOCALTIMESTAMP_N:
|
||||||
|
appendStringInfo(buf, "LOCALTIMESTAMP(%d)",
|
||||||
|
svf->typmod);
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_ROLE:
|
||||||
|
appendStringInfoString(buf, "CURRENT_ROLE");
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_USER:
|
||||||
|
appendStringInfoString(buf, "CURRENT_USER");
|
||||||
|
break;
|
||||||
|
case SVFOP_USER:
|
||||||
|
appendStringInfoString(buf, "USER");
|
||||||
|
break;
|
||||||
|
case SVFOP_SESSION_USER:
|
||||||
|
appendStringInfoString(buf, "SESSION_USER");
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_CATALOG:
|
||||||
|
appendStringInfoString(buf, "CURRENT_CATALOG");
|
||||||
|
break;
|
||||||
|
case SVFOP_CURRENT_SCHEMA:
|
||||||
|
appendStringInfoString(buf, "CURRENT_SCHEMA");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
{
|
{
|
||||||
XmlExpr *xexpr = (XmlExpr *) node;
|
XmlExpr *xexpr = (XmlExpr *) node;
|
||||||
|
|
|
@ -72,13 +72,13 @@ static Timestamp dt2local(Timestamp dt, int timezone);
|
||||||
static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod);
|
static void AdjustTimestampForTypmod(Timestamp *time, int32 typmod);
|
||||||
static void AdjustIntervalForTypmod(Interval *interval, int32 typmod);
|
static void AdjustIntervalForTypmod(Interval *interval, int32 typmod);
|
||||||
static TimestampTz timestamp2timestamptz(Timestamp timestamp);
|
static TimestampTz timestamp2timestamptz(Timestamp timestamp);
|
||||||
|
static Timestamp timestamptz2timestamp(TimestampTz timestamp);
|
||||||
|
|
||||||
|
|
||||||
/* common code for timestamptypmodin and timestamptztypmodin */
|
/* common code for timestamptypmodin and timestamptztypmodin */
|
||||||
static int32
|
static int32
|
||||||
anytimestamp_typmodin(bool istz, ArrayType *ta)
|
anytimestamp_typmodin(bool istz, ArrayType *ta)
|
||||||
{
|
{
|
||||||
int32 typmod;
|
|
||||||
int32 *tl;
|
int32 *tl;
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
|
@ -93,22 +93,27 @@ anytimestamp_typmodin(bool istz, ArrayType *ta)
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("invalid type modifier")));
|
errmsg("invalid type modifier")));
|
||||||
|
|
||||||
if (*tl < 0)
|
return anytimestamp_typmod_check(istz, tl[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* exported so parse_expr.c can use it */
|
||||||
|
int32
|
||||||
|
anytimestamp_typmod_check(bool istz, int32 typmod)
|
||||||
|
{
|
||||||
|
if (typmod < 0)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("TIMESTAMP(%d)%s precision must not be negative",
|
errmsg("TIMESTAMP(%d)%s precision must not be negative",
|
||||||
*tl, (istz ? " WITH TIME ZONE" : ""))));
|
typmod, (istz ? " WITH TIME ZONE" : ""))));
|
||||||
if (*tl > MAX_TIMESTAMP_PRECISION)
|
if (typmod > MAX_TIMESTAMP_PRECISION)
|
||||||
{
|
{
|
||||||
ereport(WARNING,
|
ereport(WARNING,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
errmsg("TIMESTAMP(%d)%s precision reduced to maximum allowed, %d",
|
errmsg("TIMESTAMP(%d)%s precision reduced to maximum allowed, %d",
|
||||||
*tl, (istz ? " WITH TIME ZONE" : ""),
|
typmod, (istz ? " WITH TIME ZONE" : ""),
|
||||||
MAX_TIMESTAMP_PRECISION)));
|
MAX_TIMESTAMP_PRECISION)));
|
||||||
typmod = MAX_TIMESTAMP_PRECISION;
|
typmod = MAX_TIMESTAMP_PRECISION;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
typmod = *tl;
|
|
||||||
|
|
||||||
return typmod;
|
return typmod;
|
||||||
}
|
}
|
||||||
|
@ -336,6 +341,10 @@ timestamp_scale(PG_FUNCTION_ARGS)
|
||||||
PG_RETURN_TIMESTAMP(result);
|
PG_RETURN_TIMESTAMP(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* AdjustTimestampForTypmod --- round off a timestamp to suit given typmod
|
||||||
|
* Works for either timestamp or timestamptz.
|
||||||
|
*/
|
||||||
static void
|
static void
|
||||||
AdjustTimestampForTypmod(Timestamp *time, int32 typmod)
|
AdjustTimestampForTypmod(Timestamp *time, int32 typmod)
|
||||||
{
|
{
|
||||||
|
@ -1686,6 +1695,34 @@ IntegerTimestampToTimestampTz(int64 timestamp)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GetSQLCurrentTimestamp -- implements CURRENT_TIMESTAMP, CURRENT_TIMESTAMP(n)
|
||||||
|
*/
|
||||||
|
TimestampTz
|
||||||
|
GetSQLCurrentTimestamp(int32 typmod)
|
||||||
|
{
|
||||||
|
TimestampTz ts;
|
||||||
|
|
||||||
|
ts = GetCurrentTransactionStartTimestamp();
|
||||||
|
if (typmod >= 0)
|
||||||
|
AdjustTimestampForTypmod(&ts, typmod);
|
||||||
|
return ts;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GetSQLLocalTimestamp -- implements LOCALTIMESTAMP, LOCALTIMESTAMP(n)
|
||||||
|
*/
|
||||||
|
Timestamp
|
||||||
|
GetSQLLocalTimestamp(int32 typmod)
|
||||||
|
{
|
||||||
|
Timestamp ts;
|
||||||
|
|
||||||
|
ts = timestamptz2timestamp(GetCurrentTransactionStartTimestamp());
|
||||||
|
if (typmod >= 0)
|
||||||
|
AdjustTimestampForTypmod(&ts, typmod);
|
||||||
|
return ts;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TimestampDifference -- convert the difference between two timestamps
|
* TimestampDifference -- convert the difference between two timestamps
|
||||||
* into integer seconds and microseconds
|
* into integer seconds and microseconds
|
||||||
|
@ -5415,6 +5452,13 @@ Datum
|
||||||
timestamptz_timestamp(PG_FUNCTION_ARGS)
|
timestamptz_timestamp(PG_FUNCTION_ARGS)
|
||||||
{
|
{
|
||||||
TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(0);
|
TimestampTz timestamp = PG_GETARG_TIMESTAMPTZ(0);
|
||||||
|
|
||||||
|
PG_RETURN_TIMESTAMP(timestamptz2timestamp(timestamp));
|
||||||
|
}
|
||||||
|
|
||||||
|
static Timestamp
|
||||||
|
timestamptz2timestamp(TimestampTz timestamp)
|
||||||
|
{
|
||||||
Timestamp result;
|
Timestamp result;
|
||||||
struct pg_tm tt,
|
struct pg_tm tt,
|
||||||
*tm = &tt;
|
*tm = &tt;
|
||||||
|
@ -5434,7 +5478,7 @@ timestamptz_timestamp(PG_FUNCTION_ARGS)
|
||||||
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
|
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
|
||||||
errmsg("timestamp out of range")));
|
errmsg("timestamp out of range")));
|
||||||
}
|
}
|
||||||
PG_RETURN_TIMESTAMP(result);
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* timestamptz_zone()
|
/* timestamptz_zone()
|
||||||
|
|
|
@ -53,6 +53,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* yyyymmddN */
|
/* yyyymmddN */
|
||||||
#define CATALOG_VERSION_NO 201608131
|
#define CATALOG_VERSION_NO 201608161
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -166,6 +166,7 @@ typedef enum NodeTag
|
||||||
T_RowCompareExpr,
|
T_RowCompareExpr,
|
||||||
T_CoalesceExpr,
|
T_CoalesceExpr,
|
||||||
T_MinMaxExpr,
|
T_MinMaxExpr,
|
||||||
|
T_SQLValueFunction,
|
||||||
T_XmlExpr,
|
T_XmlExpr,
|
||||||
T_NullTest,
|
T_NullTest,
|
||||||
T_BooleanTest,
|
T_BooleanTest,
|
||||||
|
|
|
@ -1050,6 +1050,45 @@ typedef struct MinMaxExpr
|
||||||
int location; /* token location, or -1 if unknown */
|
int location; /* token location, or -1 if unknown */
|
||||||
} MinMaxExpr;
|
} MinMaxExpr;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* SQLValueFunction - parameterless functions with special grammar productions
|
||||||
|
*
|
||||||
|
* The SQL standard categorizes some of these as <datetime value function>
|
||||||
|
* and others as <general value specification>. We call 'em SQLValueFunctions
|
||||||
|
* for lack of a better term. We store type and typmod of the result so that
|
||||||
|
* some code doesn't need to know each function individually, and because
|
||||||
|
* we would need to store typmod anyway for some of the datetime functions.
|
||||||
|
* Note that currently, all variants return non-collating datatypes, so we do
|
||||||
|
* not need a collation field; also, all these functions are stable.
|
||||||
|
*/
|
||||||
|
typedef enum SQLValueFunctionOp
|
||||||
|
{
|
||||||
|
SVFOP_CURRENT_DATE,
|
||||||
|
SVFOP_CURRENT_TIME,
|
||||||
|
SVFOP_CURRENT_TIME_N,
|
||||||
|
SVFOP_CURRENT_TIMESTAMP,
|
||||||
|
SVFOP_CURRENT_TIMESTAMP_N,
|
||||||
|
SVFOP_LOCALTIME,
|
||||||
|
SVFOP_LOCALTIME_N,
|
||||||
|
SVFOP_LOCALTIMESTAMP,
|
||||||
|
SVFOP_LOCALTIMESTAMP_N,
|
||||||
|
SVFOP_CURRENT_ROLE,
|
||||||
|
SVFOP_CURRENT_USER,
|
||||||
|
SVFOP_USER,
|
||||||
|
SVFOP_SESSION_USER,
|
||||||
|
SVFOP_CURRENT_CATALOG,
|
||||||
|
SVFOP_CURRENT_SCHEMA
|
||||||
|
} SQLValueFunctionOp;
|
||||||
|
|
||||||
|
typedef struct SQLValueFunction
|
||||||
|
{
|
||||||
|
Expr xpr;
|
||||||
|
SQLValueFunctionOp op; /* which function this is */
|
||||||
|
Oid type; /* result type/typmod */
|
||||||
|
int32 typmod;
|
||||||
|
int location; /* token location, or -1 if unknown */
|
||||||
|
} SQLValueFunction;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* XmlExpr - various SQL/XML functions requiring special grammar productions
|
* XmlExpr - various SQL/XML functions requiring special grammar productions
|
||||||
*
|
*
|
||||||
|
|
|
@ -89,8 +89,12 @@ typedef struct
|
||||||
|
|
||||||
|
|
||||||
/* date.c */
|
/* date.c */
|
||||||
|
extern int32 anytime_typmod_check(bool istz, int32 typmod);
|
||||||
extern double date2timestamp_no_overflow(DateADT dateVal);
|
extern double date2timestamp_no_overflow(DateADT dateVal);
|
||||||
extern void EncodeSpecialDate(DateADT dt, char *str);
|
extern void EncodeSpecialDate(DateADT dt, char *str);
|
||||||
|
extern DateADT GetSQLCurrentDate(void);
|
||||||
|
extern TimeTzADT *GetSQLCurrentTime(int32 typmod);
|
||||||
|
extern TimeADT GetSQLLocalTime(int32 typmod);
|
||||||
|
|
||||||
extern Datum date_in(PG_FUNCTION_ARGS);
|
extern Datum date_in(PG_FUNCTION_ARGS);
|
||||||
extern Datum date_out(PG_FUNCTION_ARGS);
|
extern Datum date_out(PG_FUNCTION_ARGS);
|
||||||
|
|
|
@ -215,7 +215,11 @@ extern Datum generate_series_timestamptz(PG_FUNCTION_ARGS);
|
||||||
|
|
||||||
/* Internal routines (not fmgr-callable) */
|
/* Internal routines (not fmgr-callable) */
|
||||||
|
|
||||||
|
extern int32 anytimestamp_typmod_check(bool istz, int32 typmod);
|
||||||
|
|
||||||
extern TimestampTz GetCurrentTimestamp(void);
|
extern TimestampTz GetCurrentTimestamp(void);
|
||||||
|
extern TimestampTz GetSQLCurrentTimestamp(int32 typmod);
|
||||||
|
extern Timestamp GetSQLLocalTimestamp(int32 typmod);
|
||||||
extern void TimestampDifference(TimestampTz start_time, TimestampTz stop_time,
|
extern void TimestampDifference(TimestampTz start_time, TimestampTz stop_time,
|
||||||
long *secs, int *microsecs);
|
long *secs, int *microsecs);
|
||||||
extern bool TimestampDifferenceExceeds(TimestampTz start_time,
|
extern bool TimestampDifferenceExceeds(TimestampTz start_time,
|
||||||
|
|
|
@ -6494,6 +6494,9 @@ exec_simple_check_node(Node *node)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case T_SQLValueFunction:
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
case T_XmlExpr:
|
case T_XmlExpr:
|
||||||
{
|
{
|
||||||
XmlExpr *expr = (XmlExpr *) node;
|
XmlExpr *expr = (XmlExpr *) node;
|
||||||
|
|
|
@ -182,7 +182,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM document WHERE f_leak(dtitle);
|
||||||
Filter: (dlevel <= $0)
|
Filter: (dlevel <= $0)
|
||||||
InitPlan 1 (returns $0)
|
InitPlan 1 (returns $0)
|
||||||
-> Index Scan using uaccount_pkey on uaccount
|
-> Index Scan using uaccount_pkey on uaccount
|
||||||
Index Cond: (pguser = "current_user"())
|
Index Cond: (pguser = CURRENT_USER)
|
||||||
(7 rows)
|
(7 rows)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM document NATURAL JOIN category WHERE f_leak(dtitle);
|
EXPLAIN (COSTS OFF) SELECT * FROM document NATURAL JOIN category WHERE f_leak(dtitle);
|
||||||
|
@ -198,7 +198,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM document NATURAL JOIN category WHERE f_leak(dt
|
||||||
Filter: (dlevel <= $0)
|
Filter: (dlevel <= $0)
|
||||||
InitPlan 1 (returns $0)
|
InitPlan 1 (returns $0)
|
||||||
-> Index Scan using uaccount_pkey on uaccount
|
-> Index Scan using uaccount_pkey on uaccount
|
||||||
Index Cond: (pguser = "current_user"())
|
Index Cond: (pguser = CURRENT_USER)
|
||||||
(11 rows)
|
(11 rows)
|
||||||
|
|
||||||
-- only owner can change policies
|
-- only owner can change policies
|
||||||
|
@ -265,22 +265,22 @@ NOTICE: f_leak => great manga
|
||||||
(3 rows)
|
(3 rows)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM document WHERE f_leak(dtitle);
|
EXPLAIN (COSTS OFF) SELECT * FROM document WHERE f_leak(dtitle);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
----------------------------------------------
|
------------------------------------------
|
||||||
Subquery Scan on document
|
Subquery Scan on document
|
||||||
Filter: f_leak(document.dtitle)
|
Filter: f_leak(document.dtitle)
|
||||||
-> Seq Scan on document document_1
|
-> Seq Scan on document document_1
|
||||||
Filter: (dauthor = "current_user"())
|
Filter: (dauthor = CURRENT_USER)
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM document NATURAL JOIN category WHERE f_leak(dtitle);
|
EXPLAIN (COSTS OFF) SELECT * FROM document NATURAL JOIN category WHERE f_leak(dtitle);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
----------------------------------------------------
|
--------------------------------------------------
|
||||||
Nested Loop
|
Nested Loop
|
||||||
-> Subquery Scan on document
|
-> Subquery Scan on document
|
||||||
Filter: f_leak(document.dtitle)
|
Filter: f_leak(document.dtitle)
|
||||||
-> Seq Scan on document document_1
|
-> Seq Scan on document document_1
|
||||||
Filter: (dauthor = "current_user"())
|
Filter: (dauthor = CURRENT_USER)
|
||||||
-> Index Scan using category_pkey on category
|
-> Index Scan using category_pkey on category
|
||||||
Index Cond: (cid = document.cid)
|
Index Cond: (cid = document.cid)
|
||||||
(7 rows)
|
(7 rows)
|
||||||
|
|
|
@ -2269,14 +2269,14 @@ pg_settings|pg_settings_u|CREATE RULE pg_settings_u AS
|
||||||
WHERE (new.name = old.name) DO SELECT set_config(old.name, new.setting, false) AS set_config;
|
WHERE (new.name = old.name) DO SELECT set_config(old.name, new.setting, false) AS set_config;
|
||||||
rtest_emp|rtest_emp_del|CREATE RULE rtest_emp_del AS
|
rtest_emp|rtest_emp_del|CREATE RULE rtest_emp_del AS
|
||||||
ON DELETE TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
|
ON DELETE TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
|
||||||
VALUES (old.ename, "current_user"(), 'fired'::bpchar, '$0.00'::money, old.salary);
|
VALUES (old.ename, CURRENT_USER, 'fired'::bpchar, '$0.00'::money, old.salary);
|
||||||
rtest_emp|rtest_emp_ins|CREATE RULE rtest_emp_ins AS
|
rtest_emp|rtest_emp_ins|CREATE RULE rtest_emp_ins AS
|
||||||
ON INSERT TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
|
ON INSERT TO rtest_emp DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
|
||||||
VALUES (new.ename, "current_user"(), 'hired'::bpchar, new.salary, '$0.00'::money);
|
VALUES (new.ename, CURRENT_USER, 'hired'::bpchar, new.salary, '$0.00'::money);
|
||||||
rtest_emp|rtest_emp_upd|CREATE RULE rtest_emp_upd AS
|
rtest_emp|rtest_emp_upd|CREATE RULE rtest_emp_upd AS
|
||||||
ON UPDATE TO rtest_emp
|
ON UPDATE TO rtest_emp
|
||||||
WHERE (new.salary <> old.salary) DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
|
WHERE (new.salary <> old.salary) DO INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
|
||||||
VALUES (new.ename, "current_user"(), 'honored'::bpchar, new.salary, old.salary);
|
VALUES (new.ename, CURRENT_USER, 'honored'::bpchar, new.salary, old.salary);
|
||||||
rtest_nothn1|rtest_nothn_r1|CREATE RULE rtest_nothn_r1 AS
|
rtest_nothn1|rtest_nothn_r1|CREATE RULE rtest_nothn_r1 AS
|
||||||
ON INSERT TO rtest_nothn1
|
ON INSERT TO rtest_nothn1
|
||||||
WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
|
WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
|
||||||
|
|
|
@ -1326,10 +1326,10 @@ NOTICE: f_leak => hamburger
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal WHERE f_leak(passwd);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal WHERE f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
------------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
Seq Scan on customer
|
Seq Scan on customer
|
||||||
Filter: (f_leak(passwd) AND (name = ("current_user"())::text))
|
Filter: (f_leak(passwd) AND (name = (CURRENT_USER)::text))
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
||||||
|
@ -1340,12 +1340,12 @@ NOTICE: f_leak => passwd123
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------
|
-----------------------------------------------
|
||||||
Subquery Scan on my_property_secure
|
Subquery Scan on my_property_secure
|
||||||
Filter: f_leak(my_property_secure.passwd)
|
Filter: f_leak(my_property_secure.passwd)
|
||||||
-> Seq Scan on customer
|
-> Seq Scan on customer
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -1367,10 +1367,10 @@ NOTICE: f_leak => hamburger
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal v
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal v
|
||||||
WHERE f_leak('passwd') AND f_leak(passwd);
|
WHERE f_leak('passwd') AND f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------
|
||||||
Seq Scan on customer
|
Seq Scan on customer
|
||||||
Filter: (f_leak('passwd'::text) AND f_leak(passwd) AND (name = ("current_user"())::text))
|
Filter: (f_leak('passwd'::text) AND f_leak(passwd) AND (name = (CURRENT_USER)::text))
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
SELECT * FROM my_property_secure v
|
SELECT * FROM my_property_secure v
|
||||||
|
@ -1386,12 +1386,12 @@ NOTICE: f_leak => passwd
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure v
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure v
|
||||||
WHERE f_leak('passwd') AND f_leak(passwd);
|
WHERE f_leak('passwd') AND f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
--------------------------------------------------------------------------------
|
----------------------------------------------------------------------------
|
||||||
Subquery Scan on v
|
Subquery Scan on v
|
||||||
Filter: f_leak(v.passwd)
|
Filter: f_leak(v.passwd)
|
||||||
-> Seq Scan on customer
|
-> Seq Scan on customer
|
||||||
Filter: (f_leak('passwd'::text) AND (name = ("current_user"())::text))
|
Filter: (f_leak('passwd'::text) AND (name = (CURRENT_USER)::text))
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -1409,15 +1409,15 @@ NOTICE: f_leak => 9801-2345-6789-0123
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------------
|
-----------------------------------------------------
|
||||||
Hash Join
|
Hash Join
|
||||||
Hash Cond: (r.cid = l.cid)
|
Hash Cond: (r.cid = l.cid)
|
||||||
-> Seq Scan on credit_card r
|
-> Seq Scan on credit_card r
|
||||||
Filter: f_leak(cnum)
|
Filter: f_leak(cnum)
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l
|
-> Seq Scan on customer l
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(7 rows)
|
(7 rows)
|
||||||
|
|
||||||
SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
||||||
|
@ -1428,8 +1428,8 @@ NOTICE: f_leak => 1111-2222-3333-4444
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
Subquery Scan on my_credit_card_secure
|
Subquery Scan on my_credit_card_secure
|
||||||
Filter: f_leak(my_credit_card_secure.cnum)
|
Filter: f_leak(my_credit_card_secure.cnum)
|
||||||
-> Hash Join
|
-> Hash Join
|
||||||
|
@ -1437,7 +1437,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
||||||
-> Seq Scan on credit_card r
|
-> Seq Scan on credit_card r
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l
|
-> Seq Scan on customer l
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(8 rows)
|
(8 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -1471,7 +1471,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_usage_normal
|
||||||
-> Seq Scan on credit_card r_1
|
-> Seq Scan on credit_card r_1
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l_1
|
-> Seq Scan on customer l_1
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(13 rows)
|
(13 rows)
|
||||||
|
|
||||||
SELECT * FROM my_credit_card_usage_secure
|
SELECT * FROM my_credit_card_usage_secure
|
||||||
|
@ -1502,7 +1502,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_usage_secure
|
||||||
-> Seq Scan on credit_card r_1
|
-> Seq Scan on credit_card r_1
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l
|
-> Seq Scan on customer l
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(13 rows)
|
(13 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
|
|
@ -1326,10 +1326,10 @@ NOTICE: f_leak => hamburger
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal WHERE f_leak(passwd);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal WHERE f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
------------------------------------------------------------------
|
--------------------------------------------------------------
|
||||||
Seq Scan on customer
|
Seq Scan on customer
|
||||||
Filter: (f_leak(passwd) AND (name = ("current_user"())::text))
|
Filter: (f_leak(passwd) AND (name = (CURRENT_USER)::text))
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
||||||
|
@ -1340,12 +1340,12 @@ NOTICE: f_leak => passwd123
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure WHERE f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------
|
-----------------------------------------------
|
||||||
Subquery Scan on my_property_secure
|
Subquery Scan on my_property_secure
|
||||||
Filter: f_leak(my_property_secure.passwd)
|
Filter: f_leak(my_property_secure.passwd)
|
||||||
-> Seq Scan on customer
|
-> Seq Scan on customer
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -1367,10 +1367,10 @@ NOTICE: f_leak => hamburger
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal v
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal v
|
||||||
WHERE f_leak('passwd') AND f_leak(passwd);
|
WHERE f_leak('passwd') AND f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------
|
||||||
Seq Scan on customer
|
Seq Scan on customer
|
||||||
Filter: (f_leak('passwd'::text) AND f_leak(passwd) AND (name = ("current_user"())::text))
|
Filter: (f_leak('passwd'::text) AND f_leak(passwd) AND (name = (CURRENT_USER)::text))
|
||||||
(2 rows)
|
(2 rows)
|
||||||
|
|
||||||
SELECT * FROM my_property_secure v
|
SELECT * FROM my_property_secure v
|
||||||
|
@ -1386,12 +1386,12 @@ NOTICE: f_leak => passwd
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure v
|
EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure v
|
||||||
WHERE f_leak('passwd') AND f_leak(passwd);
|
WHERE f_leak('passwd') AND f_leak(passwd);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
--------------------------------------------------------------------------------
|
----------------------------------------------------------------------------
|
||||||
Subquery Scan on v
|
Subquery Scan on v
|
||||||
Filter: f_leak(v.passwd)
|
Filter: f_leak(v.passwd)
|
||||||
-> Seq Scan on customer
|
-> Seq Scan on customer
|
||||||
Filter: (f_leak('passwd'::text) AND (name = ("current_user"())::text))
|
Filter: (f_leak('passwd'::text) AND (name = (CURRENT_USER)::text))
|
||||||
(4 rows)
|
(4 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -1409,15 +1409,15 @@ NOTICE: f_leak => 9801-2345-6789-0123
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------------
|
-----------------------------------------------------
|
||||||
Hash Join
|
Hash Join
|
||||||
Hash Cond: (r.cid = l.cid)
|
Hash Cond: (r.cid = l.cid)
|
||||||
-> Seq Scan on credit_card r
|
-> Seq Scan on credit_card r
|
||||||
Filter: f_leak(cnum)
|
Filter: f_leak(cnum)
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l
|
-> Seq Scan on customer l
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(7 rows)
|
(7 rows)
|
||||||
|
|
||||||
SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
||||||
|
@ -1428,8 +1428,8 @@ NOTICE: f_leak => 1111-2222-3333-4444
|
||||||
(1 row)
|
(1 row)
|
||||||
|
|
||||||
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
||||||
QUERY PLAN
|
QUERY PLAN
|
||||||
---------------------------------------------------------------
|
-----------------------------------------------------------
|
||||||
Subquery Scan on my_credit_card_secure
|
Subquery Scan on my_credit_card_secure
|
||||||
Filter: f_leak(my_credit_card_secure.cnum)
|
Filter: f_leak(my_credit_card_secure.cnum)
|
||||||
-> Hash Join
|
-> Hash Join
|
||||||
|
@ -1437,7 +1437,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
|
||||||
-> Seq Scan on credit_card r
|
-> Seq Scan on credit_card r
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l
|
-> Seq Scan on customer l
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(8 rows)
|
(8 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
@ -1471,7 +1471,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_usage_normal
|
||||||
-> Seq Scan on credit_card r_1
|
-> Seq Scan on credit_card r_1
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l_1
|
-> Seq Scan on customer l_1
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(13 rows)
|
(13 rows)
|
||||||
|
|
||||||
SELECT * FROM my_credit_card_usage_secure
|
SELECT * FROM my_credit_card_usage_secure
|
||||||
|
@ -1502,7 +1502,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_usage_secure
|
||||||
-> Seq Scan on credit_card r_1
|
-> Seq Scan on credit_card r_1
|
||||||
-> Hash
|
-> Hash
|
||||||
-> Seq Scan on customer l
|
-> Seq Scan on customer l
|
||||||
Filter: (name = ("current_user"())::text)
|
Filter: (name = (CURRENT_USER)::text)
|
||||||
(13 rows)
|
(13 rows)
|
||||||
|
|
||||||
--
|
--
|
||||||
|
|
Loading…
Reference in New Issue