From 2a9c9c88b4e7b444383a71a4cda1c9e51bffacaa Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 7 Nov 2024 14:33:53 +0000 Subject: [PATCH 1/3] only run ddl if a new file --- spinn_front_end_common/utilities/sqlite_db.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spinn_front_end_common/utilities/sqlite_db.py b/spinn_front_end_common/utilities/sqlite_db.py index b4761bc27..f109be817 100644 --- a/spinn_front_end_common/utilities/sqlite_db.py +++ b/spinn_front_end_common/utilities/sqlite_db.py @@ -120,7 +120,12 @@ def __init__( # https://stackoverflow.com/a/21794758/301832 self.__db = sqlite3.connect( f"{db_uri}?mode=ro", uri=True, timeout=timeout) + # can not run a ddl file + ddl_file = None else: + if os.path.exists(database_file): + # No need to run the ddl_file again + ddl_file = None self.__db = sqlite3.connect(database_file, timeout=timeout) # We want to assume control over transactions ourselves @@ -131,7 +136,7 @@ def __init__( if text_factory is not None: self.__db.text_factory = text_factory - if not read_only and ddl_file: + if ddl_file: with open(ddl_file, encoding="utf-8") as f: sql = f.read() self.__db.executescript(sql) From f775cd923d17b44f13f967ec5ea5808fe7d82aed Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Thu, 7 Nov 2024 15:13:16 +0000 Subject: [PATCH 2/3] capitalise DDL in comments --- spinn_front_end_common/utilities/sqlite_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spinn_front_end_common/utilities/sqlite_db.py b/spinn_front_end_common/utilities/sqlite_db.py index f109be817..11eba9b4c 100644 --- a/spinn_front_end_common/utilities/sqlite_db.py +++ b/spinn_front_end_common/utilities/sqlite_db.py @@ -124,7 +124,7 @@ def __init__( ddl_file = None else: if os.path.exists(database_file): - # No need to run the ddl_file again + # No need to run the DDL file again ddl_file = None self.__db = sqlite3.connect(database_file, timeout=timeout) From a8ca5a36b3161e10f8f041febd383a04ed55d0a1 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Fri, 8 Nov 2024 14:01:17 +0000 Subject: [PATCH 3/3] capitalise DDL --- spinn_front_end_common/utilities/sqlite_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spinn_front_end_common/utilities/sqlite_db.py b/spinn_front_end_common/utilities/sqlite_db.py index 11eba9b4c..28cfe0045 100644 --- a/spinn_front_end_common/utilities/sqlite_db.py +++ b/spinn_front_end_common/utilities/sqlite_db.py @@ -120,7 +120,7 @@ def __init__( # https://stackoverflow.com/a/21794758/301832 self.__db = sqlite3.connect( f"{db_uri}?mode=ro", uri=True, timeout=timeout) - # can not run a ddl file + # can not run a DDL file ddl_file = None else: if os.path.exists(database_file):