From b8b39d7cbf6d52988fb99b1d27401f9542931a61 Mon Sep 17 00:00:00 2001 From: KeithKelleher Date: Thu, 30 May 2024 15:38:59 -0400 Subject: [PATCH] update sqlite loading code clean up project files --- .gitignore | 3 +- .idea/RaMP.iml | 13 - .idea/misc.xml | 4 - .idea/modules.xml | 8 - .idea/vcs.xml | 6 - .idea/workspace.xml | 365 ------------------ .project | 17 - .pydevproject | 36 -- main/mainSqliteDBLoad.py | 30 +- ...E_2.4.0.sqlite => RaMP_SQLite_BASE.sqlite} | Bin 294912 -> 311296 bytes src/util/SQLiteDBBulkLoader.py | 5 +- 11 files changed, 12 insertions(+), 475 deletions(-) delete mode 100644 .idea/RaMP.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml delete mode 100644 .project delete mode 100644 .pydevproject rename schema/{RaMP_SQLite_BASE_2.4.0.sqlite => RaMP_SQLite_BASE.sqlite} (92%) diff --git a/.gitignore b/.gitignore index 35083f8..0591db7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ misc/output/ misc/jupyter/ conf/*db_props* -.idea \ No newline at end of file +.idea +.venv \ No newline at end of file diff --git a/.idea/RaMP.iml b/.idea/RaMP.iml deleted file mode 100644 index d0fbe74..0000000 --- a/.idea/RaMP.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 79417a5..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f1b8040..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index deaa75a..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,365 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1517000012309 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index cc59c79..0000000 --- a/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - RaMP - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index 2de2c39..0000000 --- a/.pydevproject +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - Default - - - - - - python interpreter - - - - - - - - - - /${PROJECT_DIR_NAME}/src - - - - - - - - - - - - diff --git a/main/mainSqliteDBLoad.py b/main/mainSqliteDBLoad.py index 8497e48..3783038 100644 --- a/main/mainSqliteDBLoad.py +++ b/main/mainSqliteDBLoad.py @@ -1,4 +1,5 @@ import sys +import shutil sys.path.append('../src') from util.SQLiteDBBulkLoader import SQLiteDBBulkLoader @@ -7,36 +8,23 @@ class mainSQLiteDBLoad(object): def __init__(self): - - - # db login credentials and host info - # this is a private text file for login credentials - # Format: - # host= - # dbname= - # username= - # conpass= - self.dbPropsFile = "../config/ramp_db_props.txt" - # config for tables to load # a tab delimited file indicating which tables to load. self.dbConfigFilePath = "../config/db_load_resource_config.txt" - def loadDBAfterTruncatingTables(self, sqliteFile, incrementLevel = 'increment_patch_release', optionalVersionOveride = None, optionalVersionNote = None, truncateTables = False, tablesToKeep=['db_version', 'version_info']): - - - - ################# DB Loading Instructions - + def loadDBAfterTruncatingTables(self, schema_file='../schema/RaMP_SQLite_BASE.sqlite', incrementLevel = 'increment_patch_release', optionalVersionOveride = None, optionalVersionNote = None, truncateTables = False, tablesToKeep=['db_version', 'version_info']): + + if optionalVersionOveride: + sqliteFile = schema_file.replace('BASE', f'v{optionalVersionOveride}') + shutil.copy(schema_file, sqliteFile) + ################# DB Loading Instructions # Sets logging level - # config file holds login credentials in this format: - # pass the credentials object to the constructed rampDBBulLoader - loader = SQLiteDBBulkLoader(dbPropsFile=self.dbPropsFile, sqliteFileName=sqliteFile) + loader = SQLiteDBBulkLoader(sqliteFileName=sqliteFile) # truncate tables @@ -79,7 +67,7 @@ def loadDBAfterTruncatingTables(self, sqliteFile, incrementLevel = 'increment_pa # increment level 'increment_patch_release', 'increment_minor_release', # or 'specified' (new version, perhaps major release) -loader.loadDBAfterTruncatingTables(sqliteFile = 'RaMP_SQLite_BASE.sqlite', incrementLevel = 'specified', +loader.loadDBAfterTruncatingTables(incrementLevel = 'specified', optionalVersionOveride = "2.6.0", optionalVersionNote = "20240524 data update", truncateTables=True) diff --git a/schema/RaMP_SQLite_BASE_2.4.0.sqlite b/schema/RaMP_SQLite_BASE.sqlite similarity index 92% rename from schema/RaMP_SQLite_BASE_2.4.0.sqlite rename to schema/RaMP_SQLite_BASE.sqlite index 1289a5f8aafebfe5bdbd97d7c334beffb31247a2..4695277106f85552d7627afb466bb7be2dce02eb 100644 GIT binary patch delta 921 zcmZo@5Nc=;o**q4#K6Gd1H>>8J5k4&HHbkkIALSTG=4_y=HL9&fAcePGRrb}O=lNi z)D`2N!Y#wKoy&^z9K%rtFPOgRw|_8w-fk<%n8(4ypgMi6B%|W?b3d8fnc78V7`Kbc zFul3V&T*STmZ6kky4VLMBLS|@T;-gfI6EN*@I*`&6wuyY`hh8pg9RwGZux<)yD)Qos^Gl18Q?c6WjczO0 zEoi#%H~__X%_=u`aZ{ipWTB3zhj=Z%C^5GHY-VN(h9|smxB#IApY;e;noU`*?Be?R zjIGQiiAg!BAdBizLKwqpPpH))j!r(Vn8C}X0k#>*@t}wRgR;b;-v&VB--g;Km!7 u0-cYn9!Yt8MrLXe$d{FH<)(&42<2Rw?FoOFwkP~yUeLVAKwyyq6afG$=_POg delta 204 zcmZo@5N>D?njkIc$H2hg0mLv6IZ?-$)sI2Xz-nX4G=4^v=HL9&fAcePGK(?VPG=Wj z)aBzT=Kjq+ja!myEte_hu8EE^ENssh?oU^hXS}`LR**4|gNZ3;`dUdw#p&;VFwL6& zLx9nB`#DL*490d*8OH6RGE8qSi}HvvC@_>Va8Kcu;o8n+#d(f1jN|rnjt@*mlLZBI tx0ilkO5>VRUa#_`|e4;SckIW&j^TI$Qt% diff --git a/src/util/SQLiteDBBulkLoader.py b/src/util/SQLiteDBBulkLoader.py index c97e5bd..52cf9e4 100644 --- a/src/util/SQLiteDBBulkLoader.py +++ b/src/util/SQLiteDBBulkLoader.py @@ -33,12 +33,9 @@ """ class SQLiteDBBulkLoader(object): - def __init__(self, dbPropsFile, sqliteFileName): + def __init__(self, sqliteFileName): print("rampDBBulkLoaer__init__") - # holds db credentials - # self.dbConf = dbConfig(dbPropsFile) - self.sqliteFileName = sqliteFileName self.engine = self.createSQLiteEngine(sqliteFileName)