From e3a85754561bc49bd1ee704e19b780656dad6191 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Mon, 19 Aug 2024 11:53:29 +0200 Subject: [PATCH] StarsDB: make naming for fitType clearer --- main/astrodatagui/db/StarsDB.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main/astrodatagui/db/StarsDB.py b/main/astrodatagui/db/StarsDB.py index b0edabf..f06b4f9 100644 --- a/main/astrodatagui/db/StarsDB.py +++ b/main/astrodatagui/db/StarsDB.py @@ -89,10 +89,10 @@ class StarDB(): FOREIGN KEY (mainName) REFERENCES starnames(mainName) );""") - self.dbCursor.execute("""CREATE TABLE IF NOT EXISTS starFitType + self.dbCursor.execute("""CREATE TABLE IF NOT EXISTS starFoldedFitType ( mainName TEXT, - fitType TEXT, + foldedFitType TEXT, PRIMARY KEY (mainName), FOREIGN KEY (mainName) REFERENCES starnames(mainName) );""") @@ -110,9 +110,9 @@ class StarDB(): self.dbCursor.execute("""UPDATE stars SET filename = replace(filename, '\\', '/') WHERE filename LIKE '%\\%';""") - self.dbCursor.execute("""UPDATE starFitType - SET fitType = 'sine' - WHERE fitType IS NULL OR fitType = '';""") + self.dbCursor.execute("""UPDATE starFoldedFitType + SET foldedFitType = 'sine' + WHERE foldedFitType IS NULL OR foldedFitType = '';""") def insertDefaultValues(self): @@ -154,9 +154,9 @@ class StarDB(): self.connection.commit() def updateFitType(self, mainName, fitType: str): - if(fitType in supportedFitTypes): - self.dbCursor.execute(f"""UPDATE starFitType - SET fitType = '{fitType}' + if(fitType in supportedFoldedFitTypes): + self.dbCursor.execute(f"""UPDATE starFoldedFitType + SET foldedFitType = '{fitType}' WHERE mainName = '{mainName}';""") self.connection.commit() else: @@ -211,11 +211,11 @@ class StarDB(): """) return res.fetchone()[0] - def getFitType(self, mainName): - res = self.dbCursor.execute(f"""SELECT mainName FROM starFitType + def getFoldedFitType(self, mainName): + res = self.dbCursor.execute(f"""SELECT foldedFitType FROM starFoldedFitType WHERE mainName = \"{mainName}\";""") ret = res.fetchone()[0] - if(ret in supportedFitTypes): + if(ret in supportedFoldedFitTypes): return ret else: return "sine" \ No newline at end of file