diff --git a/docs/generated/sql/functions.md b/docs/generated/sql/functions.md index b15ad90112d0..6cf96ce88c52 100644 --- a/docs/generated/sql/functions.md +++ b/docs/generated/sql/functions.md @@ -285,6 +285,11 @@ and which stays constant throughout the transaction. This timestamp has no relationship with the commit order of concurrent transactions.

+current_timestamp() → date

Returns the time of the current transaction.

+

The value is based on a timestamp picked when the transaction starts +and which stays constant throughout the transaction. This timestamp +has no relationship with the commit order of concurrent transactions.

+ current_timestamp() → timestamp

Returns the time of the current transaction.

The value is based on a timestamp picked when the transaction starts and which stays constant throughout the transaction. This timestamp @@ -349,6 +354,11 @@ hour, minute, second, millisecond, microsecond, epoch

extract_duration(element: string, input: interval) → int

Extracts element from input. Compatible elements: hour, minute, second, millisecond, microsecond.

 +now() → date

Returns the time of the current transaction.

+

The value is based on a timestamp picked when the transaction starts +and which stays constant throughout the transaction. This timestamp +has no relationship with the commit order of concurrent transactions.

+ now() → timestamp

Returns the time of the current transaction.

The value is based on a timestamp picked when the transaction starts and which stays constant throughout the transaction. This timestamp @@ -363,6 +373,11 @@ has no relationship with the commit order of concurrent transactions.

 statement_timestamp() → timestamptz

Returns the start time of the current statement.

 +transaction_timestamp() → date

Returns the time of the current transaction.

+

The value is based on a timestamp picked when the transaction starts +and which stays constant throughout the transaction. This timestamp +has no relationship with the commit order of concurrent transactions.

+ transaction_timestamp() → timestamp

Returns the time of the current transaction.

The value is based on a timestamp picked when the transaction starts and which stays constant throughout the transaction. This timestamp diff --git a/pkg/sql/logictest/testdata/logic_test/datetime b/pkg/sql/logictest/testdata/logic_test/datetime index f370011eb9e1..b60ba2b7205b 100644 --- a/pkg/sql/logictest/testdata/logic_test/datetime +++ b/pkg/sql/logictest/testdata/logic_test/datetime @@ -251,18 +251,19 @@ COMMIT TRANSACTION statement ok RESET TIME ZONE -query BB +query BBB SELECT - d = tz, d = t + d = tz, d = t, d = n FROM ( SELECT current_date()::DATE AS d, current_date()::TIMESTAMPTZ::DATE AS tz, - current_date()::TIMESTAMP::DATE AS t + current_date()::TIMESTAMP::DATE AS t, + now():::DATE AS n ) ---- -true true +true true true query B SELECT now() - current_date()::timestamptz < interval '24h10s' @@ -277,18 +278,19 @@ SELECT now() - current_date()::timestamptz < interval '24h10s' ---- true -query BB +query BBB SELECT - d = tz, d = t + d = tz, d = t, d = n FROM ( SELECT current_date()::DATE AS d, current_date()::TIMESTAMPTZ::DATE AS tz, - current_date()::TIMESTAMP::DATE AS t - ); + current_date()::TIMESTAMP::DATE AS t, + now():::DATE AS n + ) ---- -true true +true true true statement ok RESET TIME ZONE diff --git a/pkg/sql/logictest/testdata/logic_test/default b/pkg/sql/logictest/testdata/logic_test/default index 8b603521114d..79d1568a3b41 100644 --- a/pkg/sql/logictest/testdata/logic_test/default +++ b/pkg/sql/logictest/testdata/logic_test/default @@ -25,7 +25,8 @@ statement ok CREATE TABLE t ( a INT PRIMARY KEY DEFAULT 42, b TIMESTAMP DEFAULT now(), - c FLOAT DEFAULT random() + c FLOAT DEFAULT random(), + d DATE DEFAULT now() ) query TTBTTTB colnames @@ -35,14 +36,15 @@ column_name data_type is_nullable column_default generation_expression i a INT8 false 42:::INT8 · {primary} false b TIMESTAMP true now():::TIMESTAMP · {} false c FLOAT8 true random() · {} false +d DATE true now():::DATE · {} false statement ok -INSERT INTO t VALUES (DEFAULT, DEFAULT, DEFAULT) +INSERT INTO t VALUES (DEFAULT, DEFAULT, DEFAULT, DEFAULT) -query IBB -SELECT a, b <= now(), c >= 0.0 FROM t +query IBBB +SELECT a, b <= now(), c >= 0.0, d <= now() FROM t ---- -42 true true +42 true true true statement ok TRUNCATE TABLE t @@ -50,26 +52,26 @@ TRUNCATE TABLE t statement ok INSERT INTO t DEFAULT VALUES -query IBB -SELECT a, b <= now(), c >= 0.0 FROM t +query IBBB +SELECT a, b <= now(), c >= 0.0, d <= now() FROM t ---- -42 true true +42 true true true statement ok INSERT INTO t (a) VALUES (1) -query IBB -SELECT a, b <= now(), c >= 0.0 FROM t WHERE a = 1 +query IBBB +SELECT a, b <= now(), c >= 0.0, d <= now() FROM t WHERE a = 1 ---- -1 true true +1 true true true statement ok INSERT INTO t VALUES (2) -query IBB -SELECT a, b <= now(), c >= 0.0 FROM t WHERE a = 2 +query IBBB +SELECT a, b <= now(), c >= 0.0, d <= now() FROM t WHERE a = 2 ---- -2 true true +2 true true true statement ok UPDATE t SET (b, c) = ('2015-09-18 00:00:00', -1.0) @@ -77,24 +79,24 @@ UPDATE t SET (b, c) = ('2015-09-18 00:00:00', -1.0) statement ok UPDATE t SET b = DEFAULT WHERE a = 1 -query IBB -SELECT a, b <= now(), c = -1.0 FROM t WHERE a = 1 +query IBBB +SELECT a, b <= now(), c = -1.0, d <= now() FROM t WHERE a = 1 ---- -1 true true +1 true true true statement ok UPDATE t SET (b, c) = (DEFAULT, DEFAULT) WHERE a = 2 -query IBB -SELECT a, b <= now(), c >= 0.0 FROM t WHERE a = 2 +query IBBB +SELECT a, b <= now(), c >= 0.0, d <= now() FROM t WHERE a = 2 ---- -2 true true +2 true true true statement ok -UPDATE t SET b = DEFAULT, c = DEFAULT +UPDATE t SET b = DEFAULT, c = DEFAULT, d = DEFAULT statement ok -UPDATE t SET (b) = (DEFAULT), (c) = (DEFAULT) +UPDATE t SET (b) = (DEFAULT), (c) = (DEFAULT), (d) = (DEFAULT) # Test a table without a default and with a null default statement ok diff --git a/pkg/sql/sem/builtins/builtins.go b/pkg/sql/sem/builtins/builtins.go index 1654b972750a..7f71a818b805 100644 --- a/pkg/sql/sem/builtins/builtins.go +++ b/pkg/sql/sem/builtins/builtins.go @@ -1686,12 +1686,8 @@ CockroachDB supports the following flags: tree.Overload{ Types: tree.ArgTypes{}, ReturnType: tree.FixedReturnType(types.Date), - Fn: func(ctx *tree.EvalContext, args tree.Datums) (tree.Datum, error) { - t := ctx.GetTxnTimestampNoZone(time.Microsecond).Time - t = t.In(ctx.GetLocation()) - return tree.NewDDateFromTime(t) - }, - Info: "Returns the date of the current transaction." + txnTSContextDoc, + Fn: currentDate, + Info: "Returns the date of the current transaction." + txnTSContextDoc, }, ), @@ -3221,8 +3217,20 @@ var txnTSImpl = makeBuiltin( }, Info: txnTSDoc, }, + tree.Overload{ + Types: tree.ArgTypes{}, + ReturnType: tree.FixedReturnType(types.Date), + Fn: currentDate, + Info: txnTSDoc, + }, ) +func currentDate(ctx *tree.EvalContext, args tree.Datums) (tree.Datum, error) { + t := ctx.GetTxnTimestamp(time.Microsecond).Time + t = t.In(ctx.GetLocation()) + return tree.NewDDateFromTime(t) +} + var powImpls = makeBuiltin(defProps(), floatOverload2("x", "y", func(x, y float64) (tree.Datum, error) { return tree.NewDFloat(tree.DFloat(math.Pow(x, y))), nil