dbobj3 0.4.0__tar.gz → 0.6.0__tar.gz

{dbobj3-0.4.0 → dbobj3-0.6.0}/PKG-INFO

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

{dbobj3-0.4.0 → dbobj3-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dbobj3"
-version = "0.4.0"
+version = "0.6.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.4.0"
+current_version = "0.6.0"
 commit = true
 tag = true
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)"

{dbobj3-0.4.0 → dbobj3-0.6.0}/src/dbobj3.py

@@ -21,7 +21,7 @@ Example:
 		rsServices.next()
 
 """
-__version__ = "0.4.0"
+__version__ = "0.6.0"
 
 from sys import version as sys_version, exit
 pyversion = sys_version[0:sys_version.find(' ')]
@@ -95,9 +95,15 @@ try:
 	import requests
 	lstLoadedDrivers.append({"requests": "Loaded (API)"})
 except ImportError:
-	#print('could not import pyodbc')
+	#print('could not import requests')
 	lstLoadedDrivers.append({"requests": "Not Loaded (API)"})
 
+try:
+	import jaydebeapi
+	lstLoadedDrivers.append({"jaydebeapi": "Loaded (JDBC)"})
+except ImportError:
+	lstLoadedDrivers.append({"jaydebeapi": "Not Loaded (JDBC)"})
+
 try:
 	import json
 except ImportError:
@@ -156,6 +162,8 @@ class dbObjCursor:
 			self.createProgress()
 		elif(prmDBType=="API"):
 			self.createAPI()
+		elif(prmDBType=="JDBC"):
+			self.createJDBC()
 
 	def createMySql(self):
 		self.cursor = self.connection.cursor(MySQLdb.cursors.DictCursor)
@@ -177,6 +185,9 @@ class dbObjCursor:
 	def createAPI(self):
 		self.lstRecords = []
 
+	def createJDBC(self):
+		self.cursor = self.connection.cursor()
+
 	def moveNext(self):
 		"""Same as next"""
 		self.next()
@@ -195,6 +206,8 @@ class dbObjCursor:
 			self.progressNext()
 		elif(self.dbType == "API"):
 			self.apiNext()
+		elif(self.dbType == "JDBC"):
+			self.jdbcNext()
 
 	def mySqlNext(self):
 		resultSet = self.cursor.fetchone()
@@ -275,6 +288,51 @@ class dbObjCursor:
 		else:
 			self.EOF = 1
 
+	def jdbcNext(self):
+		try:
+			resultSet = self.cursor.fetchone()
+		except Exception as e:
+			print(e)
+			self.EOF = 1
+			return
+		if(resultSet != None):
+			columns = [column[0] for column in self.cursor.description]
+			self.fieldByName = (dict(zip(columns, resultSet)))
+			#self.fieldNames.append(cursorFieldname[0])
+			self.fields = self.fieldByName
+			self.EOF = 0
+		else:
+			self.EOF = 1
+
+		'''
+		if(self.recordPointer <= self.numRows):  #???? what about 0?
+			self.fieldByName = {}
+			self.fieldNames = []
+			print(self.recordPointer)
+			print(self.numRows)
+			print(self.cursor)
+			print("-----------------------------------------------------")
+			#print(self.cursor.description)
+			print(self.lstRecords)
+			print(self.recordPointer <= self.numRows)
+			print(self.recordPointer)
+			print(self.numRows)
+			print(type(self.recordPointer))
+			print(type(self.numRows))
+			columns = [column[0] for column in self.cursor.description]
+			self.fieldByName = (dict(zip(columns, self.lstRecords[self.recordPointer])))
+			#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"):
@@ -323,13 +381,22 @@ class dbObjCursor:
 			self.recordPointer = 1
 		#print('progressExecute (fetchs all) time.time()-t0: ',str(round(time.time()-t0,3)),' seconds')
 
+	def jdbcExecute(self, prmSql):
+		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
+
 class dbObjConnection:
 	"""
 	dbObjConnection is the database connection object.  It is responsible for connecting to
 	the database.  This object supports access to MySQL, Microsoft SQL Server, Oracle,
 	SQLite3, and Progress DataDirect.
 	
-	prmDBType can be:  MYSQL, MSSQL, ORACLE, SQLITE3, PROGRESS, or API
+	prmDBType can be:  MYSQL, MSSQL, ORACLE, SQLITE3, PROGRESS, API, or JDBC
+
 	"""
 	def __init__(self, 
 				prmDBType="MYSQL", 
@@ -341,6 +408,7 @@ class dbObjConnection:
 				envOracle={}, 
 				envProgress={},
 				driver='',
+				driverClass="",
 				prmApiBaseUrl="",
 				prmApiKey="",
 				prmApiKeyName="sk"):
@@ -355,6 +423,7 @@ class dbObjConnection:
 		self.reconnect_attempts = 0
 		self.using_pymysql = using_pymysql
 		self.drivers = lstLoadedDrivers
+		self.driverClass = driverClass
 		if(prmDBType == "API"):
 			self.apiBaseUrl = prmApiBaseUrl
 			self.apiKeyName = prmApiKeyName
@@ -416,6 +485,8 @@ class dbObjConnection:
 				return self.sqlite3Connect(prmDb)
 			elif(self.dbType == "PROGRESS"):
 				return self.progressConnect(prmHost, prmDb, prmUser, prmPass, prmPort)
+			elif(self.dbType == "JDBC"):
+				return self.jdbcConnect(prmHost, prmDb, prmUser, prmPass)
 
 	def setConnectSuccess(self):
 		self.reconnect_attempts = 0
@@ -506,6 +577,18 @@ class dbObjConnection:
 			self.setConnectSuccess()
 		return self.msgObj
 
+	def jdbcConnect(self, prmConnString, prmDriver, prmUser, prmPass):
+		try:
+			self.connHandle = jaydebeapi.connect(self.driverClass, prmConnString, [prmUser, prmPass], prmDriver)
+			if(self.connHandle):
+				self.setConnectSuccess()
+			else:
+				self.setConnectFail()
+		except Exception as e:
+			self.setConnectFail(e)
+			print(e)
+		return self.msgObj
+
 	def reconnect(self):
 		# https://dev.mysql.com/doc/refman/8.0/en/gone-away.html
 		mysql_lost_msg = '''
@@ -569,6 +652,8 @@ class dbObjConnection:
 			return self.progressGetCursor()
 		elif(self.dbType == "API"):
 			return self.apiGetCursor()
+		elif(self.dbType == "JDBC"):
+			return self.jdbcGetCursor()
 
 	def setCursorSuccess(self, cursor):
 		if cursor:
@@ -629,6 +714,14 @@ class dbObjConnection:
 		except Exception as e:
 			self.setCursorFail(e)
 
+	def jdbcGetCursor(self):
+		try:
+			cursor = dbObjCursor(self.connHandle, self.dbType)
+			self.setCursorSuccess(cursor)
+			return cursor
+		except Exception as e:
+			self.setCursorFail(e)
+
 	def disconnect(self):
 		"""Disconnect the connection handle to the database"""
 		if(self.dbType == "MYSQL"):
@@ -641,6 +734,8 @@ class dbObjConnection:
 			self.sqlite3Disconnect()
 		elif(self.dbType == "PROGRESS"):
 			self.progressDisconnect()
+		elif(self.dbType == "JDBC"):
+			self.jdbcDisconnect()
 
 	def mySqlDisconnect(self):
 		if self.connHandle and self.connHandle.open:
@@ -670,6 +765,11 @@ class dbObjConnection:
 	def apiDisconnect(self):
 		pass
 
+	def jdbcDisconnect(self):
+		if self.connHandle:
+			self.connHandle.close()
+			self.connHandle = None
+
 	def execute(self, prmSql, *args):
 		"""Execute the SQL and return a record set if applicable"""
 		if(self.dbType == "MYSQL"):
@@ -684,6 +784,8 @@ class dbObjConnection:
 			return self.progressExecute(prmSql)
 		if(self.dbType in ("API")):
 			return self.apiExecute(prmSql)
+		if(self.dbType in ("JDBC")):
+			return self.jdbcExecute(prmSql)
 
 	def fetchall(self, prmSql, *args):
 		"""Returns result set as a list of dictionaries"""
@@ -694,18 +796,33 @@ class dbObjConnection:
 			crsr.next()
 		return rset
 
+
 	def fetchone(self, prmSql, *args):
 		"""Returns a single row as a dictionary"""
 		crsr = self.execute( prmSql, *args )
 		dictRow = {} if crsr.EOF else crsr.fields
 		return dictRow
 
+
 	def fetchval(self, prmSql, *args):
 		"""Returns a single value"""
 		dictRow = self.fetchone( prmSql, *args )
 		listVals = list(dictRow.values())
 		return None if not listVals else listVals[0]
 
+
+	def fetchlistvals(self, prmSql, *args):
+		"""Returns a list of vals; if more than one key/column, returns a list of value tuples"""
+		listvals = []
+		rset = self.fetchall(prmSql, *args)
+		if not rset:
+			return []
+		for dictRow in rset:
+			vals = list(dictRow.values())[0] if len(dictRow.values())==1 else list(dictRow.values())
+			listvals.append( vals )
+		return listvals
+
+
 	def insert(self, table, prmDict, update_on_duplicate=False):
 		if update_on_duplicate:
 			keystr = ','.join(prmDict.keys())
@@ -818,7 +935,10 @@ class dbObjConnection:
 	def mySqlExecute(self, prmSql, *args):
 		mySqlCursor = self.getCursor()
 		try:
-			mySqlCursor.cursor.execute(prmSql, args)
+			if args:
+				mySqlCursor.cursor.execute(prmSql, args)
+			else:
+				mySqlCursor.cursor.execute(prmSql)
 			self.msgObj.message = "SQL Executed: "+prmSql
 			self.msgObj.success = True
 			mySqlCursor.numRows = mySqlCursor.cursor.rowcount
@@ -937,7 +1057,6 @@ class dbObjConnection:
 		try:
 			# convert sqls to url safe version
 			#sqls = requests.compat.quote_plus( prmSql )
-			#r = requests.post(self.apiBaseUrl + "/execute", data = {self.apiKeyName: self.apiKey, "sql": sqls})
 			sqls = prmSql
 			headers = {'Content-type':'application/json'}
 			payload = {self.apiKeyName: self.apiKey, "sql": sqls}
@@ -976,6 +1095,24 @@ class dbObjConnection:
 			apiCursor.success = False
 		return apiCursor
 
+	def jdbcExecute(self, prmSql):
+		jdbcCursor = self.getCursor()
+		try:
+			jdbcCursor.cursor.execute(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
+			jdbcCursor.numFields = 0
+			jdbcCursor.numRows = 0
+			jdbcCursor.EOF = 1
+			jdbcCursor.success = False
+			print(self.msgObj.message)
+			return jdbcCursor
+		jdbcCursor.next()
+		return jdbcCursor
+
 	def commit(self):
 		if(self.dbType == "MYSQL"):
 			self.connHandle.commit()