dbobj3 0.1.0__tar.gz → 0.2.0__tar.gz

{dbobj3-0.1.0 → dbobj3-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dbobj3
-Version: 0.1.0
+Version: 0.2.0
 Summary: High-level MySQL/MSSQL/Oracle access module
 Requires-Python: >=3.6
 Requires-Dist: pymysql

{dbobj3-0.1.0 → dbobj3-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dbobj3"
-version = "0.1.0"
+version = "0.2.0"
 description = "High-level MySQL/MSSQL/Oracle access module"
 readme = "README.md"
 requires-python = ">=3.6"
@@ -16,7 +16,7 @@ dependencies = [
 packages = ["src/dbobj3.py"]
 
 [tool.bumpversion]
-current_version = "0.1.0"
+current_version = "0.2.0"
 commit = true
 tag = true
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)"

{dbobj3-0.1.0 → dbobj3-0.2.0}/src/dbobj3.py

@@ -21,18 +21,42 @@ Example:
 		rsServices.next()
 
 """
+__version__ = "0.2.0"
 
-__version__ = "0.1.0"
+try:
+	import MySQLdb
+	import MySQLdb.cursors
+except ImportError:
+	try:
+		import pymysql as MySQLdb
+		import pymysql.cursors
+	except ImportError:
+		print('could neither import pymysql nor MySQLdb')
+
+try:
+	import pymssql
+except ImportError:
+	print('could not import pymssql')
 
-import MySQLdb
-import MySQLdb.cursors 
-import pymssql
-import sqlite3
-import getpass
 try:
 	import cx_Oracle
 except ImportError:
-	pass
+	print('could not import cx_Oracle')
+
+try:
+	import sqlite3
+except ImportError:
+	print('could not import sqlite3')
+
+try:
+	import pyodbc
+except ImportError:
+	print('could not import pyodbc')
+
+import os, getpass, time
+currUser = getpass.getuser()
+homeDir = '/root' if currUser == 'root' else f'/home/{currUser}'
+
 
 class dbConnMessage:
 	"""
@@ -56,16 +80,17 @@ class dbObjCursor:
 		self.cursor = None
 		self.numFields = 0
 		self.numRows = 0
-		self.lstRecords = []				# Used by Oracle and Sqlite3
+		self.lstRecords = []				# Used by Oracle and Sqlite3 and Progress
 		self.recordPointer = 0
 		self.success = True
 		self.dbType = prmDBType.upper()
 		self.create(self.dbType)
-		
+
+
 	def __del__(self):
 		if(self.dbType == "MYSQL"):
 			self.cursor.close()
-		
+
 	def create(self, prmDBType="MYSQL"):
 		if(prmDBType=="MYSQL"):
 			self.createMySql()
@@ -75,7 +100,9 @@ class dbObjCursor:
 			self.createOracle()
 		elif(prmDBType=="SQLITE" or prmDBType=="SQLITE3"):
 			self.createSqlite3()
-				
+		elif(prmDBType=="PROGRESS"):
+			self.createProgress()
+
 	def createMySql(self):
 		self.cursor = self.connection.cursor(MySQLdb.cursors.DictCursor)
 
@@ -88,10 +115,15 @@ class dbObjCursor:
 	def createSqlite3(self):
 		self.cursor = self.connection.cursor()
 
+	def createProgress(self):
+		self.cursor = self.connection.cursor()
+		#for ln in [ i for i in dir(self.cursor) if not i[0]=='_']:
+		#	print(ln)
+
 	def moveNext(self):
 		"""Same as next"""
 		self.next()
-		
+
 	def next(self):
 		"""Move to the next record in the record set and loads the data into the fields property.  Sets EOF at end of records."""
 		if(self.dbType == "MYSQL"):
@@ -102,6 +134,8 @@ class dbObjCursor:
 			self.oracleNext()
 		elif(self.dbType == "SQLITE" or self.dbType == "SQLITE3"):
 			self.sqlite3Next()
+		elif(self.dbType == "PROGRESS"):
+			self.progressNext()
 
 	def mySqlNext(self):
 		resultSet = self.cursor.fetchone()
@@ -119,13 +153,13 @@ class dbObjCursor:
 			resultSet = self.cursor.fetchone()
 		except Exception as e:
 			print(e)
-			self.EOF = 1	
+			self.EOF = 1
 			return
 		if(resultSet != None):
 			self.fields = resultSet
 			self.EOF = 0
 		else:
-			self.EOF = 1			
+			self.EOF = 1
 
 	def oracleNext(self):
 		if(self.recordPointer <= self.numRows):
@@ -140,7 +174,7 @@ class dbObjCursor:
 			self.recordPointer += 1
 			self.EOF = 0
 		else:
-			self.EOF = 1			
+			self.EOF = 1
 
 	def sqlite3Next(self):
 		if(self.recordPointer <= self.numRows):
@@ -155,21 +189,36 @@ class dbObjCursor:
 			self.recordPointer += 1
 			self.EOF = 0
 		else:
-			self.EOF = 1			
+			self.EOF = 1
+
+	def progressNext(self):
+		if(self.recordPointer <= self.numRows):
+			self.fieldByName = {}
+			self.fieldNames = []
+			fieldNo = 0
+			for cursorFieldname in self.cursor.description:
+				self.fieldByName[cursorFieldname[0]] = self.lstRecords[(self.recordPointer-1)][fieldNo]
+				self.fieldNames.append(cursorFieldname[0])
+				fieldNo = fieldNo + 1
+			self.fields = self.fieldByName
+			self.recordPointer += 1
+			self.EOF = 0
+		else:
+			self.EOF = 1
 
 	def first(self):
 		"""Move to the next record in the record set and loads the data into the fields property.  Sets EOF at end of records."""
 		if(self.dbType == "MYSQL"):
 			self.mySqlFirst()
-	
+
 	def mySqlFirst(self):
 		resultSet = self.cursor.scroll(0,'absolute')
 		self.mySqlNext()
-	
+
 	def oracleExecute(self, prmSql):
 		"""
 		Oracle had to be handled differently due to cursor.rowcount failing.  This method is called
-		transparently by dbObjConnection.execute and fetches all records at once where the other 
+		transparently by dbObjConnection.execute and fetches all records at once where the other
 		database types do not.
 		"""
 		self.cursor.execute(prmSql)
@@ -181,15 +230,31 @@ class dbObjCursor:
 
 	def sqlite3Execute(self, prmSql):
 		"""
-		Sqlite3 method is called transparently by dbObjConnection.execute and fetches all records at once where the other 
+		Sqlite3Execute method is called transparently by dbObjConnection.execute and fetches all records at once where the other
+		database types do not.
+		"""
+		self.cursor.execute(prmSql)
+		self.lstRecords = self.cursor.fetchall()
+		self.numRows = len(self.lstRecords)
+		self.numFields = len(self.cursor.description)
+		if(self.numRows > 0):
+			self.recordPointer = 1
+
+	def progressExecute(self, prmSql):
+		"""
+		progressExecute method is called transparently by dbObjConnection.execute and fetches all records at once where the other
 		database types do not.
 		"""
+		t0 = time.time()
 		self.cursor.execute(prmSql)
 		self.lstRecords = self.cursor.fetchall()
 		self.numRows = len(self.lstRecords)
 		self.numFields = len(self.cursor.description)
 		if(self.numRows > 0):
 			self.recordPointer = 1
+		print('progressExecute (fetchs all) time.time()-t0: ',str(round(time.time()-t0,3)),' seconds')
+
+
 
 class dbObjConnection:
 	"""
@@ -197,7 +262,7 @@ class dbObjConnection:
 	the database.  This object supports access to MySQL, Microsoft SQL Server and Oracle.
 	"""
 	def __init__(self, prmDBType="MYSQL"):
-		"""prmDBType can be:  MYSQL, MSSQL, or ORACLE"""
+		"""prmDBType can be:  MYSQL, MSSQL, ORACLE, SQLITE3, or PROGRESS"""
 		self.EOF = 1
 		self.connHandle = 0
 		self.dbType = prmDBType.upper()
@@ -205,12 +270,14 @@ class dbObjConnection:
 		self.lastInsId = 0
 
 	def __del__(self):
-		"""The default destructor will close the connection"""
-		if(self.dbType == "MYSQL"):
-			self.connHandle.commit()
-		self.connHandle.close()
+		try:
+			if( self.dbTypein ( "MYSQL" ) ):
+				self.connHandle.commit()
+			self.connHandle.close()
+		except Exception as e:
+			pass
 
-	def connect(self, prmHost="", prmDb="", prmUser="", prmPass=""):
+	def connect(self, prmHost="", prmDb="", prmUser="", prmPass="", prmPort=3306):
 		"""
 		MySQL:
 			result = connMySQL.connect("db1a", "internet", myuser, mypassword)
@@ -218,21 +285,24 @@ class dbObjConnection:
 			result = connMSSQL.connect("flexibill-mssql", "FLEXIBILL", msuser, mspassword)
 		Oracle:
 			result = connOracl.connect("", "MDDB", orauser, orapassword)
-		
-		returns: dbConnMessage 
+
+		returns: dbConnMessage
 		"""
 		if(self.dbType == "MYSQL"):
-			return self.mySqlConnect(prmHost, prmDb, prmUser, prmPass)
+			return self.mySqlConnect(prmHost, prmDb, prmUser, prmPass, prmPort)
 		elif(self.dbType == "MSSQL"):
 			return self.msSqlConnect(prmHost, prmDb, prmUser, prmPass)
 		elif(self.dbType == "ORACLE"):
 			return self.oracleConnect(prmUser, prmPass, prmDb)
 		elif(self.dbType == "SQLITE" or self.dbType == "SQLITE3"):
 			return self.sqlite3Connect(prmDb)
+		elif(self.dbType == "PROGRESS"):
+			return self.progressConnect(prmHost, prmDb, prmUser, prmPass, prmPort)
 
-	def mySqlConnect(self, prmHost, prmDb, prmUser, prmPass):
+	def mySqlConnect(self, prmHost, prmDb, prmUser, prmPass, prmPort=3306):
 		try:
-			self.connHandle = MySQLdb.connect(host=prmHost,db=prmDb,user=prmUser,passwd=prmPass)
+			self.connHandle = MySQLdb.connect(host=prmHost,db=prmDb,user=prmUser,passwd=prmPass,port=prmPort)
+			self.connHandle.autocommit(True)
 			if(self.connHandle):
 				self.msgObj.message = "Connected to MySqlDatabase okay."
 				self.msgObj.success = True
@@ -288,6 +358,50 @@ class dbObjConnection:
 			self.msgObj.success = False
 		return self.msgObj
 
+	def progressConnect(self, prmHost, prmDb, prmUser, prmPass, prmPort=35078):
+		try:
+			driver = '{DataDirect 7.1 Progress OpenEdge Wire Protocol}'
+			#driver = '/opt/Progress/DataDirect/Connect64_for_ODBC_71/lib/ddoe27.so'
+			# For now, this is required for users accessing the odbc:
+			iniSymLinks = '''
+				lrwxrwxrwx   1 root   root         55 Jul  3 15:30 .odbc.ini -> /opt/Progress/DataDirect/Connect64_for_ODBC_71/odbc.ini
+				lrwxrwxrwx   1 root   root         59 Jul  3 15:30 .odbcinst.ini -> /opt/Progress/DataDirect/Connect64_for_ODBC_71/odbcinst.ini
+				'''
+
+			homeFiles = [ f.lower() for f in os.listdir( homeDir ) ]
+			iniFiles = True if '.odbc.ini' in homeFiles and '.odbcinst.ini' in homeFiles else False
+			if not iniFiles:
+				msgErr = 'Missing symlinks to ini files:\n' + iniSymLinks
+				print(msgErr)
+				raise Exception(msgErr)
+
+			strCnxn = 'Driver={};'.format(driver)
+			strCnxn += 'Host={};'.format(prmHost)
+			strCnxn += 'Database={};'.format(prmDb)
+			strCnxn += 'UID={};'.format(prmUser)
+			strCnxn += 'PWD={};'.format(prmPass)
+			strCnxn += 'Port={};'.format(prmPort)
+			print(strCnxn)
+
+			cnxn = pyodbc.connect( strCnxn )
+			cnxn.setdecoding(pyodbc.SQL_CHAR, encoding='utf-8')
+			cnxn.setdecoding(pyodbc.SQL_WCHAR, encoding='utf-8')
+			cnxn.setencoding(encoding='utf-8')
+
+			self.connHandle = cnxn
+			if(self.connHandle):
+				self.msgObj.message = "Connected to Progress OpenEdge Database okay."
+				self.msgObj.success = True
+			else:
+				self.msgObj.message = "Connection Failed."
+				self.msgObj.success = False
+
+		except Exception as e:
+			self.msgObj.message = "Connection Failed: "+str(e)
+			self.msgObj.success = False
+
+		return self.msgObj
+
 	def disconnect(self):
 		"""Disconnect the connection handle to the database"""
 		if(self.dbType == "MYSQL"):
@@ -319,6 +433,31 @@ class dbObjConnection:
 			return self.msSqlExecute(prmSql)
 		if(self.dbType == "ORACLE"):
 			return self.oracleExecute(prmSql)
+		if(self.dbType in ("SQLITE","SQLITE3")):
+			return self.sqlite3Execute(prmSql)
+		if(self.dbType in ("PROGRESS")):
+			return self.progressExecute(prmSql)
+
+	def fetchall(self, prmSql):
+		"""Returns result set as a list of dictionaries"""
+		rset = []
+		crsr = self.execute( prmSql )
+		while not crsr.EOF:
+			rset.append( crsr.fields )
+			crsr.next()
+		return rset
+
+	def fetchone(self, prmSql):
+		"""Returns a single row as a dictionary"""
+		crsr = self.execute( prmSql )
+		dictRow = {} if crsr.EOF else crsr.fields
+		return dictRow
+
+	def fetchval(self, prmSql):
+		"""Returns a single value"""
+		dictRow = self.fetchone( prmSql )
+		listVals = list(dictRow.values())
+		return None if not listVals else listVals[0]
 
 	def mySqlExecute(self, prmSql):
 		mySqlCursor = dbObjCursor(self.connHandle)
@@ -335,6 +474,7 @@ class dbObjConnection:
 			mySqlCursor.numRows = 0
 			mySqlCursor.EOF = 1
 			mySqlCursor.success = False
+			print(self.msgObj.message)
 			return mySqlCursor
 		try:
 			mySqlCursor.numFields = len(mySqlCursor.cursor.description)
@@ -359,6 +499,7 @@ class dbObjConnection:
 			msSqlCursor.numRows = 0
 			msSqlCursor.EOF = 1
 			msSqlCursor.success = False
+			print(self.msgObj.message)
 			return mySqlCursor
 		msSqlCursor.next()
 		return msSqlCursor
@@ -372,22 +513,65 @@ class dbObjConnection:
 		except Exception as e:
 			self.msgObj.message = "SQL Failed: "+prmSql+" - "+str(e)
 			self.msgObj.success = False
-			print(str(e))
 			oracleCursor.numFields = 0
 			oracleCursor.numRows = 0
 			oracleCursor.EOF = 1
 			oracleCursor.success = False
+			print(self.msgObj.message)
 			return mySqlCursor
 		if(oracleCursor.numRows):
 			oracleCursor.next()
 		else:
 			oracleCursor.EOF = 1
 		return oracleCursor
-		
+
+
+	def sqlite3Execute(self, prmSql):
+		sqliteCursor = dbObjCursor(self.connHandle, self.dbType)
+		try:
+			sqliteCursor.sqlite3Execute(prmSql)
+			self.msgObj.message = "SQL Executed: "+prmSql
+			self.msgObj.success = True
+		except Exception as e:
+			self.msgObj.message = "SQL Failed: "+prmSql+" - "+str(e)
+			self.msgObj.success = False
+			sqliteCursor.numFields = 0
+			sqliteCursor.numRows = 0
+			sqliteCursor.EOF = 1
+			sqliteCursor.success = False
+			print(self.msgObj.message)
+		if(sqliteCursor.numRows):
+			sqliteCursor.next()
+		else:
+			sqliteCursor.EOF = 1
+		return sqliteCursor
+
+	def progressExecute(self, prmSql):
+		progressCursor = dbObjCursor(self.connHandle, self.dbType)
+		try:
+			progressCursor.progressExecute(prmSql)
+			self.msgObj.message = "SQL Executed: "+prmSql
+			self.msgObj.success = True
+		except Exception as e:
+			self.msgObj.message = "SQL Failed: "+prmSql+" - "+str(e)
+			self.msgObj.success = False
+			progressCursor.numFields = 0
+			progressCursor.numRows = 0
+			progressCursor.EOF = 1
+			progressCursor.success = False
+			print(self.msgObj.message)
+			return progressCursor
+		if(progressCursor.numRows):
+			progressCursor.next()
+		else:
+			progressCursor.EOF = 1
+		return progressCursor
+
+
 	def commit(self):
 		if(self.dbType == "MYSQL"):
 			self.connHandle.commit()
-		
+
 if __name__== '__main__' :
 	# MySQL Testing - two cursors - nested
 	print("********************** MySQL Test **********************")