# HG changeset patch
# User Sascha Wilde <wilde@intevation.de>
# Date 1564071564 -7200
# Node ID b65837b6547932db5019f5401d6e6689807f2e28
# Parent  c1c6a375305f579bde18f85c46c55389480fcf2e# Parent  287dfd4dbdb6a9da6f844ece1675f91b55f6cca4
Merged default

diff -r c1c6a375305f -r b65837b65479 schema/gemma.sql
--- a/schema/gemma.sql	Thu Jul 25 17:39:40 2019 +0200
+++ b/schema/gemma.sql	Thu Jul 25 18:19:24 2019 +0200
@@ -834,8 +834,8 @@
         id         int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
         state      import_state NOT NULL DEFAULT 'queued',
         kind       varchar   NOT NULL,
-        enqueued   timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
-        due        timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        enqueued   timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        due        timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
         retry_wait interval
             CHECK(retry_wait IS NULL
                 OR retry_wait >= interval '0 microseconds'),
@@ -858,7 +858,7 @@
     CREATE TABLE import_logs (
         import_id int NOT NULL REFERENCES imports(id)
             ON DELETE CASCADE,
-        time timestamp with time zone NOT NULL DEFAULT now(),
+        time timestamp zone NOT NULL DEFAULT now(),
         kind log_type NOT NULL DEFAULT 'info',
         msg TEXT NOT NULL
     )
diff -r c1c6a375305f -r b65837b65479 schema/updates/1010/01.timezones-imports.sql
--- a/schema/updates/1010/01.timezones-imports.sql	Thu Jul 25 17:39:40 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-ALTER TABLE import.imports     ALTER COLUMN enqueued TYPE timestamp with time zone;
-ALTER TABLE import.imports     ALTER COLUMN due      TYPE timestamp with time zone;
-ALTER TABLE import.import_logs ALTER COLUMN time     TYPE timestamp with time zone;
diff -r c1c6a375305f -r b65837b65479 schema/version.sql