From daad0776c15c383a1aad2f02c27f8d8c4e47940a Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 26 Nov 2018 19:03:34 -0500 Subject: [PATCH 1/5] Update SQLDatabase.cls --- src/ClassModules/SQLDatabase.cls | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ClassModules/SQLDatabase.cls b/src/ClassModules/SQLDatabase.cls index 696fbb2..c79458e 100644 --- a/src/ClassModules/SQLDatabase.cls +++ b/src/ClassModules/SQLDatabase.cls @@ -82,7 +82,6 @@ Public Function Execute(oSQL As iSQLQuery, Optional return_column = "") 'Bitwise And the State property with The adStateOpen constant If CBool(rst.State And adStateOpen) = True Then rst.CloseRecordset If CBool(cnt.State And adStateOpen) = True Then cnt.CloseConnection - Set cnt = Nothing End Function 'InsertGetNewID From d0bc4853822156a87720cb4fb8e91aecba7f4650 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 26 Nov 2018 19:04:48 -0500 Subject: [PATCH 2/5] Update iSQLConnection.cls --- src/ClassModules/iSQLConnection.cls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ClassModules/iSQLConnection.cls b/src/ClassModules/iSQLConnection.cls index 1eda74d..d9850f3 100644 --- a/src/ClassModules/iSQLConnection.cls +++ b/src/ClassModules/iSQLConnection.cls @@ -22,3 +22,7 @@ End Property Public Function State() End Function + +Public Property Get Connection() + +End Function From 1769380b007a2970282f2f9f210afb3e4bdb22a1 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 26 Nov 2018 19:06:41 -0500 Subject: [PATCH 3/5] Update SQLConnection.cls --- src/ClassModules/SQLConnection.cls | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ClassModules/SQLConnection.cls b/src/ClassModules/SQLConnection.cls index 80d1600..f51b67f 100644 --- a/src/ClassModules/SQLConnection.cls +++ b/src/ClassModules/SQLConnection.cls @@ -13,7 +13,11 @@ Implements iSQLConnection 'This allows unit testing without an active database implementation 'The native Connection uses several function names which are reserved keywords -Private orst As ADODB.Connection +Private ocnt As ADODB.Connection + +Public Property Get iSQLConnection_Connection() + Set iSQLConnection_Connection = ocnt +End Property Public Sub iSQLConnection_OpenConnection() ocnt.Open From 2c325bf5a9dffa57fbd64e08bdcebcce2352cbe9 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 26 Nov 2018 19:07:36 -0500 Subject: [PATCH 4/5] Update SQLRecordset.cls --- src/ClassModules/SQLRecordset.cls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ClassModules/SQLRecordset.cls b/src/ClassModules/SQLRecordset.cls index 1ccbe0e..311945a 100644 --- a/src/ClassModules/SQLRecordset.cls +++ b/src/ClassModules/SQLRecordset.cls @@ -23,8 +23,8 @@ Public Function iSQLRecordset_State() iSQLRecordset_State = orst.State End Function -Public Sub iSQLRecordset_OpenRecordset(MyQuery As String, Connection) - orst.Open MyQuery, Connection +Public Sub iSQLRecordset_OpenRecordset(MyQuery As String, MyConnection) + orst.Open MyQuery, MyConnection.Connection End Sub Public Sub iSQLRecordset_CloseRecordset() From ce9359a841f341d6a74102c6ae5626beaea08c69 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 26 Nov 2018 19:08:55 -0500 Subject: [PATCH 5/5] Update SQLTestConnection.cls --- testing/ClassModules/SQLTestConnection.cls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testing/ClassModules/SQLTestConnection.cls b/testing/ClassModules/SQLTestConnection.cls index 07373f0..6f0120d 100644 --- a/testing/ClassModules/SQLTestConnection.cls +++ b/testing/ClassModules/SQLTestConnection.cls @@ -9,6 +9,10 @@ Attribute VB_PredeclaredId = False Attribute VB_Exposed = False Implements iSQLConnection +Public Property Get iSQLConnection_Connection() + +End Property + Public Sub iSQLConnection_OpenConnection() End Sub