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

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

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

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

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

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

@@ -6,23 +6,20 @@ import os
 import pwd
 from abc import ABC, abstractmethod
 from typing import Mapping, Any
-
 import keyring
 
 # Compatibility layer for psycopg2 and psycopg3
 try:
     import psycopg
     psycopg_module = 'psycopg3'
-    connect = psycopg.connect
-    OperationalError = psycopg.OperationalError
-    readonly = 'read_only'
+    _IS_3 = True
 except ImportError:
     import psycopg2 as psycopg
     psycopg_module = 'psycopg2'
-    connect = psycopg.connect
-    OperationalError = psycopg.OperationalError
-    readonly = 'readonly'
+    _IS_3 = False
 
+connect = psycopg.connect
+OperationalError = psycopg.OperationalError
 
 class AbstractDatabase(ABC):
     __DATABASE = 'database'
@@ -79,6 +76,7 @@ class AbstractDatabase(ABC):
         dbname = database_name or self.database_name()
         user = self.user()
         password = self.password()
+        sch = schema is schema is not None or self.schema
 
         try:
             conn = connect(**self.build_connection_kwargs(dbname, user, password), **kwargs)
@@ -87,9 +85,9 @@ class AbstractDatabase(ABC):
             self.connect_fail(dbname, user, password, schema)
             raise
 
-        if schema:
+        if sch is not None:
             with conn.cursor() as cursor:
-                cursor.execute(f"SET search_path TO {schema}")
+                cursor.execute(f"SET search_path TO {sch}")
             conn.commit()
 
         return conn
@@ -162,16 +160,34 @@ class ReadOnlyCursor:
         self._conn = conn
         self._factory = cursor_factory
 
-    def __enter__(self):
-        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()
-        setattr(self._conn,readonly, self.existing_readonly)
+    if _IS_3:
+        def __enter__(self):
+            self.existing_readonly = self._conn.read_only
+            self._conn.read_only = True
+            if self._factory:
+                self._curs = self._conn.cursor(row_factory=self._factory)
+            else:
+                self._curs = self._conn.cursor()
+            return self._curs
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            self._curs.close()
+            self._conn.rollback()
+            self._conn.read_only = self.existing_readonly
+    else:
+        def __enter__(self):
+            self.existing_readonly = self._conn.readonly
+            self._conn.readonly = True
+            if self._factory:
+                self._curs = self._conn.cursor(cursor_factory=self._factory)
+            else:
+                self._curs = self._conn.cursor()
+            return self._curs
+
+        def __exit__(self, exc_type, exc_val, exc_tb):
+            self._curs.close()
+            self._conn.rollback()
+            self._conn.readonly = self.existing_readonly
 
     @property
     def connection(self): return self._conn
@@ -181,9 +197,17 @@ class NewTransactionCursor:
         self._conn = conn
         self._factory = cursor_factory
 
-    def __enter__(self):
-        self._conn.rollback()
-        return self._conn.cursor(cursor_factory=self._factory)
+    if _IS_3:
+        def __enter__(self):
+            self._conn.rollback()
+            if self._factory:
+                return self._conn.cursor(row_factory=self._factory)
+            else:
+                return self._conn.cursor()
+    else:
+        def __enter__(self):
+            self._conn.rollback()
+            return self._conn.cursor(cursor_factory=self._factory)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type is not None:
@@ -236,3 +260,5 @@ def row_estimate(connection, table: str) -> int:
         row = curs.fetchone()
         return int(row[0])
 
+del _IS_3
+

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

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

{postgresql_access-2.0.1 → postgresql_access-2.2}/src/postgresql_access.egg-info/SOURCES.txt

@@ -13,4 +13,5 @@ src/postgresql_access.egg-info/entry_points.txt
 src/postgresql_access.egg-info/requires.txt
 src/postgresql_access.egg-info/top_level.txt
 src/tests/atest.py
-src/tests/grouptest.py
+src/tests/grouptest.py
+src/tests/schematest.py

postgresql_access-2.2/src/tests/schematest.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+import argparse
+import configparser
+import logging
+
+import keyring
+from keyring import backend
+
+from postgresql_access import postgresql_access_logger
+from postgresql_access.database import DatabaseConfig, ReadOnlyCursor
+
+
+def main():
+#    for kr in backend.get_all_keyring():
+#        print(kr)
+    kr = keyring.get_keyring()
+    print(kr)
+    logging.basicConfig()
+    parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser.add_argument('-l', '--loglevel', default='WARN', help="Python logging level")
+    parser.add_argument('config',help="ini style config")
+
+    args = parser.parse_args()
+    postgresql_access_logger.setLevel(getattr(logging,args.loglevel))
+    cp = configparser.ConfigParser()
+    with open(args.config) as f:
+        cp.read_file(f)
+
+    db = DatabaseConfig(config=cp)
+    db.schema = 'usage'
+
+    c = db.connect(application_name="access test")
+    with c.cursor() as cursor:
+        cursor.execute("""select schemaname, tablename from pg_tables 
+        where schemaname not in ('information_schema','pg_catalog')""")
+#        for r in cursor.fetchall():
+#            print(r)
+        cursor.execute('select count(*) from virtual_machine')
+        for r in cursor.fetchall():
+            print(r)
+    c.rollback()
+
+
+if __name__ == "__main__":
+    main()