Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

builtins: add now() -> date implementation #37284

Merged
merged 1 commit into from May 3, 2019
Merged

builtins: add now() -> date implementation #37284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions docs/generated/sql/functions.md
View file
Open in desktop
Expand Up @@ -285,6 +285,11 @@
and which stays constant throughout the transaction. This timestamp
has no relationship with the commit order of concurrent transactions.</p>
</span></td></tr>
<tr><td><code>current_timestamp() &rarr; <a href="date.html">date</a></code></td><td><span class="funcdesc"><p>Returns the time of the current transaction.</p>
<p>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.</p>
</span></td></tr>
<tr><td><code>current_timestamp() &rarr; <a href="timestamp.html">timestamp</a></code></td><td><span class="funcdesc"><p>Returns the time of the current transaction.</p>
<p>The value is based on a timestamp picked when the transaction starts
and which stays constant throughout the transaction. This timestamp
Expand Down Expand Up @@ -349,6 +354,11 @@ hour, minute, second, millisecond, microsecond, epoch</p>
<tr><td><code>extract_duration(element: <a href="string.html">string</a>, input: <a href="interval.html">interval</a>) &rarr; <a href="int.html">int</a></code></td><td><span class="funcdesc"><p>Extracts <code>element</code> from <code>input</code>.
Compatible elements: hour, minute, second, millisecond, microsecond.</p>
</span></td></tr>
<tr><td><code>now() &rarr; <a href="date.html">date</a></code></td><td><span class="funcdesc"><p>Returns the time of the current transaction.</p>
<p>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.</p>
</span></td></tr>
<tr><td><code>now() &rarr; <a href="timestamp.html">timestamp</a></code></td><td><span class="funcdesc"><p>Returns the time of the current transaction.</p>
<p>The value is based on a timestamp picked when the transaction starts
and which stays constant throughout the transaction. This timestamp
Expand All @@ -363,6 +373,11 @@ has no relationship with the commit order of concurrent transactions.</p>
</span></td></tr>
<tr><td><code>statement_timestamp() &rarr; <a href="timestamp.html">timestamptz</a></code></td><td><span class="funcdesc"><p>Returns the start time of the current statement.</p>
</span></td></tr>
<tr><td><code>transaction_timestamp() &rarr; <a href="date.html">date</a></code></td><td><span class="funcdesc"><p>Returns the time of the current transaction.</p>
<p>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.</p>
</span></td></tr>
<tr><td><code>transaction_timestamp() &rarr; <a href="timestamp.html">timestamp</a></code></td><td><span class="funcdesc"><p>Returns the time of the current transaction.</p>
<p>The value is based on a timestamp picked when the transaction starts
and which stays constant throughout the transaction. This timestamp
Expand Down
20 changes: 11 additions & 9 deletions pkg/sql/logictest/testdata/logic_test/datetime
View file
Open in desktop
Expand Up @@ -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'
Expand All @@ -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
Expand Down
46 changes: 24 additions & 22 deletions pkg/sql/logictest/testdata/logic_test/default
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -35,66 +36,67 @@ 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

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)

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
Expand Down
20 changes: 14 additions & 6 deletions pkg/sql/sem/builtins/builtins.go
View file
Open in desktop
Expand Up @@ -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,
},
),

Expand Down Expand Up @@ -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
Expand Down