feat: ensure_db() — автосоздание БД при старте
This commit is contained in:
@@ -9,6 +9,7 @@ load_dotenv()
|
|||||||
class ContractsApp:
|
class ContractsApp:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.app = Flask(__name__)
|
self.app = Flask(__name__)
|
||||||
|
db.ensure_db()
|
||||||
self.add_routes()
|
self.add_routes()
|
||||||
|
|
||||||
def add_routes(self):
|
def add_routes(self):
|
||||||
|
|||||||
+31
-6
@@ -3,22 +3,47 @@ import psycopg2
|
|||||||
from psycopg2 import sql
|
from psycopg2 import sql
|
||||||
|
|
||||||
|
|
||||||
def connect():
|
def _pg_connect(dbname):
|
||||||
"""Подключение к БД. Возвращает (connection, None) или (None, error)."""
|
"""Сырое подключение к указанной базе."""
|
||||||
try:
|
return psycopg2.connect(
|
||||||
conn = psycopg2.connect(
|
|
||||||
host=os.getenv("DB_HOST"),
|
host=os.getenv("DB_HOST"),
|
||||||
port=os.getenv("DB_PORT", 5432),
|
port=os.getenv("DB_PORT", 5432),
|
||||||
dbname=os.getenv("DB_NAME"),
|
dbname=dbname,
|
||||||
user=os.getenv("DB_USER"),
|
user=os.getenv("DB_USER"),
|
||||||
password=os.getenv("DB_PASS"),
|
password=os.getenv("DB_PASS"),
|
||||||
sslmode=os.getenv("DB_SSLMODE", "disable"),
|
sslmode=os.getenv("DB_SSLMODE", "disable"),
|
||||||
)
|
)
|
||||||
return conn, None
|
|
||||||
|
|
||||||
|
def connect():
|
||||||
|
"""Подключение к целевой БД. Возвращает (connection, None) или (None, error)."""
|
||||||
|
try:
|
||||||
|
return _pg_connect(os.getenv("DB_NAME")), None
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return None, str(e)
|
return None, str(e)
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_db():
|
||||||
|
"""Создать базу, если не существует."""
|
||||||
|
db_name = os.getenv("DB_NAME", "contracts")
|
||||||
|
try:
|
||||||
|
conn = _pg_connect("postgres")
|
||||||
|
conn.autocommit = True
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute("SELECT 1 FROM pg_database WHERE datname = %s", (db_name,))
|
||||||
|
if cur.fetchone():
|
||||||
|
print(f"DB '{db_name}' exists")
|
||||||
|
else:
|
||||||
|
cur.execute(sql.SQL("CREATE DATABASE {}").format(sql.Identifier(db_name)))
|
||||||
|
print(f"DB '{db_name}' created")
|
||||||
|
cur.close()
|
||||||
|
conn.close()
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
print(f"ensure_db error: {e}")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def query(sql_text, params=None):
|
def query(sql_text, params=None):
|
||||||
"""Выполнить запрос, вернуть (result, error)."""
|
"""Выполнить запрос, вернуть (result, error)."""
|
||||||
conn, err = connect()
|
conn, err = connect()
|
||||||
|
|||||||
Reference in New Issue
Block a user