Fixes for modern Swift

Storing a `Statement` no longer causes a crash when cleaning up.

The `UPPER` function properly handles memory management of strings.

Author: stack

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.1.1 2023-09-07
+### Fixed
+-   Storing a `Statement` no longer causes a crash when cleaning up.
+-   The `UPPER` function properly handles memory management of strings.
+
 ## 2.1.0 2020-08-16
 ### Added
 -   `sqliteVersion` fetches the underlying SQLite version string.

Sources/Restructure/Restructure.swift

@@ -177,7 +177,10 @@ public class Restructure {
             }
 
             let stringValue = String(cString: value).uppercased()
-            sqlite3_result_text(context, stringValue, Int32(stringValue.utf8.count), SQLITE_STATIC)
+            
+            stringValue.withCString { value in
+                sqlite3_result_text(context, value, Int32(stringValue.utf8.count), SQLITE_TRANSIENT)
+            }
         }, nil, nil)
     }
 
@@ -225,6 +228,8 @@ public class Restructure {
     }
 
     internal func finalize(statement: Statement) {
+        guard preparedStatements.contains(statement.statement) else { return }
+        
         preparedStatements.remove(statement.statement)
 
         let result = sqlite3_finalize(statement.statement)

Tests/RestructureTests/StatementTests.swift

@@ -23,6 +23,21 @@ class StatementTests: XCTestCase {
         restructure = nil
     }
 
+    // MARK: - Finalzie Tests
+    
+    func testFinalizeStoredStatement() throws {
+        var restructure: Restructure? = try! Restructure()
+        try! restructure!.execute(query: "CREATE TABLE foo (a INTEGER PRIMARY KEY AUTOINCREMENT)")
+        
+        var statement: Statement? = try restructure!.prepare(query: "SELECT a FROM foo")
+        
+        restructure?.close()
+        restructure = nil
+        
+        statement = nil
+        
+        XCTSuccess("Completely freed stored statements")
+    }
 
     // MARK: - Prepare Tests