From 4172d5015cb2aa15fa48da9b3dfdefcdfa3af8f7 Mon Sep 17 00:00:00 2001
From: maximsmol <1472826+maximsmol@users.noreply.github.com>
Date: Wed, 16 Oct 2024 14:52:52 -0700
Subject: [PATCH 1/5] Set session timezone to local timezone on startup

Signed-off-by: maximsmol <1472826+maximsmol@users.noreply.github.com>
---
 pgcli/main.py      | 7 +++++++
 pgcli/pgexecute.py | 5 +++++
 setup.py           | 1 +
 3 files changed, 13 insertions(+)

diff --git a/pgcli/main.py b/pgcli/main.py
index d4c6dbf6d..066a3fb6e 100644
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -1624,6 +1624,13 @@ def cli(
     else:
         pgcli.connect(database, host, user, port)
 
+    try:
+        import tzlocal
+
+        pgcli.pgexecute.set_timezone(tzlocal.get_localzone_name())
+    except ImportError:
+        ...
+
     if list_databases:
         cur, headers, status = pgcli.pgexecute.full_databases()
 
diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index e09175728..65cda1757 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -881,3 +881,8 @@ def casing(self):
 
     def explain_prefix(self):
         return "EXPLAIN (ANALYZE, COSTS, VERBOSE, BUFFERS, FORMAT JSON) "
+
+    def set_timezone(self, timezone: str):
+        query = psycopg.sql.SQL("set time zone {}").format(psycopg.sql.Identifier(timezone))
+        with self.conn.cursor() as cur:
+            cur.execute(query)
diff --git a/setup.py b/setup.py
index f4606c2ba..40f50ae73 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
     "sqlparse >=0.3.0,<0.6",
     "configobj >= 5.0.6",
     "cli_helpers[styles] >= 2.2.1",
+    "tzlocal >= 5.2"
 ]
 
 

From ca450d23305e0674449a4ee4026bb8981092bd41 Mon Sep 17 00:00:00 2001
From: maximsmol <1472826+maximsmol@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:02:39 -0700
Subject: [PATCH 2/5] Update changelog

Signed-off-by: maximsmol <1472826+maximsmol@users.noreply.github.com>
---
 changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.rst b/changelog.rst
index 47e45b88f..6d3fde1aa 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -4,6 +4,7 @@ Dev
 Features
 --------
 * Add a `--ping` command line option; allows pgcli to replace `pg_isready`
+* The session time zone setting is set to the system time zone by default
 
 Bug fixes:
 ----------

From d8bd63961141c0f0980138a353e93b8e29fdba96 Mon Sep 17 00:00:00 2001
From: maximsmol <1472826+maximsmol@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:02:46 -0700
Subject: [PATCH 3/5] Unconditionally import tzlocal

Signed-off-by: maximsmol <1472826+maximsmol@users.noreply.github.com>
---
 pgcli/main.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pgcli/main.py b/pgcli/main.py
index 066a3fb6e..1b09d8d83 100644
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -23,6 +23,7 @@
 from cli_helpers.utils import strip_ansi
 from .explain_output_formatter import ExplainOutputFormatter
 import click
+import tzlocal
 
 try:
     import setproctitle
@@ -1624,12 +1625,7 @@ def cli(
     else:
         pgcli.connect(database, host, user, port)
 
-    try:
-        import tzlocal
-
-        pgcli.pgexecute.set_timezone(tzlocal.get_localzone_name())
-    except ImportError:
-        ...
+    pgcli.pgexecute.set_timezone(tzlocal.get_localzone_name())
 
     if list_databases:
         cur, headers, status = pgcli.pgexecute.full_databases()

From 4a60eaf3fe39a22a6a705844054491882d8deee3 Mon Sep 17 00:00:00 2001
From: maximsmol <1472826+maximsmol@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:03:18 -0700
Subject: [PATCH 4/5] Update authors

Signed-off-by: maximsmol <1472826+maximsmol@users.noreply.github.com>
---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index cac2b38dc..7a7fc6944 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -136,6 +136,7 @@ Contributors:
     * saucoide
     * Chris Rose (offbyone/offby1)
     * Chris Novakovic
+    * Max Smolin (maximsmol)
 
 Creator:
 --------

From 62a5b9dee617a67baa6b42a0c67523b89b521d27 Mon Sep 17 00:00:00 2001
From: maximsmol <1472826+maximsmol@users.noreply.github.com>
Date: Wed, 16 Oct 2024 15:04:44 -0700
Subject: [PATCH 5/5] Format

Signed-off-by: maximsmol <1472826+maximsmol@users.noreply.github.com>
---
 pgcli/pgexecute.py | 4 +++-
 setup.py           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index 65cda1757..a25902501 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -883,6 +883,8 @@ def explain_prefix(self):
         return "EXPLAIN (ANALYZE, COSTS, VERBOSE, BUFFERS, FORMAT JSON) "
 
     def set_timezone(self, timezone: str):
-        query = psycopg.sql.SQL("set time zone {}").format(psycopg.sql.Identifier(timezone))
+        query = psycopg.sql.SQL("set time zone {}").format(
+            psycopg.sql.Identifier(timezone)
+        )
         with self.conn.cursor() as cur:
             cur.execute(query)
diff --git a/setup.py b/setup.py
index 40f50ae73..89b24e1b7 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
     "sqlparse >=0.3.0,<0.6",
     "configobj >= 5.0.6",
     "cli_helpers[styles] >= 2.2.1",
-    "tzlocal >= 5.2"
+    "tzlocal >= 5.2",
 ]