Skip to content

Native user_version support in Connection #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 25, 2022
Merged

Native user_version support in Connection #1105

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9489a7
Native user_version support in Connection
nathanfallet Jan 17, 2022
9e162a8
Refactoring userVersion + adding tests
nathanfallet Jan 17, 2022
d52eaaf
Set userVersion as a property
nathanfallet Jan 18, 2022
80c8b30
More compact version
nathanfallet Jan 25, 2022
d004739
Fixing tests for Linux
nathanfallet Jan 25, 2022
34d3a97
Fixing Linting
nathanfallet Jan 25, 2022
85921d8
Oups
nathanfallet Jan 25, 2022
608684a
Updating documentation
nathanfallet Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions Sources/SQLite/Core/Connection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,23 @@ public final class Connection {
Int(sqlite3_total_changes(handle))
}

/// Gets the user version of the database.
/// See SQLite [PRAGMA user_version](https://sqlite.org/pragma.html#pragma_user_version)
/// - Returns: the user version of the database
public func getUserVersion() throws -> Int32? {
Copy link
Collaborator

@jberkel jberkel Jan 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

var userVersion: Int32? {
   get { }
   set { }
}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that first, but I ended with problems with try. I can eventually ignore them with optionals

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think it's ok to ignore the error here

guard let userVersion = try scalar("PRAGMA user_version") as? Int64 else {
return nil
}
return Int32(userVersion)
}

/// Sets the user version of the database.
/// See SQLite [PRAGMA user_version](https://sqlite.org/pragma.html#pragma_user_version)
/// - Parameter userVersion: the new user version of the database
public func setUserVersion(to userVersion: Int32) throws {
try run("PRAGMA user_version = \(userVersion)")
}

// MARK: - Execute

/// Executes a batch of SQL statements.
Expand Down
5 changes: 5 additions & 0 deletions Tests/SQLiteTests/ConnectionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ class ConnectionTests: SQLiteTestCase {
XCTAssertEqual(2, db.totalChanges)
}

func test_userVersion() {
try! db.setUserVersion(to: 2)
XCTAssertEqual(2, try! db.getUserVersion()!)
}

func test_prepare_preparesAndReturnsStatements() {
_ = try! db.prepare("SELECT * FROM users WHERE admin = 0")
_ = try! db.prepare("SELECT * FROM users WHERE admin = ?", 0)
Expand Down