moved StoregeCore from base class to field

Author: fnc12

Sources/SQLiteORM/SafeStorage/SafeStorage+CRUD.swift

@@ -2,22 +2,22 @@ import Foundation
 
 extension SafeStorage {
  public func delete<T>(_ object: T) -> Result<Void, Error> {
- return self.deleteInternal(object)
+ return self.storageCore.deleteInternal(object)
  }
 
  public func update<T>(_ object: T) -> Result<Void, Error> {
- return self.updateInternal(object)
+ return self.storageCore.updateInternal(object)
  }
 
  public func get<T>(of: T.Type, id: Bindable...) -> Result<T?, Error> where T: Initializable {
- return self.getInternal(id: id)
+ return self.storageCore.getInternal(id: id)
  }
 
  public func insert<T>(_ object: T) -> Result<Int64, Error> {
- return self.insertInternal(object)
+ return self.storageCore.insertInternal(object)
  }
 
  public func replace<T>(_ object: T) -> Result<Void, Error> {
- return self.replaceInternal(object)
+ return self.storageCore.replaceInternal(object)
  }
 }

Sources/SQLiteORM/SafeStorage/SafeStorage.swift

@@ -1,5 +1,20 @@
 import Foundation
 
-public class SafeStorage: StorageCore {
+public class SafeStorage {
+ let storageCore: StorageCore
 
+ public convenience init(filename: String, tables: AnyTable...) throws {
+ try self.init(filename: filename, apiProvider: SQLiteApiProviderImpl.shared, tables: tables)
+ }
+ 
+ convenience init(filename: String, apiProvider: SQLiteApiProvider, tables: [AnyTable]) throws {
+ try self.init(filename: filename,
+ apiProvider: apiProvider,
+ connection: ConnectionHolderImpl(filename: filename, apiProvider: apiProvider),
+ tables: tables)
+ }
+ 
+ init(filename: String, apiProvider: SQLiteApiProvider, connection: ConnectionHolder, tables: [AnyTable]) throws {
+ storageCore = try .init(filename: filename, apiProvider: apiProvider, connection: connection, tables: tables)
+ }
 }

Sources/SQLiteORM/Storage/Storage.swift

@@ -11,11 +11,11 @@ public class Storage {
  try self.init(filename: filename, apiProvider: SQLiteApiProviderImpl.shared, tables: tables)
  }
 
- init(filename: String, apiProvider: SQLiteApiProvider, tables: [AnyTable]) throws {
- storageCore = try .init(filename: filename,
-  apiProvider: apiProvider,
-  connection: ConnectionHolderImpl(filename: filename, apiProvider: apiProvider),
-  tables: tables)
+ convenience init(filename: String, apiProvider: SQLiteApiProvider, tables: [AnyTable]) throws {
+ try self.init(filename: filename,
+ apiProvider: apiProvider,
+ connection: ConnectionHolderImpl(filename: filename, apiProvider: apiProvider),
+ tables: tables)
  }
 
  init(filename: String, apiProvider: SQLiteApiProvider, connection: ConnectionHolder, tables: [AnyTable]) throws {

Sources/SQLiteORM/StorageCore/StorageCore+CRUD.swift

@@ -283,12 +283,12 @@ extension StorageCore {
  let bindResult = table.bind(columnBinder: statement, object: object, apiProvider: self.apiProvider)
  switch bindResult {
  case .success(var resultCode):
- guard resultCode == apiProvider.SQLITE_OK else {
+ guard resultCode == self.apiProvider.SQLITE_OK else {
  let errorString = connectionRef.errorMessage
  return .failure(Error.sqliteError(code: resultCode, text: errorString))
  }
  resultCode = statement.step()
- guard apiProvider.SQLITE_DONE == resultCode else {
+ guard self.apiProvider.SQLITE_DONE == resultCode else {
  let errorString = connectionRef.errorMessage
  return .failure(Error.sqliteError(code: resultCode, text: errorString))
  }