Merge pull request stephencelis#154 from stephencelis/swift-2

Swift 2

Author: stephencelis

.travis.yml

@@ -1,9 +1,9 @@
 language: objective-c
 env:
-  - BUILD_SDK=iphonesimulator ONLY_ACTIVE_ARCH=NO
-  - BUILD_SDK=macosx
+  - BUILD_SCHEME="SQLite iOS"
+  - BUILD_SCHEME="SQLite Mac"
 before_install:
   - gem install xcpretty --no-document
 script:
   - make test
-osx_image: beta-xcode6.3
+osx_image: xcode7

CONTRIBUTING.md

@@ -54,29 +54,7 @@ first.
     While Swift error messaging is improving with each release, complex
     expressions still lend themselves to misleading errors. If you encounter an
     error on a complex line, breaking it down into smaller pieces generally
-    yields a more understandable error. _E.g._:
-
-    ``` swift
-    users.insert(email <- "alice@mac.com" <- managerId <- db.lastInsertRowid)
-    // Cannot invoke 'insert' with an argument list of type '(Setter, Setter)'
-    ```
-
-    Not very helpful! If we break the expression down into smaller parts,
-    however, the real error materializes on the appropriate line.
-
-    ``` swift
-    let emailSetter = email <- "alice@mac.com"
-    let managerIdSetter = managerId <- db.lastInsertRowId
-    // Binary operator '<-' cannot be applied to operands of type 'Expression<Int>' and 'Int64'
-    users.insert(emailSetter, managerIdSetter)
-    ```
-
-    The problem turns out to be a simple type mismatch. The fix is elsewhere:
-
-    ``` diff
-    -let managerId = Expression<Int>("manager_id")
-    +let managerId = Expression<Int64>("manager_id")
-    ```
+    yields a more understandable error.
 
   - **Is it an _even more_ unhelpful build error?** <a name='bugs-5'/>
 

Documentation/Index.md

@@ -1,6 +1,6 @@
 BUILD_TOOL = xcodebuild
-BUILD_SDK = macosx
-BUILD_ARGUMENTS = -scheme SQLite -sdk $(BUILD_SDK)
+BUILD_SCHEME = SQLite Mac
+BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)"
 
 XCPRETTY := $(shell command -v xcpretty)
 SWIFTCOV := $(shell command -v swiftcov)

Documentation/Resources/installation@2x.png

@@ -34,46 +34,44 @@ syntax _and_ intent.
 ``` swift
 import SQLite
 
-let db = Database("path/to/db.sqlite3")
+let db = try Connection("path/to/db.sqlite3")
 
-let users = db["users"]
+let users = Table("users")
 let id = Expression<Int64>("id")
 let name = Expression<String?>("name")
 let email = Expression<String>("email")
 
-db.create(table: users) { t in
+try db.run(users.create { t in
     t.column(id, primaryKey: true)
     t.column(name)
     t.column(email, unique: true)
-}
+})
 // CREATE TABLE "users" (
 //     "id" INTEGER PRIMARY KEY NOT NULL,
 //     "name" TEXT,
 //     "email" TEXT NOT NULL UNIQUE
 // )
 
-var alice: Query?
-if let rowid = users.insert(name <- "Alice", email <- "alice@mac.com").rowid {
-    println("inserted id: \(rowid)")
-    // inserted id: 1
-    alice = users.filter(id == rowid)
-}
+let insert = users.insert(name <- "Alice", email <- "alice@mac.com")
+let rowid = try db.run(insert)
 // INSERT INTO "users" ("name", "email") VALUES ('Alice', 'alice@mac.com')
 
-for user in users {
+for user in db.prepare(users) {
     println("id: \(user[id]), name: \(user[name]), email: \(user[email])")
     // id: 1, name: Optional("Alice"), email: alice@mac.com
 }
 // SELECT * FROM "users"
 
-alice?.update(email <- replace(email, "mac.com", "me.com"))
+let alice = users.filter(id == rowid)
+
+try db.run(alice.update(email <- email.replace("mac.com", "me.com")))
 // UPDATE "users" SET "email" = replace("email", 'mac.com', 'me.com')
 // WHERE ("id" = 1)
 
-alice?.delete()
+try db.run(alice.delete())
 // DELETE FROM "users" WHERE ("id" = 1)
 
-users.count
+db.scalar(users.count) // 0
 // SELECT count(*) FROM "users"
 ```
 
@@ -107,29 +105,54 @@ interactively, from the Xcode project’s playground.
 
 ## Installation
 
-> _Note:_ SQLite.swift requires Swift 1.2 (and [Xcode][] 6.3) or
-> greater.
+> _Note:_ SQLite.swift requires Swift 2 (and [Xcode][] 7) or greater.
 >
 > The following instructions apply to targets that support embedded
 > Swift frameworks. To use SQLite.swift in iOS 7 or an OS X command line
 > tool, please read the [Frameworkless Targets][] section of the
 > documentation.
 
 
+### Carthage
+
+[Carthage][] is a simple, decentralized dependency manager for Cocoa. To
+install SQLite.swift with Carthage:
+
+ 1. Make sure Carthage is [installed][Carthage Installation].
+
+ 2. Update your Cartfile to include the following:
+
+    ```
+    github "stephencelis/SQLite.swift" "master"
+    ```
+
+ 3. Run `carthage update` and [add the appropriate framework][Carthage Usage].
+
+
+[Carthage]: https://github.com/Carthage/Carthage
+[Carthage Installation]: https://github.com/Carthage/Carthage#installing-carthage
+[Carthage Usage]: https://github.com/Carthage/Carthage#adding-frameworks-to-an-application
+
+
 ### CocoaPods
 
 [CocoaPods][] is a dependency manager for Cocoa projects. To install
 SQLite.swift with CocoaPods:
 
- 1. Make sure CocoaPods is [installed][CocoaPods Installation] (SQLite.swift
-    requires version 0.37 or greater).
+ 1. Make sure CocoaPods is [installed][CocoaPods Installation]. (SQLite.swift
+    requires version 0.37 or greater.)
 
  2. Update your Podfile to include the following:
 
     ``` ruby
     use_frameworks!
-    pod 'SQLite.swift', git: 'https://github.com/stephencelis/SQLite.swift.git'
-    # pod 'SQLite.swift/Cipher', git: ... # instead, for SQLCipher support
+
+    pod 'SQLite.swift',
+      git: 'https://github.com/stephencelis/SQLite.swift.git'
+
+    # instead, for SQLCipher support
+    pod 'SQLiteCipher.swift',
+      git: 'https://github.com/stephencelis/SQLite.swift.git'
     ```
 
  3. Run `pod install`.
@@ -145,16 +168,14 @@ To install SQLite.swift as an Xcode sub-project:
  1. Drag the **SQLite.xcodeproj** file into your own project.
     ([Submodule][], clone, or [download][] the project first.)
 
-    ![](Documentation/Resources/installation@2x.png)
+    ![Installation Screen Shot](Documentation/Resources/installation@2x.png)
 
- 2. In your target’s **Build Phases**, add **SQLite** to the **Target
-    Dependencies** build phase.
+ 2. In your target’s **General** tab, click the **+** button under **Linked
+    Frameworks and Libraries**.
 
- 3. Add **SQLite.framework** to the **Link Binary With Libraries** build
-    phase.
+ 3. Select the appropriate **SQLite.framework** for your platform.
 
- 4. Add **SQLite.framework** to a **Copy Files** build phase with a
-    **Frameworks** destination. (Add a new build phase if need be.)
+ 4. **Add**.
 
 [Frameworkless Targets]: Documentation/Index.md#frameworkless-targets
 [Xcode]: https://developer.apple.com/xcode/downloads/