Skip to content

Convert to Swift 3.1 syntax #3

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

Open
weyhan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert to Swift 3.1 syntax #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions SQLiteSwift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,12 @@
FF831B441C70E05400851CE6 = {
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = 6JW63865Y3;
LastSwiftMigration = 0830;
};
FF831B4E1C70E05400851CE6 = {
CreatedOnToolsVersion = 7.2.1;
DevelopmentTeam = 6JW63865Y3;
LastSwiftMigration = 0830;
};
};
};
Expand Down Expand Up @@ -437,6 +439,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -456,6 +459,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.yoshiyuki.SQLiteSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -466,6 +470,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yoshiyuki.SQLiteSwiftTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -476,6 +481,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.yoshiyuki.SQLiteSwiftTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
52 changes: 27 additions & 25 deletions SQLiteSwift/SQLite.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import Foundation
import FMDB

class SQLite {
static private var conn: SQLite?
private let dbFilePath: String
private var _db:FMDatabase?
private var db: FMDatabase {
static fileprivate var conn: SQLite?
fileprivate let dbFilePath: String
fileprivate var _db:FMDatabase?
fileprivate var db: FMDatabase {
get {
if let tmpDb = _db {
return tmpDb
Expand All @@ -31,11 +31,11 @@ class SQLite {
/// Create Table according to sql parameter
/// - parameter sql: sql statement
/// - returns: true on Success, false on Failure
func createTable(sql:String) -> Bool {
func createTable(_ sql:String) -> Bool {
return executeUpdate(sql,nil)
}

func deleteTable(tables:[String]) -> Bool {
func deleteTable(_ tables:[String]) -> Bool {
let sql = "DROP TABLE IF EXISTS"
var result:Bool = true
tables.forEach{
Expand All @@ -46,19 +46,19 @@ class SQLite {
return result
}

func insert(sql:String,values:[AnyObject]!) -> Bool {
func insert(_ sql:String,values:[AnyObject]!) -> Bool {
return executeUpdate(sql,values)
}

func update(sql:String,values:[AnyObject]!) -> Bool {
func update(_ sql:String,values:[AnyObject]!) -> Bool {
return executeUpdate(sql,values)
}

func delete(sql:String,values:[AnyObject]!) -> Bool {
func delete(_ sql:String,values:[AnyObject]!) -> Bool {
return executeUpdate(sql, values)
}

private func executeUpdate(sql:String, _ values: [AnyObject]!) -> Bool{
fileprivate func executeUpdate(_ sql:String, _ values: [AnyObject]!) -> Bool{
do {
try db.executeUpdate(sql, values: values)
if isOutput {
Expand All @@ -71,67 +71,67 @@ class SQLite {
}
}

private func executeQuery(sql:String, values:[AnyObject]!) -> FMResultSet? {
fileprivate func executeQuery(_ sql:String, values:[AnyObject]!) -> FMResultSet? {
if isOutput {
print("Query: \(sql)")
}
return try? db.executeQuery(sql, values: values)
}

func beginTransaction(){
if !db.inTransaction() {
if !db.isInTransaction {
db.open()
db.beginTransaction()
}
}

var inTransaction:Bool {
return db.inTransaction()
return db.isInTransaction
}

func commit() {
if db.inTransaction() {
if db.isInTransaction {
db.commit()
db.close()
}
}

func rollback(){
if db.inTransaction() {
if db.isInTransaction {
db.rollback()
}
}

/// Return whether DBFile is exist
/// - returns: true on exist, false on not exist
func isExistDBFile() -> Bool {
let fileManager: NSFileManager = NSFileManager.defaultManager()
return fileManager.fileExistsAtPath(self.dbFilePath)
let fileManager: FileManager = FileManager.default
return fileManager.fileExists(atPath: self.dbFilePath)
}

/// Return whether Tables are exist
/// - parameter table names string array
/// - returns: false & table array on not exist , true & blank array on all tables exist
func isExistTable(tables:[String]) -> (result:Bool,tables:[String]?) {
func isExistTable(_ tables:[String]) -> (result:Bool,tables:[String]?) {
let sql = "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name=?;"
var rtnBl:Bool = true
var noExistTables:[String] = []
for table in tables {
let result = executeQuery(sql, values: [table])
let result = executeQuery(sql, values: [table as AnyObject])
defer { result?.close() }
guard let theResult = result else {
return (false,nil)
}
theResult.next()
if theResult.intForColumnIndex(0) == 0 {
if theResult.int(forColumnIndex: 0) == 0 {
rtnBl = false
noExistTables.append(table)
}
}
return (!rtnBl && noExistTables.count>0) ? (false,noExistTables) : (rtnBl,nil)
}

func select(sql:String,values:[AnyObject]!) -> [[String:AnyObject]] {
func select(_ sql:String,values:[AnyObject]!) -> [[String:AnyObject]] {
let result = executeQuery(sql, values: values)
defer { result?.close() }
var rtn:[[String:AnyObject]] = []
Expand All @@ -140,11 +140,13 @@ class SQLite {
}
while theResult.next() {
var dict:[String:AnyObject] = [:]
for(key,value) in theResult.resultDictionary() {
let theKey = key as! String
dict[theKey] = value
if let resultDictionary = theResult.resultDictionary {
for(key,value) in resultDictionary {
let theKey = key as! String
dict[theKey] = value as AnyObject
}
rtn.append(dict)
}
rtn.append(dict)
}
return rtn
}
Expand Down
Loading