From 5d5ef883399b1ecff1f8b0a24d8b9818bc1a8a55 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Thu, 31 Aug 2023 17:20:26 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20DB=E5=88=87=E6=96=AD=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/db/database.py | 17 ++++------------- ecs/jskult-webapp/src/depends/database.py | 2 -- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/ecs/jskult-webapp/src/db/database.py b/ecs/jskult-webapp/src/db/database.py index e1571d03..32e1fdc2 100644 --- a/ecs/jskult-webapp/src/db/database.py +++ b/ecs/jskult-webapp/src/db/database.py @@ -114,14 +114,6 @@ class DatabaseClient: raise DBException('DBに接続していません') return self.__session - def connect(self): - # FIXME: 未使用。後ほど削除 - ... - - def disconnect(self): - # FIXME: エラーにしないための仮実装。後で消す - ... - def execute_select(self, select_query: str, parameters=None) -> list[dict]: """SELECTクエリを実行します。 @@ -190,11 +182,10 @@ class DatabaseClient: if self.session.in_transaction(): self.session.rollback() - # def disconnect(self): - # """DB接続を切断します。""" - # if self.session is not None: - # self.session.close() - # self.__session = None + def disconnect(self): + """DB接続を切断します。""" + self.session.close() + self.__session = None def to_jst(self): self.execute('SET time_zone = "+9:00"') diff --git a/ecs/jskult-webapp/src/depends/database.py b/ecs/jskult-webapp/src/depends/database.py index 1a26214c..3813ca54 100644 --- a/ecs/jskult-webapp/src/depends/database.py +++ b/ecs/jskult-webapp/src/depends/database.py @@ -11,5 +11,3 @@ def get_database(request: Request) -> DatabaseClient: yield database finally: database.disconnect() - # FIXME; リポジトリを直し終えたら消す - session.close()