Skip to content

Commit ec23247

Browse files
authored
Merge pull request #110 from vapor/beta
mysql beta
2 parents 0ab1498 + fa34d89 commit ec23247

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4113
-2505
lines changed

.DS_Store

6 KB
Binary file not shown.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Qutheory, LLC
3+
Copyright (c) 2018 Qutheory, LLC
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Package.swift

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
1+
// swift-tools-version:4.0
12
import PackageDescription
23

34
let package = Package(
45
name: "MySQL",
6+
products: [
7+
.library(name: "MySQL", targets: ["MySQL"]),
8+
],
59
dependencies: [
6-
// Module map for `libmysql`
7-
.Package(url: "https://github.com/vapor/cmysql.git", majorVersion: 2),
10+
// Swift Promises, Futures, and Streams.
11+
.package(url: "https://github.com/vapor/async.git", from: "1.0.0-rc"),
812

9-
// Data structure for converting between multiple representations
10-
.Package(url: "https://github.com/vapor/node.git", majorVersion: 2),
13+
// Core extensions, type-aliases, and functions that facilitate common tasks.
14+
.package(url: "https://github.com/vapor/core.git", from: "3.0.0-rc"),
1115

12-
// Core extensions, type-aliases, and functions that facilitate common tasks
13-
.Package(url: "https://github.com/vapor/core.git", majorVersion: 2),
16+
// Cryptography modules
17+
.package(url: "https://github.com/vapor/crypto.git", from: "3.0.0-rc"),
1418

15-
// JSON parsing and serialization for storing arrays and objects in MySQL
16-
.Package(url: "https://github.com/vapor/json.git", majorVersion: 2),
19+
// Networking
20+
.package(url: "https://github.com/vapor/sockets.git", from: "3.0.0-rc"),
21+
22+
// SSL support
23+
.package(url: "https://github.com/vapor/tls.git", from: "3.0.0-rc"),
24+
],
25+
targets: [
26+
.target(name: "MySQL", dependencies: ["CodableKit", "Crypto", "TCP", "TLS"]),
27+
.testTarget(name: "MySQLTests", dependencies: ["MySQL"]),
1728
]
1829
)

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<p align="center">
2-
<img src="https://cloud.githubusercontent.com/assets/1342803/24704008/10d9e7de-1a06-11e7-855b-af4a079ba6b5.png" width="320" alt="MySQL">
2+
<img src="https://user-images.githubusercontent.com/1342803/36769061-0a96b82c-1c10-11e8-8c66-4b7a337bbb43.png" height="64" alt="MySQL">
33
<br>
44
<br>
5-
<a href="https://docs.vapor.codes/2.0/mysql/package/">
6-
<img src="http://img.shields.io/badge/read_the-docs-92A8D1.svg" alt="Documentation">
5+
<a href="https://docs.vapor.codes/3.0/">
6+
<img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
77
</a>
88
<a href="http://vapor.team">
99
<img src="http://vapor.team/badge.svg" alt="Slack Team">
@@ -15,6 +15,6 @@
1515
<img src="https://circleci.com/gh/vapor/mysql.svg?style=shield" alt="Continuous Integration">
1616
</a>
1717
<a href="https://swift.org">
18-
<img src="http://img.shields.io/badge/swift-3.1-brightgreen.svg" alt="Swift 3.1">
18+
<img src="http://img.shields.io/badge/swift-4.1-brightgreen.svg" alt="Swift 4.1">
1919
</a>
2020
</p>

Sources/.DS_Store

6 KB
Binary file not shown.

Sources/MySQL/Bind/Bind+Node.swift

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)