+ 
+ 
@@ -24,7 +24,7 @@
`Swift-Kuery` is a pluggable SQL database driver/SDK abstraction layer. Its main idea is to unify the APIs to the various relational databases, providing a Swifty yet SQL-like API. This allows easy switching between databases and forms the basis for an Object-Relational Mapping (ORM) framework.
-[Swift-Kuery-ORM](https://github.com/IBM-Swift/Swift-Kuery-ORM) is an ORM, built on top of Swift-Kuery, which allows you to simplify the persistence of model objects with your server.
+[Swift-Kuery-ORM](https://github.com/Kitura/Swift-Kuery-ORM) is an ORM, built on top of Swift-Kuery, which allows you to simplify the persistence of model objects with your server.
`Swift-Kuery` is an easy to learn, consumable framework that comes with a set of [implemented plugins](#list-of-plugins).
@@ -44,7 +44,7 @@
The latest version of Swift-Kuery requires **Swift 4.0** or newer. You can download this version of the Swift binaries by following this [link](https://swift.org/download/). Compatibility with other Swift versions is not guaranteed.
## Usage
-This example demonstrates how to execute an SQL query using `Swift-Kuery` with the [Swift-Kuery-PostgreSQL](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL) plugin.
+This example demonstrates how to execute an SQL query using `Swift-Kuery` with the [Swift-Kuery-PostgreSQL](https://github.com/Kitura/Swift-Kuery-PostgreSQL) plugin.
The starting point for this example is an existing Swift package. If you don't have one already, create and enter a directory named e.g. `SwiftKueryExample`. Now run the swift package's init command, to create an executable type, by running `swift package init --type executable`.
@@ -72,14 +72,14 @@ The starting point for this example is an existing Swift package. If you don't h
```
### Update your Package.swift file
-Add Swift-Kuery and your Kuery plugin, in this case Swift-Kuery-PostgreSQL, to the dependencies within your application's `Package.swift` file. Substitute `"x.x.x"` with the latest `Swift-Kuery` [release](https://github.com/IBM-Swift/Swift-Kuery/releases) and `"y.y.y"` with the latest plugin [release](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL/releases).
+Add Swift-Kuery and your Kuery plugin, in this case Swift-Kuery-PostgreSQL, to the dependencies within your application's `Package.swift` file. Substitute `"x.x.x"` with the latest `Swift-Kuery` [release](https://github.com/Kitura/Swift-Kuery/releases) and `"y.y.y"` with the latest plugin [release](https://github.com/Kitura/Swift-Kuery-PostgreSQL/releases).
```swift
dependencies: [
...
// Add this line
- .package(url: "https://github.com/IBM-Swift/Swift-Kuery.git", from: "x.x.x"),
- .package(url: "https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL.git", from: "y.y.y"),
+ .package(url: "https://github.com/Kitura/Swift-Kuery.git", from: "x.x.x"),
+ .package(url: "https://github.com/Kitura/Swift-Kuery-PostgreSQL.git", from: "y.y.y"),
],
targets: [
.target(
@@ -619,18 +619,18 @@ let query = Select(t2.c, from: t2)
## List of plugins
-* [PostgreSQL](https://github.com/IBM-Swift/Swift-Kuery-PostgreSQL)
+* [PostgreSQL](https://github.com/Kitura/Swift-Kuery-PostgreSQL)
-* [SQLite](https://github.com/IBM-Swift/Swift-Kuery-SQLite)
+* [SQLite](https://github.com/Kitura/Swift-Kuery-SQLite)
-* [MySQL](https://github.com/IBM-Swift/SwiftKueryMySQL)
+* [MySQL](https://github.com/Kitura/SwiftKueryMySQL)
## API Documentation
-For more information visit our [API reference](https://ibm-swift.github.io/Swift-Kuery/index.html).
+For more information visit our [API reference](https://kitura.github.io/Swift-Kuery/index.html).
## Community
We love to talk server-side Swift, and Kitura. Join our [Slack](http://swift-at-ibm-slack.mybluemix.net/) to meet the team!
## License
-This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/IBM-Swift/Swift-Kuery/blob/master/LICENSE.txt).
+This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/Kitura/Swift-Kuery/blob/master/LICENSE.txt).
diff --git a/Sources/SwiftKuery/Utils.swift b/Sources/SwiftKuery/Utils.swift
index 839a3213..e4fcf492 100644
--- a/Sources/SwiftKuery/Utils.swift
+++ b/Sources/SwiftKuery/Utils.swift
@@ -1,12 +1,12 @@
/**
Copyright IBM Corporation 2016, 2017
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
import Foundation
struct Utils {
-
+
static func packType(_ item: Any) -> String {
switch item {
case let val as String:
@@ -28,7 +28,7 @@ struct Utils {
return String(describing: item)
}
}
-
+
static func packType(_ item: Any, queryBuilder: QueryBuilder) throws -> String {
switch item {
case let val as String:
@@ -48,7 +48,7 @@ struct Utils {
return val == "nil" ? "NULL" : val
}
}
-
+
static func packName(_ name: String, queryBuilder: QueryBuilder) -> String {
var result = name
let identifierQuoteCharacter = queryBuilder.substitutions[QueryBuilder.QuerySubstitutionNames.identifierQuoteCharacter.rawValue]
@@ -57,7 +57,7 @@ struct Utils {
}
return result
}
-
+
static func updateParameterNumbers(query: String, queryBuilder: QueryBuilder) -> String {
let marker = queryBuilder.substitutions[QueryBuilder.QuerySubstitutionNames.numberedParameter.rawValue]
if !queryBuilder.addNumbersToParameters {
@@ -68,7 +68,8 @@ struct Utils {
var range = inputQuery.range(of: Parameter.numberedParameterMarker)
var index = 1
while let _range = range {
- resultQuery += inputQuery[..<_range.lowerBound] + marker + "\(index)"
+ resultQuery += inputQuery[..<_range.lowerBound] + marker
+ resultQuery += "\(index)"
inputQuery = String(inputQuery[_range.upperBound...])
index += 1
@@ -78,7 +79,7 @@ struct Utils {
resultQuery += inputQuery
return resultQuery
}
-
+
static func convertNamedParametersToNumbered(query: String, queryBuilder: QueryBuilder) -> (String, [String:[Int]], Int) {
var resultQuery = ""
var nameToNumber = [String:[Int]]()
diff --git a/docs/Classes.html b/docs/Classes.html
index b7d1fbec..9902a4b8 100644
--- a/docs/Classes.html
+++ b/docs/Classes.html
@@ -14,6 +14,7 @@
View on GitHub
+
@@ -480,9 +483,11 @@
@@ -531,9 +536,11 @@ Classes
The following classes are available globally.
@@ -418,9 +419,11 @@Classes
-
@@ -441,7 +444,7 @@
Usage Example:
In this example, an
AuxiliaryTableclass is defined containing two columns. AToDoTable(as defined inTable), aPersonTable(as defined inColumn) and a connection instance are initialized. -An instance of theAuxiliaryTableis then initialised fromColumninstances intodotable
. +An instance of theAuxiliaryTableis then initialised fromColumninstances in “todotable”. ThisAuxiliaryTableis then used to create an SQL WITH query. A description of the created query is then printed.class AuxTable: AuxiliaryTable { @@ -467,7 +470,7 @@Usage Example:
Declaration
Declaration
-
@@ -518,7 +523,7 @@
Usage Example:
Declaration
Declaration
-
@@ -587,9 +594,11 @@
Declaration
-
@@ -625,7 +634,7 @@
Usage Example:
Declaration
@@ -666,9 +675,11 @@Swift
-
+public class ConnectionPoolConnection: Connectionpublic class ConnectionPoolConnection : ConnectionDeclaration
-
@@ -738,9 +749,11 @@
Declaration
-
@@ -797,9 +810,11 @@
Declaration
-
@@ -836,9 +851,11 @@
Declaration
-
@@ -877,7 +894,7 @@
Usage Example:
Declaration
@@ -892,8 +909,8 @@Declaration
-
@@ -877,7 +894,7 @@
-
@@ -836,9 +851,11 @@
-
@@ -797,9 +810,11 @@
-
@@ -738,9 +749,11 @@
-
@@ -625,7 +634,7 @@
View on GitHub