Revert "Upgrade Silverstripe CMS to psycopg3 and stop shipping `psycopg2-bi…" (DataDog#20881)

This reverts commit 95b5d93.

Author: Kyle-Neale

.ddev/config.toml

@@ -72,6 +72,9 @@ mmh3 = ['CC0-1.0']
 paramiko = ['LGPL-2.1-only']
 # https://github.com/psycopg/psycopg/blob/master/LICENSE.txt
 psycopg = ['LGPL-3.0-only']
+# https://github.com/psycopg/psycopg2/blob/master/LICENSE
+# https://github.com/psycopg/psycopg2/blob/master/doc/COPYING.LESSER
+psycopg2-binary = ['LGPL-3.0-only', 'BSD-3-Clause']
 # https://github.com/Legrandin/pycryptodome/blob/master/LICENSE.rst
 pycryptodomex = ['Unlicense', 'BSD-2-Clause']
 # https://github.com/mongodb/mongo-python-driver/blob/master/LICENSE
@@ -104,6 +107,7 @@ lxml = 'https://github.com/lxml/lxml'
 packaging = 'https://github.com/pypa/packaging'
 paramiko = 'https://github.com/paramiko/paramiko'
 protobuf = 'https://github.com/protocolbuffers/protobuf'
+psycopg2-binary = 'https://github.com/psycopg/psycopg2'
 pycryptodomex = 'https://github.com/Legrandin/pycryptodome'
 redis = 'https://github.com/redis/redis-py'
 requests = 'https://github.com/psf/requests'
@@ -158,6 +162,9 @@ exclude = [
     'aerospike',  # v8+ breaks agent build.
     # https://github.com/DataDog/integrations-core/pull/16080
     'lxml',
+    # We're not ready to switch to v3 of the postgres library, see:
+    # https://github.com/DataDog/integrations-core/pull/15859
+    'psycopg2-binary',
     'psutil',
     'pyvmomi', # 9+ has breaking changes
     'pymongo', # Upgrade from 4.8.0 to 4.10.1 causes "AttributeError: module 'pymongo' has no attribute 'mongo_client'"

LICENSE-3rdparty.csv

@@ -47,6 +47,8 @@ prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors
 protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc.  All rights reserved.
 psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola"
 psycopg,PyPI,LGPL-3.0-only,Copyright (C) 2020 The Psycopg Team
+psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio
+psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio
 pyOpenSSL,PyPI,Apache-2.0,Copyright The pyOpenSSL developers
 pyasn1,PyPI,BSD-3-Clause,"Copyright (c) 2005-2019, Ilya Etingof <etingof@gmail.com>"
 pycryptodomex,PyPI,BSD-2-Clause,Copyright 2014 Helder Eijs

agent_requirements.in

@@ -33,6 +33,8 @@ prometheus-client==0.22.1
 protobuf==6.31.1
 psutil==6.0.0
 psycopg[binary]==3.2.9
+psycopg2-binary==2.9.9
+psycopg[binary]==3.2.9
 pyasn1==0.4.8
 pycryptodomex==3.23.0
 pydantic==2.11.7

datadog_checks_dev/datadog_checks/dev/tooling/commands/validate/licenses.py

@@ -53,6 +53,9 @@
     'mmh3': ['CC0-1.0'],
     # https://github.com/paramiko/paramiko/blob/master/LICENSE
     'paramiko': ['LGPL-2.1-only'],
+    # https://github.com/psycopg/psycopg2/blob/master/LICENSE
+    # https://github.com/psycopg/psycopg2/blob/master/doc/COPYING.LESSER
+    'psycopg2-binary': ['LGPL-3.0-only', 'BSD-3-Clause'],
     # https://github.com/psycopg/psycopg/blob/master/LICENSE.txt
     'psycopg': ['LGPL-3.0-only'],
     # https://github.com/psycopg/psycopg/blob/master/psycopg_pool/LICENSE.txt
@@ -164,6 +167,7 @@
     'packaging': 'https://github.com/pypa/packaging',
     'paramiko': 'https://github.com/paramiko/paramiko',
     'protobuf': 'https://github.com/protocolbuffers/protobuf',
+    'psycopg2-binary': 'https://github.com/psycopg/psycopg2',
     'psycopg': 'https://github.com/psycopg/psycopg',
     'pycryptodomex': 'https://github.com/Legrandin/pycryptodome',
     'redis': 'https://github.com/redis/redis-py',

silverstripe_cms/datadog_checks/silverstripe_cms/database_client.py

@@ -2,10 +2,9 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
-import psycopg
+import psycopg2
+import psycopg2.extras
 import pymysql
-from psycopg import ClientCursor
-from psycopg.rows import dict_row
 
 from datadog_checks.base.errors import ConfigurationError
 
@@ -45,23 +44,19 @@ def create_connection(self) -> None:
                 )
             else:
                 # PostgreSQL connection settings
-                self.connection = psycopg.connect(
+                self.connection = psycopg2.connect(
                     host=self.db_host,
                     port=self.db_port,
                     user=self.db_username,
                     password=self.db_password,
                     dbname=self.db_name,
-                    cursor_factory=ClientCursor,
+                    cursor_factory=psycopg2.extras.DictCursor,
                     connect_timeout=DB_CONNECTION_TIMEOUT_IN_SECONDS,
-                    autocommit=True,
                 )
             message = f"Successfully authenticated with the {self.db_type} database."
             self.log.info(LOG_TEMPLATE.format(host=self.db_host, message=message))
-            if self.db_type == MYSQL:
-                self.cursor = self.connection.cursor()
-            else:
-                self.cursor = self.connection.cursor(row_factory=dict_row)
-        except (pymysql.Error, psycopg.Error) as db_err:
+            self.cursor = self.connection.cursor()
+        except (pymysql.Error, psycopg2.Error) as db_err:
             err_message = (
                 f"Authentication failed for provided credentials. Please check the provided credentials."
                 f" | Error={db_err}."
@@ -75,7 +70,7 @@ def close_connection(self) -> None:
             self.connection.close()
             message = "Connection closed successfully."
             self.log.info(LOG_TEMPLATE.format(host=self.db_host, message=message))
-        except (pymysql.Error, psycopg.Error) as db_err:
+        except (pymysql.Error, psycopg2.Error) as db_err:
             err_message = f"Error occurred while closing the connection. | Error={db_err}."
             self.log.error(LOG_TEMPLATE.format(host=self.db_host, message=err_message))
 
@@ -103,6 +98,6 @@ def execute_query(self, query: str) -> list:
         try:
             self.cursor.execute(query)
             return self.cursor.fetchall()
-        except (pymysql.Error, psycopg.Error) as db_err:
+        except (pymysql.Error, psycopg2.Error) as db_err:
             err_message = f"Error occurred while executing query: {query}. | Error={db_err}."
             self.log.error(LOG_TEMPLATE.format(host=self.db_host, message=err_message))

silverstripe_cms/pyproject.toml

@@ -37,7 +37,7 @@ dynamic = [
 
 [project.optional-dependencies]
 deps = [
-    "psycopg[binary]==3.2.9",
+    "psycopg2-binary==2.9.9",
     "PyMySQL==1.1.1"
 ]