Sending empty subscription before completion in case of initializatio…

…n error. Removed repeated completion on deinitialization of subscription.
DnV1eX · May 4, 2021 · 789359c · 789359c
1 parent 45dcc61
commit 789359c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Sources/SQLiteCombine/SQLiteCombine.swift b/Sources/SQLiteCombine/SQLiteCombine.swift
@@ -137,6 +137,7 @@ public extension SQLite {
             do {
                 try subscriber.receive(subscription: Subscription(subscriber, db, sql, values))
             } catch {
+                subscriber.receive(subscription: Subscriptions.empty)
                 subscriber.receive(completion: .failure(error))
             }
         }
@@ -179,8 +180,9 @@ extension SQLite.Publisher {
         }
 
         deinit {
-//            sqlite3_finalize(stmt)
-            cancel()
+            if stmt != nil {
+                cancel()
+            }
         }
 
 
@@ -202,7 +204,6 @@ extension SQLite.Publisher {
                     }
                 default:
                     cancel()
-//                    return
                 }
             }
         }

diff --git a/Tests/SQLiteCombineTests/SQLiteCombineTests.swift b/Tests/SQLiteCombineTests/SQLiteCombineTests.swift
@@ -239,7 +239,7 @@ final class SQLiteCombineTests: XCTestCase {
         successExpectation.isInverted = true
         let valueExpectation = expectation(description: "Receive value")
         valueExpectation.isInverted = true
-        _ = db.publisher(sql: "!")
+        _ = db.publisher(sql: "CREATE TABLE test (one, two, three, four, five)")
             .sink { completion in
                 if case let .failure(error) = completion {
                     XCTAssert(error.localizedDescription.contains("DBError error 1"))