From b7d5d34169fbcb05ee1f2ed392591550b9a87002 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Fri, 11 Nov 2022 03:11:23 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- build/lib/exceltomysql/exceltomysql.py | 39 ++++++++++++++------------ exceltomysql/exceltomysql.py | 39 ++++++++++++++------------ 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/build/lib/exceltomysql/exceltomysql.py b/build/lib/exceltomysql/exceltomysql.py index 9e303bd..b5f67ca 100644 --- a/build/lib/exceltomysql/exceltomysql.py +++ b/build/lib/exceltomysql/exceltomysql.py @@ -23,29 +23,33 @@ class exceltoDBtable: # Available for sql server and mysql now def __init__(self,filePath,server=False,usrID =False,pwd=False,database=False,save2tableName=False): - if not any([server,database,usrID,pwd]): + if not any([server, database, usrID, pwd]): raise Exception("Partially inputs, please check your inputs...") - else: - self.filePath = filePath - self.server = server - self.database=database - self.usrID = usrID - self.pwd = pwd - self.save2tableName = save2tableName + self.filePath = filePath + self.server = server + self.database=database + self.usrID = usrID + self.pwd = pwd + self.save2tableName = save2tableName self.dbType = ["mysql","sqlserver"] self.readData() self.connect2DB() self.save2database() def connect2DB(self) -> "Connect to Database Server": - + try: # self.conn = pymysql.connect(host=self.server,user=self.usrID,password=self.pwd,db=self.database,charset="utf8",cursorclass=pymysql.cursors.DictCursor) - - self.engine = create_engine('mysql+pymysql://%s:%s@%s:3306/%s'%(self.usrID,self.pwd,self.server,self.database)) + + self.engine = create_engine( + f'mysql+pymysql://{self.usrID}:{self.pwd}@{self.server}:3306/{self.database}' + ) + print("Successfully connected to MySQL...") except: - raise Exception("Can not connect to %s, please check your input info."%self.dbType) + raise Exception( + f"Can not connect to {self.dbType}, please check your input info." + ) def readData(self) -> "DataFrame": if self.filePath.split(".")[-1] in ["xlsx","xls"]: @@ -57,17 +61,16 @@ def readData(self) -> "DataFrame": else: raise Exception("Unable to load input file...") - def save2database(self) ->"DataFrame to database": + def save2database(self) -> "DataFrame to database": if self.save2tableName: tableName = self.save2tableName + elif "/" in self.filePath: + tableName = self.filePath.split("/")[-1].split(".")[0] else: - if "/" in self.filePath: - tableName = self.filePath.split("/")[-1].split(".")[0] - else: - tableName = self.filePath.split(".")[0] + tableName = self.filePath.split(".")[0] try: self.file_data.to_sql(tableName,con=self.engine) - print("Successfully save %s into database..."%tableName) + print(f"Successfully save {tableName} into database...") except Exception as e: raise Exception(e) diff --git a/exceltomysql/exceltomysql.py b/exceltomysql/exceltomysql.py index 9e303bd..b5f67ca 100644 --- a/exceltomysql/exceltomysql.py +++ b/exceltomysql/exceltomysql.py @@ -23,29 +23,33 @@ class exceltoDBtable: # Available for sql server and mysql now def __init__(self,filePath,server=False,usrID =False,pwd=False,database=False,save2tableName=False): - if not any([server,database,usrID,pwd]): + if not any([server, database, usrID, pwd]): raise Exception("Partially inputs, please check your inputs...") - else: - self.filePath = filePath - self.server = server - self.database=database - self.usrID = usrID - self.pwd = pwd - self.save2tableName = save2tableName + self.filePath = filePath + self.server = server + self.database=database + self.usrID = usrID + self.pwd = pwd + self.save2tableName = save2tableName self.dbType = ["mysql","sqlserver"] self.readData() self.connect2DB() self.save2database() def connect2DB(self) -> "Connect to Database Server": - + try: # self.conn = pymysql.connect(host=self.server,user=self.usrID,password=self.pwd,db=self.database,charset="utf8",cursorclass=pymysql.cursors.DictCursor) - - self.engine = create_engine('mysql+pymysql://%s:%s@%s:3306/%s'%(self.usrID,self.pwd,self.server,self.database)) + + self.engine = create_engine( + f'mysql+pymysql://{self.usrID}:{self.pwd}@{self.server}:3306/{self.database}' + ) + print("Successfully connected to MySQL...") except: - raise Exception("Can not connect to %s, please check your input info."%self.dbType) + raise Exception( + f"Can not connect to {self.dbType}, please check your input info." + ) def readData(self) -> "DataFrame": if self.filePath.split(".")[-1] in ["xlsx","xls"]: @@ -57,17 +61,16 @@ def readData(self) -> "DataFrame": else: raise Exception("Unable to load input file...") - def save2database(self) ->"DataFrame to database": + def save2database(self) -> "DataFrame to database": if self.save2tableName: tableName = self.save2tableName + elif "/" in self.filePath: + tableName = self.filePath.split("/")[-1].split(".")[0] else: - if "/" in self.filePath: - tableName = self.filePath.split("/")[-1].split(".")[0] - else: - tableName = self.filePath.split(".")[0] + tableName = self.filePath.split(".")[0] try: self.file_data.to_sql(tableName,con=self.engine) - print("Successfully save %s into database..."%tableName) + print(f"Successfully save {tableName} into database...") except Exception as e: raise Exception(e)