refactor: Switch default driver to psycopg3

MeltanoLabs · Nov 19, 2024 · 3a919f9 · 3a919f9
1 parent d96acf9
commit 3a919f9
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ This target is tested with all actively supported [Python](https://devguide.pyth
 | password                        | False    | None                          | Password used to authenticate. Note if sqlalchemy_url is set this will be ignored.                                                                                                                                                                                                                       |
 | database                        | False    | None                          | Database name. Note if sqlalchemy_url is set this will be ignored.                                                                                                                                                                                                                                       |
 | sqlalchemy_url                  | False    | None                          | SQLAlchemy connection string. This will override using host, user, password, port, dialect, and all ssl settings. Note that you must escape password special characters properly. See https://docs.sqlalchemy.org/en/20/core/engines.html#escaping-special-characters-such-as-signs-in-passwords         |
-| dialect+driver                  | False    | postgresql+psycopg2           | Dialect+driver see https://docs.sqlalchemy.org/en/20/core/engines.html. Generally just leave this alone. Note if sqlalchemy_url is set this will be ignored.                                                                                                                                             |
+| dialect+driver                  | False    | postgresql+psycopg            | Dialect+driver see https://docs.sqlalchemy.org/en/20/core/engines.html. Generally just leave this alone. Note if sqlalchemy_url is set this will be ignored.                                                                                                                                             |
 | default_target_schema           | False    | melty                         | Postgres schema to send data to, example: tap-clickup                                                                                                                                                                                                                                                    |
 | activate_version                | False    | 1                             | If set to false, the tap will ignore activate version messages. If set to true, add_record_metadata must be set to true as well.                                                                                                                                                                         |
 | hard_delete                     | False    | 0                             | When activate version is sent from a tap this specefies if we should delete the records that don't match, or mark them with a date in the `_sdc_deleted_at` column. This config option is ignored if `activate_version` is set to false.                                                                 |

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,6 +34,7 @@ packages = [
 [tool.poetry.dependencies]
 python = ">=3.9"
 faker = {version = "~=30.0", optional = true}
+psycopg = {extras = ["binary"], version = "3.2.3"}
 psycopg2-binary = "2.9.10"
 sqlalchemy = "~=2.0"
 sshtunnel = "0.4.0"

diff --git a/target_postgres/target.py b/target_postgres/target.py
@@ -150,7 +150,7 @@ def __init__(
         th.Property(
             "dialect+driver",
             th.StringType,
-            default="postgresql+psycopg2",
+            default="postgresql+psycopg",
             description=(
                 "Dialect+driver see "
                 + "https://docs.sqlalchemy.org/en/20/core/engines.html. "

diff --git a/target_postgres/tests/core.py b/target_postgres/tests/core.py
@@ -8,7 +8,7 @@
 
 def postgres_config():
     return {
-        "dialect+driver": "postgresql+psycopg2",
+        "dialect+driver": "postgresql+psycopg",
         "host": "localhost",
         "user": "postgres",
         "password": "postgres",
@@ -29,7 +29,7 @@ def postgres_config():
 
 def postgres_config_no_ssl():
     return {
-        "dialect+driver": "postgresql+psycopg2",
+        "dialect+driver": "postgresql+psycopg",
         "host": "localhost",
         "user": "postgres",
         "password": "postgres",

diff --git a/target_postgres/tests/test_target_postgres.py b/target_postgres/tests/test_target_postgres.py
@@ -167,7 +167,7 @@ def test_sqlalchemy_url_config(postgres_config_no_ssl):
 def test_port_default_config():
     """Test that the default config is passed into the engine when the config doesn't provide it"""
     config = {
-        "dialect+driver": "postgresql+psycopg2",
+        "dialect+driver": "postgresql+psycopg",
         "host": "localhost",
         "user": "postgres",
         "password": "postgres",
@@ -191,7 +191,7 @@ def test_port_default_config():
 def test_port_config():
     """Test that the port config works"""
     config = {
-        "dialect+driver": "postgresql+psycopg2",
+        "dialect+driver": "postgresql+psycopg",
         "host": "localhost",
         "user": "postgres",
         "password": "postgres",

diff --git a/target_postgres/tests/test_types.py b/target_postgres/tests/test_types.py
@@ -11,7 +11,7 @@ def connector():
     """Create a PostgresConnector instance."""
     return PostgresConnector(
         config={
-            "dialect+driver": "postgresql+psycopg2",
+            "dialect+driver": "postgresql+psycopg",
             "host": "localhost",
             "port": "5432",
             "user": "postgres",