Skip to content

Sourcery refactored main branch #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sourcery refactored main branch #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions build/lib/exceltomysql/exceltomysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines -26 to +33
Copy link
Author

@sourcery-ai sourcery-ai bot Nov 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function exceltoDBtable.__init__ refactored with the following changes:

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."
)
Comment on lines -41 to +52
Copy link
Author

@sourcery-ai sourcery-ai bot Nov 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function exceltoDBtable.connect2DB refactored with the following changes:


def readData(self) -> "DataFrame":
if self.filePath.split(".")[-1] in ["xlsx","xls"]:
Expand All @@ -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...")
Comment on lines -60 to +73
Copy link
Author

@sourcery-ai sourcery-ai bot Nov 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function exceltoDBtable.save2database refactored with the following changes:

except Exception as e:
raise Exception(e)

Expand Down
39 changes: 21 additions & 18 deletions exceltomysql/exceltomysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines -26 to +33
Copy link
Author

@sourcery-ai sourcery-ai bot Nov 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function exceltoDBtable.__init__ refactored with the following changes:

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."
)
Comment on lines -41 to +52
Copy link
Author

@sourcery-ai sourcery-ai bot Nov 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function exceltoDBtable.connect2DB refactored with the following changes:


def readData(self) -> "DataFrame":
if self.filePath.split(".")[-1] in ["xlsx","xls"]:
Expand All @@ -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...")
Comment on lines -60 to +73
Copy link
Author

@sourcery-ai sourcery-ai bot Nov 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function exceltoDBtable.save2database refactored with the following changes:

except Exception as e:
raise Exception(e)

Expand Down