add timestamp, time

Author: pyramation

packages/deparser/__tests__/pretty/__snapshots__/constraints-pretty.test.ts.snap

@@ -20,7 +20,7 @@ exports[`non-pretty: pretty/constraints-9.sql 1`] = `"ALTER TABLE finance.transa
 
 exports[`non-pretty: pretty/constraints-10.sql 1`] = `"ALTER TABLE school.enrollments ADD CONSTRAINT fk_student_course FOREIGN KEY (student_id, course_id) REFERENCES school.courses_students (student_id, course_id)"`;
 
-exports[`non-pretty: pretty/constraints-11.sql 1`] = `"CREATE TABLE orders (id serial PRIMARY KEY, user_id int NOT NULL, total numeric(10, 2) CHECK (total > 0), status varchar(20) DEFAULT 'pending', created_at pg_catalog.timestamp DEFAULT now(), CONSTRAINT fk_user FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE, CONSTRAINT unique_user_date UNIQUE (user_id, created_at), CONSTRAINT check_status CHECK (status IN ('pending', 'completed', 'cancelled')))"`;
+exports[`non-pretty: pretty/constraints-11.sql 1`] = `"CREATE TABLE orders (id serial PRIMARY KEY, user_id int NOT NULL, total numeric(10, 2) CHECK (total > 0), status varchar(20) DEFAULT 'pending', created_at timestamp DEFAULT now(), CONSTRAINT fk_user FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE, CONSTRAINT unique_user_date UNIQUE (user_id, created_at), CONSTRAINT check_status CHECK (status IN ('pending', 'completed', 'cancelled')))"`;
 
 exports[`non-pretty: pretty/constraints-12.sql 1`] = `"ALTER TABLE products ADD CONSTRAINT fk_category FOREIGN KEY (category_id) REFERENCES categories (id) ON UPDATE CASCADE ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED"`;
 
@@ -104,7 +104,7 @@ exports[`pretty: pretty/constraints-11.sql 1`] = `
   user_id int NOT NULL,
   total numeric(10, 2) CHECK (total > 0),
   status varchar(20) DEFAULT 'pending',
-  created_at pg_catalog.timestamp DEFAULT now(),
+  created_at timestamp DEFAULT now(),
   CONSTRAINT fk_user
     FOREIGN KEY(user_id)
     REFERENCES users (id)

packages/deparser/__tests__/pretty/__snapshots__/create-table-pretty.test.ts.snap

@@ -2,15 +2,15 @@
 
 exports[`non-pretty: pretty/create_table-1.sql 1`] = `"CREATE TABLE users (id serial PRIMARY KEY, name text NOT NULL, email text UNIQUE)"`;
 
-exports[`non-pretty: pretty/create_table-2.sql 1`] = `"CREATE TABLE products (id serial PRIMARY KEY, name varchar(255) NOT NULL, price numeric(10, 2) CHECK (price > 0), category_id int, description text, created_at pg_catalog.timestamp DEFAULT now(), updated_at pg_catalog.timestamp, UNIQUE (name, category_id), FOREIGN KEY (category_id) REFERENCES categories (id))"`;
+exports[`non-pretty: pretty/create_table-2.sql 1`] = `"CREATE TABLE products (id serial PRIMARY KEY, name varchar(255) NOT NULL, price numeric(10, 2) CHECK (price > 0), category_id int, description text, created_at timestamp DEFAULT now(), updated_at timestamp, UNIQUE (name, category_id), FOREIGN KEY (category_id) REFERENCES categories (id))"`;
 
 exports[`non-pretty: pretty/create_table-3.sql 1`] = `"CREATE TABLE orders (id serial PRIMARY KEY, subtotal numeric(10, 2) NOT NULL, tax_rate numeric(5, 4) DEFAULT 0.0825, tax_amount numeric(10, 2) GENERATED ALWAYS AS (subtotal * tax_rate) STORED, total numeric(10, 2) GENERATED ALWAYS AS (subtotal + tax_amount) STORED)"`;
 
 exports[`non-pretty: pretty/create_table-4.sql 1`] = `"CREATE TABLE sales (id serial, sale_date date NOT NULL, amount numeric(10, 2), region varchar(50)) PARTITION BY RANGE (sale_date)"`;
 
 exports[`non-pretty: pretty/create_table-5.sql 1`] = `"CREATE TEMPORARY TABLE temp_calculations (id int, value numeric(15, 5), result text)"`;
 
-exports[`non-pretty: pretty/create_table-6.sql 1`] = `"CREATE TABLE orders (id serial PRIMARY KEY, user_id int NOT NULL, total numeric(10, 2) CHECK (total > 0), status varchar(20) DEFAULT 'pending', created_at pg_catalog.timestamp DEFAULT now(), FOREIGN KEY (user_id) REFERENCES users (id))"`;
+exports[`non-pretty: pretty/create_table-6.sql 1`] = `"CREATE TABLE orders (id serial PRIMARY KEY, user_id int NOT NULL, total numeric(10, 2) CHECK (total > 0), status varchar(20) DEFAULT 'pending', created_at timestamp DEFAULT now(), FOREIGN KEY (user_id) REFERENCES users (id))"`;
 
 exports[`pretty: pretty/create_table-1.sql 1`] = `
 "CREATE TABLE users (
@@ -27,8 +27,8 @@ exports[`pretty: pretty/create_table-2.sql 1`] = `
   price numeric(10, 2) CHECK (price > 0),
   category_id int,
   description text,
-  created_at pg_catalog.timestamp DEFAULT now(),
-  updated_at pg_catalog.timestamp,
+  created_at timestamp DEFAULT now(),
+  updated_at timestamp,
   UNIQUE (name, category_id),
   FOREIGN KEY(category_id)
     REFERENCES categories (id)
@@ -68,7 +68,7 @@ exports[`pretty: pretty/create_table-6.sql 1`] = `
   user_id int NOT NULL,
   total numeric(10, 2) CHECK (total > 0),
   status varchar(20) DEFAULT 'pending',
-  created_at pg_catalog.timestamp DEFAULT now(),
+  created_at timestamp DEFAULT now(),
   FOREIGN KEY(user_id)
     REFERENCES users (id)
 )"

packages/deparser/__tests__/pretty/__snapshots__/misc-pretty.test.ts.snap

@@ -8,7 +8,7 @@ exports[`non-pretty: pretty/misc-3.sql 1`] = `"SELECT u.id, u.name, j.key, j.val
 
 exports[`non-pretty: pretty/misc-4.sql 1`] = `"SELECT p.id, p.title, CASE WHEN EXISTS (SELECT 1 FROM reviews AS r WHERE r.product_id = p.id AND r.rating >= 4) THEN 'Popular' ELSE 'Unrated' END AS status FROM products AS p WHERE p.archived = false"`;
 
-exports[`non-pretty: pretty/misc-5.sql 1`] = `"WITH logs AS (SELECT id, payload::json ->> 'event' AS event, CAST(payload::json ->> 'ts' AS pg_catalog.timestamp) AS ts FROM event_log WHERE ts > (now() - '7 days'::interval)) SELECT event, count(*) AS freq FROM ( SELECT DISTINCT event, ts::date AS event_day FROM logs ) AS d GROUP BY event ORDER BY freq DESC"`;
+exports[`non-pretty: pretty/misc-5.sql 1`] = `"WITH logs AS (SELECT id, payload::json ->> 'event' AS event, CAST(payload::json ->> 'ts' AS timestamp) AS ts FROM event_log WHERE ts > (now() - '7 days'::interval)) SELECT event, count(*) AS freq FROM ( SELECT DISTINCT event, ts::date AS event_day FROM logs ) AS d GROUP BY event ORDER BY freq DESC"`;
 
 exports[`non-pretty: pretty/misc-6.sql 1`] = `"SELECT o.id AS order_id, u.name AS user_name, p.name AS product_name, s.status, sh.shipped_at, r.refund_amount FROM orders AS o JOIN users AS u ON o.user_id = u.id JOIN order_items AS oi ON oi.order_id = o.id JOIN products AS p ON (p.id = oi.product_id AND p.available = true) OR (p.sku = oi.product_sku AND (p.discontinued = false OR p.replacement_id IS NOT NULL)) LEFT JOIN shipping AS sh ON sh.order_id = o.id AND ((sh.carrier = 'UPS' AND sh.tracking_number IS NOT NULL) OR (sh.carrier = 'FedEx' AND sh.shipped_at > (o.created_at + '1 day'::interval))) LEFT JOIN statuses AS s ON s.id = o.status_id AND (s.name <> 'cancelled' OR (s.name = 'cancelled' AND s.updated_at > (now() - '7 days'::interval))) LEFT JOIN refunds AS r ON r.order_id = o.id AND ((r.status = 'approved' AND r.processed_at IS NOT NULL) OR (r.status = 'pending' AND r.requested_at < (now() - '14 days'::interval))) WHERE o.created_at > (now() - '90 days'::interval) AND u.active = true AND (s.status = 'shipped' OR (s.status = 'processing' AND EXISTS (SELECT 1 FROM order_notes AS n WHERE (n.order_id = o.id AND n.note ILIKE '%expedite%')))) ORDER BY o.created_at DESC"`;
 
@@ -109,7 +109,7 @@ exports[`pretty: pretty/misc-5.sql 1`] = `
 logs AS (SELECT
   id,
   payload::json ->> 'event' AS event,
-  CAST(payload::json ->> 'ts' AS pg_catalog.timestamp) AS ts
+  CAST(payload::json ->> 'ts' AS timestamp) AS ts
 FROM event_log
 WHERE
   ts > (now() - '7 days'::interval))

packages/deparser/__tests__/pretty/__snapshots__/pg-catalog.test.ts.snap

@@ -36,19 +36,19 @@ exports[`non-pretty: misc/pg_catalog-17.sql 1`] = `"SELECT json_agg(name) FROM (
 
 exports[`non-pretty: misc/pg_catalog-timestamp-etc-1.sql 1`] = `"CREATE TABLE public."ACTIVITY" ("ACTIVITY_ID" bigint NOT NULL, "PUBLISHED" timestamp(2) with time zone)"`;
 
-exports[`non-pretty: misc/pg_catalog-timestamp-etc-2.sql 1`] = `"CREATE TABLE public."ACTIVITY" ("ACTIVITY_ID" bigint NOT NULL, "PUBLISHED" pg_catalog.timestamp(2))"`;
+exports[`non-pretty: misc/pg_catalog-timestamp-etc-2.sql 1`] = `"CREATE TABLE public."ACTIVITY" ("ACTIVITY_ID" bigint NOT NULL, "PUBLISHED" timestamp(2))"`;
 
 exports[`non-pretty: misc/pg_catalog-timestamp-etc-3.sql 1`] = `"CREATE TABLE public."EXAMPLE" ("MESSAGE" text)"`;
 
-exports[`non-pretty: misc/pg_catalog-timestamp-etc-4.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIME" ("START_TIME" pg_catalog.time)"`;
+exports[`non-pretty: misc/pg_catalog-timestamp-etc-4.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIME" ("START_TIME" time)"`;
 
 exports[`non-pretty: misc/pg_catalog-timestamp-etc-5.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIMETZ" ("START_TIME" time with time zone)"`;
 
-exports[`non-pretty: misc/pg_catalog-timestamp-etc-6.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIME_PRECISION" ("START_TIME" pg_catalog.time(3))"`;
+exports[`non-pretty: misc/pg_catalog-timestamp-etc-6.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIME_PRECISION" ("START_TIME" time(3))"`;
 
 exports[`non-pretty: misc/pg_catalog-timestamp-etc-7.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIMETZ_PRECISION" ("START_TIME" time(3) with time zone)"`;
 
-exports[`non-pretty: misc/pg_catalog-timestamp-etc-8.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIMESTAMP" ("CREATED_AT" pg_catalog.timestamp)"`;
+exports[`non-pretty: misc/pg_catalog-timestamp-etc-8.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIMESTAMP" ("CREATED_AT" timestamp)"`;
 
 exports[`non-pretty: misc/pg_catalog-timestamp-etc-9.sql 1`] = `"CREATE TABLE public."EXAMPLE_TIMESTAMPTZ" ("CREATED_AT" timestamp with time zone)"`;
 
@@ -129,7 +129,7 @@ exports[`pretty: misc/pg_catalog-timestamp-etc-1.sql 1`] = `
 exports[`pretty: misc/pg_catalog-timestamp-etc-2.sql 1`] = `
 "CREATE TABLE public."ACTIVITY" (
   "ACTIVITY_ID" bigint NOT NULL,
-  "PUBLISHED" pg_catalog.timestamp(2)
+  "PUBLISHED" timestamp(2)
 )"
 `;
 
@@ -141,7 +141,7 @@ exports[`pretty: misc/pg_catalog-timestamp-etc-3.sql 1`] = `
 
 exports[`pretty: misc/pg_catalog-timestamp-etc-4.sql 1`] = `
 "CREATE TABLE public."EXAMPLE_TIME" (
-  "START_TIME" pg_catalog.time
+  "START_TIME" time
 )"
 `;
 
@@ -153,7 +153,7 @@ exports[`pretty: misc/pg_catalog-timestamp-etc-5.sql 1`] = `
 
 exports[`pretty: misc/pg_catalog-timestamp-etc-6.sql 1`] = `
 "CREATE TABLE public."EXAMPLE_TIME_PRECISION" (
-  "START_TIME" pg_catalog.time(3)
+  "START_TIME" time(3)
 )"
 `;
 
@@ -165,7 +165,7 @@ exports[`pretty: misc/pg_catalog-timestamp-etc-7.sql 1`] = `
 
 exports[`pretty: misc/pg_catalog-timestamp-etc-8.sql 1`] = `
 "CREATE TABLE public."EXAMPLE_TIMESTAMP" (
-  "CREATED_AT" pg_catalog.timestamp
+  "CREATED_AT" timestamp
 )"
 `;
 

packages/deparser/src/deparser.ts

@@ -1830,6 +1830,20 @@ export class Deparser implements DeparserVisitor {
           } else {
             typeName = 'time with time zone';
           }
+        } else if (type === 'timestamp') {
+          if (args) {
+            typeName = `timestamp(${args})`;
+            args = null; // Don't apply args again in mods()
+          } else {
+            typeName = 'timestamp';
+          }
+        } else if (type === 'time') {
+          if (args) {
+            typeName = `time(${args})`;
+            args = null; // Don't apply args again in mods()
+          } else {
+            typeName = 'time';
+          }
         }
 
         let result = mods(typeName, args);