Skip to content

Fix usages of old Swift 2 enum case names #656

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 2 commits into from
Jun 15, 2017
Merged

Fix usages of old Swift 2 enum case names #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
426e7d6
Fix usages of old Swift 2 enum case names
joshfriend May 21, 2017
89630b2
Apply Swift3 case convention to internal enum `Modifier`
joshfriend May 21, 2017
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
8 changes: 4 additions & 4 deletions Sources/SQLite/Core/Connection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ public final class Connection {
/// The location of a SQLite database.
public enum Location {

/// An in-memory database (equivalent to `.URI(":memory:")`).
/// An in-memory database (equivalent to `.uri(":memory:")`).
///
/// See: <https://www.sqlite.org/inmemorydb.html#sharedmemdb>
case inMemory

/// A temporary, file-backed database (equivalent to `.URI("")`).
/// A temporary, file-backed database (equivalent to `.uri("")`).
///
/// See: <https://www.sqlite.org/inmemorydb.html#temp_db>
case temporary
Expand Down Expand Up @@ -93,7 +93,7 @@ public final class Connection {
/// - location: The location of the database. Creates a new database if it
/// doesn’t already exist (unless in read-only mode).
///
/// Default: `.InMemory`.
/// Default: `.inMemory`.
///
/// - readonly: Whether or not to open the database in a read-only state.
///
Expand Down Expand Up @@ -321,7 +321,7 @@ public final class Connection {
///
/// - mode: The mode in which a transaction acquires a lock.
///
/// Default: `.Deferred`
/// Default: `.deferred`
///
/// - block: A closure to run SQL statements within the transaction.
/// The transaction will be committed when the block returns. The block
Expand Down
12 changes: 6 additions & 6 deletions Sources/SQLite/Typed/Schema.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extension Table {
block(builder)

let clauses: [Expressible?] = [
create(Table.identifier, tableName(), temporary ? .Temporary : nil, ifNotExists),
create(Table.identifier, tableName(), temporary ? .temporary : nil, ifNotExists),
"".wrap(builder.definitions) as Expression<Void>,
withoutRowid ? Expression<Void>(literal: "WITHOUT ROWID") : nil
]
Expand All @@ -52,7 +52,7 @@ extension Table {

public func create(_ query: QueryType, temporary: Bool = false, ifNotExists: Bool = false) -> String {
let clauses: [Expressible?] = [
create(Table.identifier, tableName(), temporary ? .Temporary : nil, ifNotExists),
create(Table.identifier, tableName(), temporary ? .temporary : nil, ifNotExists),
Expression<Void>(literal: "AS"),
query
]
Expand Down Expand Up @@ -133,7 +133,7 @@ extension Table {

public func createIndex(_ columns: [Expressible], unique: Bool = false, ifNotExists: Bool = false) -> String {
let clauses: [Expressible?] = [
create("INDEX", indexName(columns), unique ? .Unique : nil, ifNotExists),
create("INDEX", indexName(columns), unique ? .unique : nil, ifNotExists),
Expression<Void>(literal: "ON"),
tableName(qualified: false),
"".wrap(columns) as Expression<Void>
Expand Down Expand Up @@ -176,7 +176,7 @@ extension View {

public func create(_ query: QueryType, temporary: Bool = false, ifNotExists: Bool = false) -> String {
let clauses: [Expressible?] = [
create(View.identifier, tableName(), temporary ? .Temporary : nil, ifNotExists),
create(View.identifier, tableName(), temporary ? .temporary : nil, ifNotExists),
Expression<Void>(literal: "AS"),
query
]
Expand Down Expand Up @@ -513,8 +513,8 @@ private func reference(_ primary: (QueryType, Expressible)) -> Expressible {

private enum Modifier : String {

case Unique = "UNIQUE"
case unique = "UNIQUE"

case Temporary = "TEMPORARY"
case temporary = "TEMPORARY"

}