dbobj3 0.7.0__tar.gz → 0.8.0__tar.gz

{dbobj3-0.7.0 → dbobj3-0.8.0}/PKG-INFO

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

{dbobj3-0.7.0 → dbobj3-0.8.0}/pyproject.toml

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

{dbobj3-0.7.0 → dbobj3-0.8.0}/src/dbobj3.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.6
+#!/usr/bin/env python3.9
 
 """
 High-Level Access to MySQL, MS SQL Server, Oracle Module and more.
@@ -21,9 +21,10 @@ Example:
 		rsServices.next()
 
 """
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 
 from sys import version as sys_version, exit
+from datetime import datetime, date, time
 pyversion = sys_version[0:sys_version.find(' ')]
 using_mysqlclient, using_pymysql = False, False
 
@@ -32,7 +33,7 @@ try:
 	#raise ImportError
 	import MySQLdb
 	import MySQLdb.cursors
-	import MySQLdb.converters
+	#import MySQLdb.converters
 	# MySQLdb dropped Python3.x support
 	# - For Centos/Python2.x use
 	#   - yum install mysql-devel, MySQL-python
@@ -49,8 +50,8 @@ if not using_mysqlclient:
 		# pymysql is a pure python implementation of MySQLdb
 		# Linux:
 		import pymysql as MySQLdb
-		import MySQLdb.cursors
-		import MySQLdb.converters
+		#import MySQLdb.cursors
+		#import MySQLdb.converters
 		# Windows:
 		#import pymysql
 		#pymysql.install_as_MySQLdb()
@@ -63,6 +64,43 @@ if not using_mysqlclient:
 		lstLoadedDrivers.append({"pymysql": "Not Loaded (MySQL)"})
 #'''
 
+def _build_pymysql_conv():
+	"""
+	Return a PyMySQL conversion dict that parses DATETIME / TIMESTAMP / DATE
+	into real Python datetime/date objects (mimicking mysqlclient behavior).
+	"""
+	if not using_pymysql:
+		return None
+	from pymysql.constants import FIELD_TYPE
+	from pymysql.converters import conversions
+	conv = conversions.copy()
+
+	def _parse_dt(val):
+		if val is None:
+			return None
+		v = val.strip()
+		# Try common formats (truncate fractional seconds)
+		base = v.split('.')[0]
+		for fmt in ("%Y-%m-%d %H:%M:%S",
+					"%Y-%m-%d %H:%M",
+					"%Y-%m-%dT%H:%M:%S",
+					"%Y-%m-%d"):
+			try:
+				return datetime.strptime(base, fmt)
+			except Exception:
+				pass
+		# ISO fallback
+		try:
+			return datetime.fromisoformat(v.replace('Z',''))
+		except Exception:
+			return v  # leave as original string if unparseable
+
+	conv[FIELD_TYPE.DATETIME]  = _parse_dt
+	conv[FIELD_TYPE.TIMESTAMP] = _parse_dt
+	conv[FIELD_TYPE.DATE]	  = (lambda v: date.fromisoformat(v) if v else None)
+	return conv
+
+
 try:
 	import pymssql
 	lstLoadedDrivers.append({"pymssql": "Loaded (Microsoft SQL Server)"})
@@ -470,8 +508,23 @@ class dbObjConnection:
 
 	def mySqlConnect(self, prmHost, prmDb, prmUser, prmPass, prmPort=3306):
 		try:
-			self.connHandle = MySQLdb.connect(host=prmHost,db=prmDb,user=prmUser,passwd=prmPass,port=prmPort)
-			self.connHandle.autocommit(True)
+			kwargs = dict(host=prmHost, db=prmDb, user=prmUser, passwd=prmPass, port=prmPort)
+			if using_pymysql:
+				conv = _build_pymysql_conv()
+				if conv:
+					kwargs["conv"] = conv
+				# Ensure utf8mb4 for PyMySQL
+				kwargs.setdefault("charset", "utf8mb4")
+				kwargs.setdefault("autocommit", True)
+			self.connHandle = MySQLdb.connect(**kwargs)
+			# Uniform autocommit enabling (mysqlclient vs pymysql)
+			try:
+				self.connHandle.autocommit(True)
+			except Exception:
+				try:
+					self.connHandle.autocommit = True
+				except Exception:
+					pass
 			if(self.connHandle):
 				self.setConnectSuccess()
 			else:
@@ -744,10 +797,10 @@ class dbObjConnection:
 			self.connHandle.close()
 			self.connHandle = None
 
-	def execute(self, prmSql, *args):
+	def execute(self, prmSql, *args, **kw):
 		"""Execute the SQL and return a record set if applicable"""
 		if(self.dbType == "MYSQL"):
-			return self.mySqlExecute(prmSql, *args)
+			return self.mySqlExecute(prmSql, *args, **kw)
 		if(self.dbType == "MSSQL"):
 			return self.msSqlExecute(prmSql)
 		if(self.dbType == "ORACLE"):
@@ -900,7 +953,7 @@ class dbObjConnection:
 			else:
 				raise Exception
 
-	def setMySqlExecuteFail(self, mySqlCursor, prmSql, e, *args):
+	def setMySqlExecuteFail(self, mySqlCursor, prmSql, e, *args, **kw):
 		self.msgObj.success = False
 		prmSql += '' if not args else ' ({0}) '.format( repr(args) )
 		self.msgObj.message = "SQL Failed: {0} - {1}".format( prmSql, e )
@@ -914,9 +967,9 @@ class dbObjConnection:
 		finally:
 			return mySqlCursor
 
-	def setMySqlExecuteSuccess(self, mySqlCursor, prmSql, *args):
+	def setMySqlExecuteSuccess(self, mySqlCursor, prmSql, *args, **kw):
 		self.msgObj.success = True
-		self.msgObj.message = "SQL Executed: {0} {1}".format(prmSql,'' if not args else repr(args))
+		self.msgObj.message = "SQL Executed: {0} {1}".format(prmSql,'' if not args else repr(args)+ ' ' + repr(kw))
 		try:
 			mySqlCursor.numFields = len(mySqlCursor.cursor.description)
 			if(mySqlCursor.numRows):
@@ -929,10 +982,14 @@ class dbObjConnection:
 		finally:
 			return mySqlCursor
 
-	def mySqlExecute(self, prmSql, *args):
+	def mySqlExecute(self, prmSql, *args, **kw):
 		mySqlCursor = self.getCursor()
 		try:
-			if args:
+			if not hasattr(self.connHandle, 'open') or self.connHandle.open==0 :
+				self.reconnect()
+			if kw:
+				mySqlCursor.cursor.execute(prmSql, kw)
+			elif args:
 				mySqlCursor.cursor.execute(prmSql, args)
 			else:
 				mySqlCursor.cursor.execute(prmSql)
@@ -950,22 +1007,23 @@ class dbObjConnection:
 				self.msgObj.message += ' or killed process/connection.'
 				self.msgObj.message += ' connHandle={0}, connHandle.open={1}'.format(self.connHandle,self.connHandle.open)
 				self.reconnect()
-			elif self.connHandle.open==0 or "Can't connect to" in str(e):
+			elif not hasattr(self.connHandle, 'open') or self.connHandle.open==0 or "t connect t" in str(e).lower():
 				self.msgObj.message += ' - Database Connection Closed or Never Established.'
 				self.msgObj.message += ' connHandle={0}, connHandle.open={1}'.format(self.connHandle,self.connHandle.open)
 				self.reconnect()
-			return mySqlCursor if not self.msgObj.success else self.mySqlExecute( prmSql, *args )
+			return mySqlCursor if not self.msgObj.success else self.mySqlExecute( prmSql, *args, **kw )
 		except Exception as e:
 			mySqlCursor = self.setMySqlExecuteFail(mySqlCursor, prmSql, e, *args)
-			if self.connHandle.open==0 or "Can't connect to" in str(e):
+			#if self.connHandle.open==0 or "Can't connect to" in str(e): # This line was failing (self.connHandle was an "int") and so not reconnecting
+			if not hasattr(self.connHandle, 'open') or self.connHandle.open==0 or "t connect t" in str(e).lower():
 				self.msgObj.message += ' - Database Connection Closed or Never Established.'
 				self.msgObj.message += ' connHandle={0}, connHandle.open={1}'.format(self.connHandle,self.connHandle.open)
 				self.reconnect()
-				return mySqlCursor if not self.msgObj.success else self.mySqlExecute( prmSql, *args )
+				return mySqlCursor if not self.msgObj.success else self.mySqlExecute( prmSql, *args, **kw )
 			print(self.msgObj.message)
 			return mySqlCursor
 		else:
-			mySqlCursor = self.setMySqlExecuteSuccess(mySqlCursor, prmSql, *args)
+			mySqlCursor = self.setMySqlExecuteSuccess(mySqlCursor, prmSql, *args, **kw)
 			return mySqlCursor
 
 	def msSqlExecute(self, prmSql):
@@ -1133,14 +1191,14 @@ class dbObjConnection:
 				self.msgObj.message += ' - Database Connection Closed or Never Established.'
 				self.msgObj.message += ' connHandle={0}, connHandle.open={1}'.format(self.connHandle,self.connHandle.open)
 				self.reconnect()
-			return mySqlCursor if not self.msgObj.success else self.mySqlExecute( prmSql, *args )
+			return mySqlCursor if not self.msgObj.success else self.mySqlExecuteMany( prmSql, *args )
 		except Exception as e:
 			mySqlCursor = self.setMySqlExecuteFail(mySqlCursor, prmSql, e, *args)
 			if self.connHandle.open==0 or "Can't connect to" in str(e):
 				self.msgObj.message += ' - Database Connection Closed or Never Established.'
 				self.msgObj.message += ' connHandle={0}, connHandle.open={1}'.format(self.connHandle,self.connHandle.open)
 				self.reconnect()
-				return mySqlCursor if not self.msgObj.success else self.mySqlExecute( prmSql, *args )
+				return mySqlCursor if not self.msgObj.success else self.mySqlExecuteMany( prmSql, *args )
 			print(self.msgObj.message)
 			return mySqlCursor
 		else: