diff --git a/README.md b/README.md index b45d2ef..e35a999 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -sudo zypper in python3-psycopg2 +sudo zypper in python3-psycopg sudo su - postgres # `createdb -O imported_git` diff --git a/lib/db.py b/lib/db.py index 57a5f37..f18a169 100644 --- a/lib/db.py +++ b/lib/db.py @@ -1,7 +1,6 @@ import logging -import psycopg2 -from psycopg2.extras import LoggingConnection +import psycopg from lib.config import config @@ -17,11 +16,10 @@ class DB: # read the connection parameters params = config(section=self.config_section) # connect to the PostgreSQL server - self.conn = psycopg2.connect(connection_factory=LoggingConnection, **params) - logger = logging.getLogger(__name__) - self.conn.initialize(logger) + self.conn = psycopg.connect(conninfo=f"dbname={params['database']}") + logging.getLogger("psycopg.pool").setLevel(logging.INFO) - except (Exception, psycopg2.DatabaseError) as error: + except (Exception, psycopg.DatabaseError) as error: print(error) raise error @@ -32,7 +30,7 @@ class DB: # execute a statement try: cur.execute("SELECT MAX(version) from scheme") - except psycopg2.errors.UndefinedTable as error: + except psycopg.errors.UndefinedTable as error: cur.close() self.close() self.connect() @@ -146,9 +144,9 @@ class DB: ) schemes[10] = ( "ALTER TABLE revisions ADD COLUMN request_id INTEGER", - """ALTER TABLE revisions + """ALTER TABLE revisions ADD CONSTRAINT request_id_foreign_key - FOREIGN KEY (request_id) + FOREIGN KEY (request_id) REFERENCES requests (id)""", "UPDATE scheme SET version=10", ) @@ -273,7 +271,7 @@ class DB: cur.execute(command) # commit the changes self.conn.commit() - except (Exception, psycopg2.DatabaseError) as error: + except (Exception, psycopg.DatabaseError) as error: print(error) self.close() raise error