postgresql-access 2.0__tar.gz → 2.0.1__tar.gz

{postgresql_access-2.0/src/postgresql_access.egg-info → postgresql_access-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql_access
-Version: 2.0
+Version: 2.0.1
 Author-email: Gerard <gweatherby@uchc.edu>
 License: MIT
 Requires-Python: >=3.8

{postgresql_access-2.0 → postgresql_access-2.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "postgresql_access"
-version = "2.0"
+version = "2.0.1"
 dependencies = [
     "keyring"
 ]

postgresql_access-2.0.1/src/postgresql_access/certificatedatabase.py

@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+
+import os
+import pwd
+from typing import Mapping
+
+try:
+    import psycopg  # psycopg3
+    PSYCOPG_VERSION = 3
+except ImportError:
+    import psycopg2 as psycopg  # fallback to psycopg2
+    PSYCOPG_VERSION = 2
+
+"""
+object wrapper for psycopg2 or psycopg3
+"""
+
+def _current_user():
+    """get current linux user"""
+    return pwd.getpwuid(os.geteuid()).pw_name
+
+
+class CertificateDatabase:
+
+    def __init__(self, *, host: str, database: str, user: str, application_name: str,
+                 client_cert: str, client_key: str, root_cert: str):
+        self.app_name = 'Python app'
+        self.schema = None
+        self.port = 5432
+        self.host = host
+        self.database = database
+        self.user = user
+        self.application_name = application_name
+        self.client_cert = client_cert
+        self.client_key = client_key
+        self.root_cert = root_cert
+
+        files = (self.client_cert, self.client_key, self.root_cert)
+        missing = [f for f in files if not os.path.exists(f)]
+        if missing:
+            raise ValueError(f"Missing configuration file(s): {','.join(missing)}")
+        permissions = [f for f in files if not os.access(f, os.R_OK)]
+        if permissions:
+            raise ValueError(f"No read access file(s): {','.join(permissions)}")
+
+    def connect(self):
+        """Connect to database, set schema if present, return connection"""
+        conninfo = (
+            f"host={self.host} "
+            f"dbname={self.database} "
+            f"user={self.user} "
+            f"port={self.port} "
+            f"application_name={self.application_name} "
+            f"sslmode=verify-full "
+            f"sslcert={self.client_cert} "
+            f"sslkey={self.client_key} "
+            f"sslrootcert={self.root_cert}"
+        )
+
+        try:
+            if PSYCOPG_VERSION == 3:
+                conn = psycopg.connect(conninfo)
+            else:
+                conn = psycopg.connect(conninfo)
+        except psycopg.OperationalError as oe:
+            if 'no password' in str(oe):
+                raise ValueError(f"Invalid certificates or key for user {self.user}, or not authorized by server")
+            raise
+
+        if self.schema is not None:
+            with conn.cursor() as cursor:
+                cursor.execute(f"SET search_path TO {self.schema}")
+            conn.commit()
+
+        return conn
+
+    @staticmethod
+    def create_from_dict(data: Mapping, application_name: str):
+        h = data['host']
+        d = data['database']
+        u = data.get('user', _current_user())
+        cc = data['client certificate']
+        rc = data['root certificate']
+        ck = data['client key']
+        return CertificateDatabase(
+            host=h, database=d, user=u, application_name=application_name,
+            client_cert=cc, client_key=ck, root_cert=rc
+        )
+

{postgresql_access-2.0 → postgresql_access-2.0.1}/src/postgresql_access/database.py

@@ -15,11 +15,13 @@ try:
     psycopg_module = 'psycopg3'
     connect = psycopg.connect
     OperationalError = psycopg.OperationalError
+    readonly = 'read_only'
 except ImportError:
     import psycopg2 as psycopg
     psycopg_module = 'psycopg2'
     connect = psycopg.connect
     OperationalError = psycopg.OperationalError
+    readonly = 'readonly'
 
 
 class AbstractDatabase(ABC):
@@ -161,15 +163,15 @@ class ReadOnlyCursor:
         self._factory = cursor_factory
 
     def __enter__(self):
-        self.existing_readonly = self._conn.readonly
-        self._conn.readonly = True
+        self.existing_readonly = getattr(self._conn,readonly)
+        setattr(self._conn,readonly, True)
         self._curs = self._conn.cursor(cursor_factory=self._factory)
         return self._curs
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self._curs.close()
         self._conn.rollback()
-        self._conn.readonly = self.existing_readonly
+        setattr(self._conn,readonly, self.existing_readonly)
 
     @property
     def connection(self): return self._conn

{postgresql_access-2.0 → postgresql_access-2.0.1/src/postgresql_access.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: postgresql_access
-Version: 2.0
+Version: 2.0.1
 Author-email: Gerard <gweatherby@uchc.edu>
 License: MIT
 Requires-Python: >=3.8

{postgresql_access-2.0 → postgresql_access-2.0.1}/src/tests/atest.py

@@ -7,7 +7,7 @@ import keyring
 from keyring import backend
 
 from postgresql_access import postgresql_access_logger
-from postgresql_access.database import DatabaseConfig
+from postgresql_access.database import DatabaseConfig, ReadOnlyCursor
 
 
 def main():
@@ -31,6 +31,10 @@ def main():
     with c.cursor() as cursor:
         cursor.execute('select now()')
         print(cursor.fetchone()[0])
+    c.rollback()
+    with ReadOnlyCursor(c)  as cursor:
+        cursor.execute('select now()')
+        print(cursor.fetchone()[0])
 
 
 if __name__ == "__main__":

postgresql_access-2.0/src/postgresql_access/certificatedatabase.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python3
-import os
-import pwd
-from typing import Mapping
-
-import psycopg2
-
-"""
-object wrapper for psycopg2
-"""
-
-def _current_user():
-    """get current linux user"""
-    return pwd.getpwuid(os.geteuid()).pw_name
-
-
-class CertificateDatabase:
-
-    def __init__(self,*,host:str,database:str,user:str,application_name:str,client_cert:str,client_key:str,
-                 root_cert:str):
-        self.app_name = 'Python app'
-        self.schema = None
-        self.port = 5432
-        self.host = host
-        self.database = database
-        self.user = user
-        self.application_name = application_name
-        self.client_cert = client_cert
-        self.client_key = client_key
-        self.root_cert = root_cert
-        files = (self.client_cert,self.client_key,self.root_cert)
-        missing = [f for f in files if not os.path.exists(f)]
-        if missing:
-            raise ValueError(f"Missing configuration file(s): {','.join(missing)}")
-        permissions = [f for f in files if not os.access(f,os.R_OK)]
-        if permissions:
-            raise ValueError(f"No read access file(s): {','.join(permissions)}")
-
-
-    def connect(self):
-        """Connect to database, set schema if present, return connection"""
-        connect_string = f"""host='{self.host}' dbname='{self.database}' user='{self.user}'  port={self.port}"""
-        try:
-            conn = psycopg2.connect(connect_string, application_name=self.application_name,
-                                    sslmode='verify-full',
-                                    sslcert=self.client_cert,
-                                    sslkey=self.client_key,sslrootcert=self.root_cert)
-        except psycopg2.OperationalError as oe:
-            if 'no password' in str(oe):
-                raise ValueError(f"Invalid certificates or key for user {self.user}, or not authorized by server")
-            raise
-        if self.schema is not None:
-            with conn.cursor() as cursor:
-                cursor.execute(f"set search_path to {self.schema}")
-            conn.commit()
-
-        return conn
-
-    @staticmethod
-    def create_from_dict(data:Mapping,application_name:str):
-        h = data['host']
-        d = data['database']
-        u = data.get('user',_current_user())
-        cc = data['client certificate']
-        rc = data['root certificate']
-        ck = data['client key']
-        return CertificateDatabase(host=h, database=d, user=u, application_name=application_name, client_cert=cc,
-                                   client_key=ck, root_cert=rc)
-