diff --git a/docs/RFCS/20170317_settings_table.md b/docs/RFCS/20170317_settings_table.md index 97332f32e230..d92c55737c86 100644 --- a/docs/RFCS/20170317_settings_table.md +++ b/docs/RFCS/20170317_settings_table.md @@ -55,7 +55,7 @@ A new system.settings table, keyed by string settings names would be created. CREATE TABLE system.settings ( name STRING PRIMARY KEY, value STRING, - updated TIMESTAMP WITH TIME ZONE DEFAULT NOW() NOT NULL, + updated TIMESTAMPTZ DEFAULT NOW() NOT NULL, valueType char NOT NULL DEFAULT 's', ) ``` diff --git a/pkg/cli/dump_test.go b/pkg/cli/dump_test.go index 394925702ddb..6e3e17688abc 100644 --- a/pkg/cli/dump_test.go +++ b/pkg/cli/dump_test.go @@ -204,6 +204,7 @@ func TestDumpRandom(t *testing.T) { fr real, d date, m timestamp, + mtz timestamptz, n interval, o bool, e decimal, @@ -212,7 +213,7 @@ func TestDumpRandom(t *testing.T) { u uuid, ip inet, j json, - PRIMARY KEY (rowid, i, si, bi, f, fr, d, m, n, o, e, s, b, u, ip) + PRIMARY KEY (rowid, i, si, bi, f, fr, d, m, mtz, n, o, e, s, b, u, ip) ); SET extra_float_digits = 3; `, nil); err != nil { @@ -287,6 +288,7 @@ func TestDumpRandom(t *testing.T) { f, // fr d, m, + m, []byte(n), // intervals come out as `[]byte`s o, []byte(e), // decimals come out as `[]byte`s @@ -296,14 +298,14 @@ func TestDumpRandom(t *testing.T) { []byte(ip.String()), []byte(j.String()), } - if err := conn.Exec("INSERT INTO d.t VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)", vals); err != nil { + if err := conn.Exec("INSERT INTO d.t VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)", vals); err != nil { t.Fatal(err) } generatedRows = append(generatedRows, vals[1:]) } check := func(table string) { - q := fmt.Sprintf("SELECT i, si, bi, f, fr, d, m, n, o, e, s, b, u, ip, j FROM %s ORDER BY rowid", table) + q := fmt.Sprintf("SELECT i, si, bi, f, fr, d, m, mtz, n, o, e, s, b, u, ip, j FROM %s ORDER BY rowid", table) nrows, err := conn.Query(q, nil) if err != nil { t.Fatal(err) diff --git a/pkg/cli/testdata/dump/row b/pkg/cli/testdata/dump/row index dcd9818f7686..4293fd1415bc 100644 --- a/pkg/cli/testdata/dump/row +++ b/pkg/cli/testdata/dump/row @@ -73,7 +73,7 @@ CREATE TABLE t ( ip INET NULL, j JSONB NULL, ary STRING[] NULL, - tz TIMESTAMP WITH TIME ZONE NULL, + tz TIMESTAMPTZ NULL, e1 DECIMAL(2) NULL, e2 DECIMAL(2,1) NULL, s1 STRING(1) NULL, diff --git a/pkg/sql/coltypes/timedate.go b/pkg/sql/coltypes/timedate.go index 9c3c7b45fc74..4a69f366e9c4 100644 --- a/pkg/sql/coltypes/timedate.go +++ b/pkg/sql/coltypes/timedate.go @@ -61,7 +61,7 @@ func (node *TTimestampTZ) TypeName() string { return "TIMESTAMPTZ" } // Format implements the ColTypeFormatter interface. func (node *TTimestampTZ) Format(buf *bytes.Buffer, f lex.EncodeFlags) { - buf.WriteString("TIMESTAMP WITH TIME ZONE") + buf.WriteString(node.TypeName()) } // TInterval represents an INTERVAL type diff --git a/pkg/sql/copy_in_test.go b/pkg/sql/copy_in_test.go index 4330d1d9c6a7..fdb73c3da370 100644 --- a/pkg/sql/copy_in_test.go +++ b/pkg/sql/copy_in_test.go @@ -56,7 +56,7 @@ func TestCopyNullInfNaN(t *testing.T) { e DECIMAL NULL, u UUID NULL, ip INET NULL, - tz TIMESTAMP WITH TIME ZONE NULL + tz TIMESTAMPTZ NULL ); `); err != nil { t.Fatal(err) @@ -151,7 +151,7 @@ func TestCopyRandom(t *testing.T) { b BYTES, u UUID, ip INET, - tz TIMESTAMP WITH TIME ZONE + tz TIMESTAMPTZ ); SET extra_float_digits = 3; -- to preserve floats entirely `); err != nil { diff --git a/pkg/sql/logictest/testdata/logic_test/alter_column_type b/pkg/sql/logictest/testdata/logic_test/alter_column_type index 0a9e2af18f26..189cdd7eb00a 100644 --- a/pkg/sql/logictest/testdata/logic_test/alter_column_type +++ b/pkg/sql/logictest/testdata/logic_test/alter_column_type @@ -16,12 +16,12 @@ ALTER TABLE t ALTER s TYPE BYTES, ALTER sl TYPE STRING(6), ALTER ts TYPE TIMESTA query TTBTTTB colnames SHOW COLUMNS FROM t ---- -column_name data_type is_nullable column_default generation_expression indices is_hidden -s BYTES true NULL · {} false -sl STRING(6) true NULL · {} false -t TIME true NULL · {} false -ts TIMESTAMP WITH TIME ZONE true NULL · {} false -rowid INT false unique_rowid() · {"primary"} true +column_name data_type is_nullable column_default generation_expression indices is_hidden +s BYTES true NULL · {} false +sl STRING(6) true NULL · {} false +t TIME true NULL · {} false +ts TIMESTAMPTZ true NULL · {} false +rowid INT false unique_rowid() · {"primary"} true query TTTT SELECT * FROM t diff --git a/pkg/sql/logictest/testdata/logic_test/collatedstring b/pkg/sql/logictest/testdata/logic_test/collatedstring index cd9d1439c399..996d3699f11a 100644 --- a/pkg/sql/logictest/testdata/logic_test/collatedstring +++ b/pkg/sql/logictest/testdata/logic_test/collatedstring @@ -280,7 +280,7 @@ SELECT '2017-01-10 16:05:50.734049+00:00' COLLATE en::TIMESTAMP 2017-01-10 16:05:50.734049 +0000 +0000 query T -SELECT '2017-01-10 16:05:50.734049+00:00' COLLATE en::TIMESTAMP WITH TIME ZONE +SELECT '2017-01-10 16:05:50.734049+00:00' COLLATE en::TIMESTAMPTZ ---- 2017-01-10 16:05:50.734049 +0000 +0000 diff --git a/pkg/sql/logictest/testdata/logic_test/datetime b/pkg/sql/logictest/testdata/logic_test/datetime index 403eadb4f6a8..205e2683c18e 100644 --- a/pkg/sql/logictest/testdata/logic_test/datetime +++ b/pkg/sql/logictest/testdata/logic_test/datetime @@ -33,7 +33,7 @@ statement ok CREATE TABLE u ( a BIGINT PRIMARY KEY, b TIMESTAMP, - c TIMESTAMP WITH TIME ZONE, + c TIMESTAMPTZ, d DATE, e INTERVAL ) @@ -176,7 +176,7 @@ BEGIN TRANSACTION statement ok CREATE TABLE kv ( k CHAR PRIMARY KEY, - v TIMESTAMP WITH TIME ZONE + v TIMESTAMPTZ ) statement ok @@ -336,9 +336,9 @@ statement ok CREATE TABLE ex ( k BIGINT PRIMARY KEY, element STRING, - input TIMESTAMP WITH TIME ZONE, + input TIMESTAMPTZ, extract_result INT, - date_trunc_result TIMESTAMP WITH TIME ZONE + date_trunc_result TIMESTAMPTZ ) statement ok @@ -907,17 +907,17 @@ statement ok CREATE TABLE tz ( a INT PRIMARY KEY, b TIMESTAMP, - c TIMESTAMP WITH TIME ZONE, + c TIMESTAMPTZ, d TIMESTAMPTZ ) query TTBTTTB SHOW COLUMNS FROM tz ---- -a INT false NULL · {"primary"} false -b TIMESTAMP true NULL · {} false -c TIMESTAMP WITH TIME ZONE true NULL · {} false -d TIMESTAMP WITH TIME ZONE true NULL · {} false +a INT false NULL · {"primary"} false +b TIMESTAMP true NULL · {} false +c TIMESTAMPTZ true NULL · {} false +d TIMESTAMPTZ true NULL · {} false statement ok INSERT INTO tz VALUES diff --git a/pkg/sql/logictest/testdata/logic_test/information_schema b/pkg/sql/logictest/testdata/logic_test/information_schema index a9534ec185fe..91dd3e962dda 100644 --- a/pkg/sql/logictest/testdata/logic_test/information_schema +++ b/pkg/sql/logictest/testdata/logic_test/information_schema @@ -860,7 +860,7 @@ data_types dv2 character varying VARCHAR(2) data_types dq char "char" data_types e bytea BYTES data_types f timestamp TIMESTAMP -data_types g timestamp with time zone TIMESTAMP WITH TIME ZONE +data_types g timestamp with time zone TIMESTAMPTZ data_types rowid integer INT statement ok @@ -1672,88 +1672,88 @@ is_grantable STRING true NULL · query TTBTTTB colnames SHOW COLUMNS FROM information_schema.routines ---- -column_name data_type is_nullable column_default generation_expression indices is_hidden -specific_catalog STRING true NULL · {} false -specific_schema STRING true NULL · {} false -specific_name STRING true NULL · {} false -routine_catalog STRING true NULL · {} false -routine_schema STRING true NULL · {} false -routine_name STRING true NULL · {} false -routine_type STRING true NULL · {} false -module_catalog STRING true NULL · {} false -module_schema STRING true NULL · {} false -module_name STRING true NULL · {} false -udt_catalog STRING true NULL · {} false -udt_schema STRING true NULL · {} false -udt_name STRING true NULL · {} false -data_type STRING true NULL · {} false -character_maximum_length INT true NULL · {} false -character_octet_length INT true NULL · {} false -character_set_catalog STRING true NULL · {} false -character_set_schema STRING true NULL · {} false -character_set_name STRING true NULL · {} false -collation_catalog STRING true NULL · {} false -collation_schema STRING true NULL · {} false -collation_name STRING true NULL · {} false -numeric_precision INT true NULL · {} false -numeric_precision_radix INT true NULL · {} false -numeric_scale INT true NULL · {} false -datetime_precision INT true NULL · {} false -interval_type STRING true NULL · {} false -interval_precision STRING true NULL · {} false -type_udt_catalog STRING true NULL · {} false -type_udt_schema STRING true NULL · {} false -type_udt_name STRING true NULL · {} false -scope_catalog STRING true NULL · {} false -scope_name STRING true NULL · {} false -maximum_cardinality INT true NULL · {} false -dtd_identifier STRING true NULL · {} false -routine_body STRING true NULL · {} false -routine_definition STRING true NULL · {} false -external_name STRING true NULL · {} false -external_language STRING true NULL · {} false -parameter_style STRING true NULL · {} false -is_deterministic STRING true NULL · {} false -sql_data_access STRING true NULL · {} false -is_null_call STRING true NULL · {} false -sql_path STRING true NULL · {} false -schema_level_routine STRING true NULL · {} false -max_dynamic_result_sets INT true NULL · {} false -is_user_defined_cast STRING true NULL · {} false -is_implicitly_invocable STRING true NULL · {} false -security_type STRING true NULL · {} false -to_sql_specific_catalog STRING true NULL · {} false -to_sql_specific_schema STRING true NULL · {} false -to_sql_specific_name STRING true NULL · {} false -as_locator STRING true NULL · {} false -created TIMESTAMP WITH TIME ZONE true NULL · {} false -last_altered TIMESTAMP WITH TIME ZONE true NULL · {} false -new_savepoint_level STRING true NULL · {} false -is_udt_dependent STRING true NULL · {} false -result_cast_from_data_type STRING true NULL · {} false -result_cast_as_locator STRING true NULL · {} false -result_cast_char_max_length INT true NULL · {} false -result_cast_char_octet_length STRING true NULL · {} false -result_cast_char_set_catalog STRING true NULL · {} false -result_cast_char_set_schema STRING true NULL · {} false -result_cast_char_set_name STRING true NULL · {} false -result_cast_collation_catalog STRING true NULL · {} false -result_cast_collation_schema STRING true NULL · {} false -result_cast_collation_name STRING true NULL · {} false -result_cast_numeric_precision INT true NULL · {} false -result_cast_numeric_precision_radix INT true NULL · {} false -result_cast_numeric_scale INT true NULL · {} false -result_cast_datetime_precision STRING true NULL · {} false -result_cast_interval_type STRING true NULL · {} false -result_cast_interval_precision INT true NULL · {} false -result_cast_type_udt_catalog STRING true NULL · {} false -result_cast_type_udt_schema STRING true NULL · {} false -result_cast_type_udt_name STRING true NULL · {} false -result_cast_scope_catalog STRING true NULL · {} false -result_cast_scope_schema STRING true NULL · {} false -result_cast_scope_name STRING true NULL · {} false -result_cast_maximum_cardinality INT true NULL · {} false -result_cast_dtd_identifier STRING true NULL · {} false +column_name data_type is_nullable column_default generation_expression indices is_hidden +specific_catalog STRING true NULL · {} false +specific_schema STRING true NULL · {} false +specific_name STRING true NULL · {} false +routine_catalog STRING true NULL · {} false +routine_schema STRING true NULL · {} false +routine_name STRING true NULL · {} false +routine_type STRING true NULL · {} false +module_catalog STRING true NULL · {} false +module_schema STRING true NULL · {} false +module_name STRING true NULL · {} false +udt_catalog STRING true NULL · {} false +udt_schema STRING true NULL · {} false +udt_name STRING true NULL · {} false +data_type STRING true NULL · {} false +character_maximum_length INT true NULL · {} false +character_octet_length INT true NULL · {} false +character_set_catalog STRING true NULL · {} false +character_set_schema STRING true NULL · {} false +character_set_name STRING true NULL · {} false +collation_catalog STRING true NULL · {} false +collation_schema STRING true NULL · {} false +collation_name STRING true NULL · {} false +numeric_precision INT true NULL · {} false +numeric_precision_radix INT true NULL · {} false +numeric_scale INT true NULL · {} false +datetime_precision INT true NULL · {} false +interval_type STRING true NULL · {} false +interval_precision STRING true NULL · {} false +type_udt_catalog STRING true NULL · {} false +type_udt_schema STRING true NULL · {} false +type_udt_name STRING true NULL · {} false +scope_catalog STRING true NULL · {} false +scope_name STRING true NULL · {} false +maximum_cardinality INT true NULL · {} false +dtd_identifier STRING true NULL · {} false +routine_body STRING true NULL · {} false +routine_definition STRING true NULL · {} false +external_name STRING true NULL · {} false +external_language STRING true NULL · {} false +parameter_style STRING true NULL · {} false +is_deterministic STRING true NULL · {} false +sql_data_access STRING true NULL · {} false +is_null_call STRING true NULL · {} false +sql_path STRING true NULL · {} false +schema_level_routine STRING true NULL · {} false +max_dynamic_result_sets INT true NULL · {} false +is_user_defined_cast STRING true NULL · {} false +is_implicitly_invocable STRING true NULL · {} false +security_type STRING true NULL · {} false +to_sql_specific_catalog STRING true NULL · {} false +to_sql_specific_schema STRING true NULL · {} false +to_sql_specific_name STRING true NULL · {} false +as_locator STRING true NULL · {} false +created TIMESTAMPTZ true NULL · {} false +last_altered TIMESTAMPTZ true NULL · {} false +new_savepoint_level STRING true NULL · {} false +is_udt_dependent STRING true NULL · {} false +result_cast_from_data_type STRING true NULL · {} false +result_cast_as_locator STRING true NULL · {} false +result_cast_char_max_length INT true NULL · {} false +result_cast_char_octet_length STRING true NULL · {} false +result_cast_char_set_catalog STRING true NULL · {} false +result_cast_char_set_schema STRING true NULL · {} false +result_cast_char_set_name STRING true NULL · {} false +result_cast_collation_catalog STRING true NULL · {} false +result_cast_collation_schema STRING true NULL · {} false +result_cast_collation_name STRING true NULL · {} false +result_cast_numeric_precision INT true NULL · {} false +result_cast_numeric_precision_radix INT true NULL · {} false +result_cast_numeric_scale INT true NULL · {} false +result_cast_datetime_precision STRING true NULL · {} false +result_cast_interval_type STRING true NULL · {} false +result_cast_interval_precision INT true NULL · {} false +result_cast_type_udt_catalog STRING true NULL · {} false +result_cast_type_udt_schema STRING true NULL · {} false +result_cast_type_udt_name STRING true NULL · {} false +result_cast_scope_catalog STRING true NULL · {} false +result_cast_scope_schema STRING true NULL · {} false +result_cast_scope_name STRING true NULL · {} false +result_cast_maximum_cardinality INT true NULL · {} false +result_cast_dtd_identifier STRING true NULL · {} false query TTTTTTTTTTTTTTIITTTTTTIIIITTTTTTTITTTTTTTTTTTITTTTTTTTTTTTTITTTTTTTIIITTITTTTTTIT colnames SELECT * FROM information_schema.routines diff --git a/pkg/sql/logictest/testdata/logic_test/pg_catalog b/pkg/sql/logictest/testdata/logic_test/pg_catalog index af82c270693f..648c47971586 100644 --- a/pkg/sql/logictest/testdata/logic_test/pg_catalog +++ b/pkg/sql/logictest/testdata/logic_test/pg_catalog @@ -1267,26 +1267,26 @@ datid datname pid usesysid username application_name client_addr client_h query TTBTTTB colnames SHOW COLUMNS FROM pg_catalog.pg_stat_activity ---- -column_name data_type is_nullable column_default generation_expression indices is_hidden -datid OID true NULL · {} false -datname NAME true NULL · {} false -pid INTEGER true NULL · {} false -usesysid OID true NULL · {} false -username NAME true NULL · {} false -application_name STRING true NULL · {} false -client_addr INET true NULL · {} false -client_hostname STRING true NULL · {} false -client_port INTEGER true NULL · {} false -backend_start TIMESTAMP WITH TIME ZONE true NULL · {} false -xact_start TIMESTAMP WITH TIME ZONE true NULL · {} false -query_start TIMESTAMP WITH TIME ZONE true NULL · {} false -state_change TIMESTAMP WITH TIME ZONE true NULL · {} false -wait_event_type STRING true NULL · {} false -wait_event STRING true NULL · {} false -state STRING true NULL · {} false -backend_xid INTEGER true NULL · {} false -backend_xmin INTEGER true NULL · {} false -query STRING true NULL · {} false +column_name data_type is_nullable column_default generation_expression indices is_hidden +datid OID true NULL · {} false +datname NAME true NULL · {} false +pid INTEGER true NULL · {} false +usesysid OID true NULL · {} false +username NAME true NULL · {} false +application_name STRING true NULL · {} false +client_addr INET true NULL · {} false +client_hostname STRING true NULL · {} false +client_port INTEGER true NULL · {} false +backend_start TIMESTAMPTZ true NULL · {} false +xact_start TIMESTAMPTZ true NULL · {} false +query_start TIMESTAMPTZ true NULL · {} false +state_change TIMESTAMPTZ true NULL · {} false +wait_event_type STRING true NULL · {} false +wait_event STRING true NULL · {} false +state STRING true NULL · {} false +backend_xid INTEGER true NULL · {} false +backend_xmin INTEGER true NULL · {} false +query STRING true NULL · {} false ## pg_catalog.pg_settings diff --git a/pkg/sql/logictest/testdata/logic_test/table b/pkg/sql/logictest/testdata/logic_test/table index e380b4011e3d..0a0a74a7a604 100644 --- a/pkg/sql/logictest/testdata/logic_test/table +++ b/pkg/sql/logictest/testdata/logic_test/table @@ -348,7 +348,7 @@ CREATE TABLE alltypes ( cstring12 STRING(12), ctext TEXT, ctimestamp TIMESTAMP, - ctimestampwtz TIMESTAMP WITH TIME ZONE, + ctimestampwtz TIMESTAMPTZ, cvarchar VARCHAR, cvarchar12 VARCHAR(12) ) @@ -356,50 +356,50 @@ CREATE TABLE alltypes ( query TTBTTTB colnames SHOW COLUMNS FROM alltypes ---- -column_name data_type is_nullable column_default generation_expression indices is_hidden -cbigint BIGINT true NULL · {} false -cbigserial INT false unique_rowid() · {} false -cblob BYTES true NULL · {} false -cbool BOOL true NULL · {} false -cbytea BYTES true NULL · {} false -cbytes BYTES true NULL · {} false -cchar CHAR true NULL · {} false -cchar12 CHAR(12) true NULL · {} false -cdate DATE true NULL · {} false -cdec DECIMAL true NULL · {} false -cdec1 DECIMAL(1) true NULL · {} false -cdec21 DECIMAL(2,1) true NULL · {} false -cdecimal DECIMAL true NULL · {} false -cdecimal1 DECIMAL(1) true NULL · {} false -cdecimal21 DECIMAL(2,1) true NULL · {} false -cdoubleprecision FLOAT8 true NULL · {} false -cfloat FLOAT8 true NULL · {} false -cfloat4 FLOAT4 true NULL · {} false -cfloat8 FLOAT8 true NULL · {} false -cint INT true NULL · {} false -cint2 SMALLINT true NULL · {} false -cint4 INTEGER true NULL · {} false -cint64 BIGINT true NULL · {} false -cint8 BIGINT true NULL · {} false -cinteger INTEGER true NULL · {} false -cinterval INTERVAL true NULL · {} false -cjson JSONB true NULL · {} false -cnumeric DECIMAL true NULL · {} false -cnumeric1 DECIMAL(1) true NULL · {} false -cnumeric21 DECIMAL(2,1) true NULL · {} false -cqchar "char" true NULL · {} false -creal FLOAT4 true NULL · {} false -cserial INT false unique_rowid() · {} false -csmallint SMALLINT true NULL · {} false -csmallserial INT false unique_rowid() · {} false -cstring STRING true NULL · {} false -cstring12 STRING(12) true NULL · {} false -ctext STRING true NULL · {} false -ctimestamp TIMESTAMP true NULL · {} false -ctimestampwtz TIMESTAMP WITH TIME ZONE true NULL · {} false -cvarchar VARCHAR true NULL · {} false -cvarchar12 VARCHAR(12) true NULL · {} false -rowid INT false unique_rowid() · {"primary"} true +column_name data_type is_nullable column_default generation_expression indices is_hidden +cbigint BIGINT true NULL · {} false +cbigserial INT false unique_rowid() · {} false +cblob BYTES true NULL · {} false +cbool BOOL true NULL · {} false +cbytea BYTES true NULL · {} false +cbytes BYTES true NULL · {} false +cchar CHAR true NULL · {} false +cchar12 CHAR(12) true NULL · {} false +cdate DATE true NULL · {} false +cdec DECIMAL true NULL · {} false +cdec1 DECIMAL(1) true NULL · {} false +cdec21 DECIMAL(2,1) true NULL · {} false +cdecimal DECIMAL true NULL · {} false +cdecimal1 DECIMAL(1) true NULL · {} false +cdecimal21 DECIMAL(2,1) true NULL · {} false +cdoubleprecision FLOAT8 true NULL · {} false +cfloat FLOAT8 true NULL · {} false +cfloat4 FLOAT4 true NULL · {} false +cfloat8 FLOAT8 true NULL · {} false +cint INT true NULL · {} false +cint2 SMALLINT true NULL · {} false +cint4 INTEGER true NULL · {} false +cint64 BIGINT true NULL · {} false +cint8 BIGINT true NULL · {} false +cinteger INTEGER true NULL · {} false +cinterval INTERVAL true NULL · {} false +cjson JSONB true NULL · {} false +cnumeric DECIMAL true NULL · {} false +cnumeric1 DECIMAL(1) true NULL · {} false +cnumeric21 DECIMAL(2,1) true NULL · {} false +cqchar "char" true NULL · {} false +creal FLOAT4 true NULL · {} false +cserial INT false unique_rowid() · {} false +csmallint SMALLINT true NULL · {} false +csmallserial INT false unique_rowid() · {} false +cstring STRING true NULL · {} false +cstring12 STRING(12) true NULL · {} false +ctext STRING true NULL · {} false +ctimestamp TIMESTAMP true NULL · {} false +ctimestampwtz TIMESTAMPTZ true NULL · {} false +cvarchar VARCHAR true NULL · {} false +cvarchar12 VARCHAR(12) true NULL · {} false +rowid INT false unique_rowid() · {"primary"} true statement ok CREATE DATABASE IF NOT EXISTS smtng diff --git a/pkg/sql/opt/memo/testdata/memo b/pkg/sql/opt/memo/testdata/memo index 6e05e5a9bb88..d761a10e9391 100644 --- a/pkg/sql/opt/memo/testdata/memo +++ b/pkg/sql/opt/memo/testdata/memo @@ -214,7 +214,7 @@ memo (optimized) ├── G6: (const 1) ├── G7: (plus G13 G14) ├── G8: (cast G12 TIMESTAMP) - ├── G9: (cast G12 TIMESTAMP WITH TIME ZONE) + ├── G9: (cast G12 TIMESTAMPTZ) ├── G10: (eq G13 G14) ├── G11: (eq G15 G15) ├── G12: (function G18 G16 left) diff --git a/pkg/sql/parser/parse_test.go b/pkg/sql/parser/parse_test.go index 4f5d26c04732..100fabbf2ef7 100644 --- a/pkg/sql/parser/parse_test.go +++ b/pkg/sql/parser/parse_test.go @@ -592,7 +592,7 @@ func TestParse(t *testing.T) { {`SELECT DATE 'foo', 'foo'::DATE`}, {`SELECT TIME 'foo', 'foo'::TIME`}, {`SELECT TIMESTAMP 'foo', 'foo'::TIMESTAMP`}, - {`SELECT TIMESTAMP WITH TIME ZONE 'foo', 'foo'::TIMESTAMP WITH TIME ZONE`}, + {`SELECT TIMESTAMPTZ 'foo', 'foo'::TIMESTAMPTZ`}, {`SELECT JSONB 'foo', 'foo'::JSONB`}, {`SELECT SERIAL 'foo', 'foo'::SERIAL`}, @@ -1113,6 +1113,8 @@ func TestParse2(t *testing.T) { `CREATE TABLE a (b STRING)`}, {`CREATE TABLE a (b JSON)`, `CREATE TABLE a (b JSONB)`}, + {`CREATE TABLE a (b TIMESTAMP WITH TIME ZONE)`, + `CREATE TABLE a (b TIMESTAMPTZ)`}, {`CREATE TABLE a (b BYTES, c BYTEA, d BLOB)`, `CREATE TABLE a (b BYTES, c BYTES, d BYTES)`}, {`CREATE TABLE a (b CHAR(1), c CHARACTER(1), d CHARACTER(3))`, diff --git a/pkg/sql/sem/tree/col_types_test.go b/pkg/sql/sem/tree/col_types_test.go index bd1d1bd046fd..127e31eb50e7 100644 --- a/pkg/sql/sem/tree/col_types_test.go +++ b/pkg/sql/sem/tree/col_types_test.go @@ -49,7 +49,7 @@ func TestParseColumnType(t *testing.T) { {"JSONB", &coltypes.TJSON{}}, {"TIME", &coltypes.TTime{}}, {"TIMESTAMP", &coltypes.TTimestamp{}}, - {"TIMESTAMP WITH TIME ZONE", &coltypes.TTimestampTZ{}}, + {"TIMESTAMPTZ", &coltypes.TTimestampTZ{}}, {"INTERVAL", &coltypes.TInterval{}}, {"STRING", &coltypes.TString{Variant: coltypes.TStringVariantSTRING}}, {"CHAR", &coltypes.TString{Variant: coltypes.TStringVariantCHAR, N: 1}}, diff --git a/pkg/sql/sqlbase/column_type_properties.go b/pkg/sql/sqlbase/column_type_properties.go index 3e4f60c5bdf5..0e939ffdaac3 100644 --- a/pkg/sql/sqlbase/column_type_properties.go +++ b/pkg/sql/sqlbase/column_type_properties.go @@ -273,8 +273,6 @@ func (c *ColumnType) SQLString() string { } return fmt.Sprintf("%s(%d)", c.SemanticType.String(), c.Precision) } - case ColumnType_TIMESTAMPTZ: - return "TIMESTAMP WITH TIME ZONE" case ColumnType_ARRAY: return c.elementColumnType().SQLString() + "[]" } diff --git a/pkg/util/timeofday/time_of_day.go b/pkg/util/timeofday/time_of_day.go index 55bd47090be1..7536a0f2192b 100644 --- a/pkg/util/timeofday/time_of_day.go +++ b/pkg/util/timeofday/time_of_day.go @@ -81,7 +81,7 @@ func positiveMod(x, y int64) int64 { // FromTime constructs a TimeOfDay from a time.Time, ignoring the date and time zone. func FromTime(t time.Time) TimeOfDay { // Adjust for timezone offset so it won't affect the time. This is necessary - // at times, like when casting from a TIMESTAMP WITH TIME ZONE. + // at times, like when casting from a TIMESTAMPTZ. _, offset := t.Zone() unixSeconds := t.Unix() + int64(offset)