Skip to content

Commit bd99ce9

Browse files
author
Sourcery AI
committed
'Refactored by Sourcery'
1 parent b2eb755 commit bd99ce9

File tree

2 files changed

+44
-42
lines changed

2 files changed

+44
-42
lines changed

build/lib/exceltosqlserver/exceltosqlserver.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@
1919
class exceltoDBtable:
2020
# Available for sql server and mysql now
2121
def __init__(self,filePath,hostORip=False,usrID =False,pwd=False,database=False,save2tableName=False):
22-
if not any([hostORip,database,usrID,pwd]):
22+
if not any([hostORip, database, usrID, pwd]):
2323
raise Exception("Partially inputs, please check your inputs...")
24-
else:
25-
self.filePath = filePath
26-
self.hostORip = hostORip
27-
self.database=database
28-
self.usrID = usrID
29-
self.pwd = pwd
30-
self.save2tableName = save2tableName
31-
24+
self.filePath = filePath
25+
self.hostORip = hostORip
26+
self.database=database
27+
self.usrID = usrID
28+
self.pwd = pwd
29+
self.save2tableName = save2tableName
30+
3231
self.dbType = ["sqlserver"]
3332
self.readData()
3433
self.connect2DB()
@@ -46,27 +45,29 @@ def connect2DB(self) -> "Connect to Database Server":
4645
for i in sqlserverDriver:
4746
driveString = i.replace(" ","+").replace("{","").replace("}","")
4847
# print(driveString)
49-
50-
48+
49+
5150
try:
52-
self.engine = create_engine("mssql+pyodbc://%s:%s@%s/%s?driver=%s?"%(self.usrID,self.pwd,self.hostORip,self.database,driveString))
51+
self.engine = create_engine(
52+
f"mssql+pyodbc://{self.usrID}:{self.pwd}@{self.hostORip}/{self.database}?driver={driveString}?"
53+
)
54+
5355
print("Seccessfully connected to SQL Server...")
54-
56+
5557
if self.save2tableName:
5658
tableName = self.save2tableName
59+
elif "/" in self.filePath:
60+
tableName = self.filePath.split("/")[-1].split(".")[0]
5761
else:
58-
if "/" in self.filePath:
59-
tableName = self.filePath.split("/")[-1].split(".")[0]
60-
else:
61-
tableName = self.filePath.split(".")[0]
62-
62+
tableName = self.filePath.split(".")[0]
63+
6364
self.file_data.to_sql(tableName,con=self.engine)
64-
print("Successfully saved %s into SQL Server..."%tableName)
65-
return None
65+
print(f"Successfully saved {tableName} into SQL Server...")
66+
return None
6667
except:
6768
self.engine = False
6869
continue
69-
70+
7071
raise Exception("Can not save table to sql server, please check your inputs.")
7172

7273
def readData(self) -> "DataFrame":

exceltosqlserver/exceltosqlserver.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@
1919
class exceltoDBtable:
2020
# Available for sql server and mysql now
2121
def __init__(self,filePath,hostORip=False,usrID =False,pwd=False,database=False,save2tableName=False):
22-
if not any([hostORip,database,usrID,pwd]):
22+
if not any([hostORip, database, usrID, pwd]):
2323
raise Exception("Partially inputs, please check your inputs...")
24-
else:
25-
self.filePath = filePath
26-
self.hostORip = hostORip
27-
self.database=database
28-
self.usrID = usrID
29-
self.pwd = pwd
30-
self.save2tableName = save2tableName
31-
24+
self.filePath = filePath
25+
self.hostORip = hostORip
26+
self.database=database
27+
self.usrID = usrID
28+
self.pwd = pwd
29+
self.save2tableName = save2tableName
30+
3231
self.dbType = ["sqlserver"]
3332
self.readData()
3433
self.connect2DB()
@@ -46,27 +45,29 @@ def connect2DB(self) -> "Connect to Database Server":
4645
for i in sqlserverDriver:
4746
driveString = i.replace(" ","+").replace("{","").replace("}","")
4847
# print(driveString)
49-
50-
48+
49+
5150
try:
52-
self.engine = create_engine("mssql+pyodbc://%s:%s@%s/%s?driver=%s?"%(self.usrID,self.pwd,self.hostORip,self.database,driveString))
51+
self.engine = create_engine(
52+
f"mssql+pyodbc://{self.usrID}:{self.pwd}@{self.hostORip}/{self.database}?driver={driveString}?"
53+
)
54+
5355
print("Seccessfully connected to SQL Server...")
54-
56+
5557
if self.save2tableName:
5658
tableName = self.save2tableName
59+
elif "/" in self.filePath:
60+
tableName = self.filePath.split("/")[-1].split(".")[0]
5761
else:
58-
if "/" in self.filePath:
59-
tableName = self.filePath.split("/")[-1].split(".")[0]
60-
else:
61-
tableName = self.filePath.split(".")[0]
62-
62+
tableName = self.filePath.split(".")[0]
63+
6364
self.file_data.to_sql(tableName,con=self.engine)
64-
print("Successfully saved %s into SQL Server..."%tableName)
65-
return None
65+
print(f"Successfully saved {tableName} into SQL Server...")
66+
return None
6667
except:
6768
self.engine = False
6869
continue
69-
70+
7071
raise Exception("Can not save table to sql server, please check your inputs.")
7172

7273
def readData(self) -> "DataFrame":

0 commit comments

Comments
 (0)