Migrate from psycopg2 to psycopg3 to fix SIGSEGV crashes
This commit is contained in:
22
db.py
22
db.py
@@ -1,7 +1,7 @@
|
||||
import os
|
||||
import psycopg2
|
||||
from psycopg2 import pool
|
||||
from psycopg2.extras import RealDictCursor
|
||||
import psycopg
|
||||
from psycopg_pool import ConnectionPool
|
||||
from psycopg.rows import dict_row
|
||||
from datetime import datetime
|
||||
from dateutil.relativedelta import relativedelta
|
||||
from urllib.parse import urlparse
|
||||
@@ -32,14 +32,11 @@ class DataBase():
|
||||
raise Exception("No DATABASE_URL environment variable set")
|
||||
|
||||
if DataBase._pool is None:
|
||||
db_url = urlparse(os.environ['DATABASE_URL'])
|
||||
DataBase._pool = pool.ThreadedConnectionPool(
|
||||
1, 20, # minconn, maxconn
|
||||
database=db_url.path[1:],
|
||||
user=db_url.username,
|
||||
password=db_url.password,
|
||||
host=db_url.hostname,
|
||||
port=db_url.port
|
||||
# Note: psycopg3 ConnectionPool takes a conninfo string directly, not parsed kwargs
|
||||
DataBase._pool = ConnectionPool(
|
||||
conninfo=os.environ['DATABASE_URL'],
|
||||
min_size=1,
|
||||
max_size=20
|
||||
)
|
||||
|
||||
def getDB(self):
|
||||
@@ -54,7 +51,8 @@ class DataBase():
|
||||
|
||||
def execute(self, query, args=(), one=False, commit=False):
|
||||
conn = self.getDB()
|
||||
cur = conn.cursor(cursor_factory=RealDictCursor)
|
||||
cur = conn.cursor(row_factory=dict_row)
|
||||
# Convert any custom placeholders from %s to standard %s format used by psycopg3
|
||||
cur.execute(query, args)
|
||||
rv = None
|
||||
if cur.description is not None:
|
||||
|
||||
Reference in New Issue
Block a user