Skip to content

Commit 138a546

Browse files
authored
Update for the nested subpath changes in FluentKit (#87)
Remove no longer needed (well, never needed, really) nested subpath support in SQL converter delegate. General tidying and CI.
1 parent 3eaf7cb commit 138a546

File tree

6 files changed

+55
-12
lines changed

6 files changed

+55
-12
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
* @gwynne
2+
/.github/CONTRIBUTING.md @gwynne @0xTim
3+
/.github/workflows/*.yml @gwynne @0xTim
4+
/.github/workflows/test.yml @gwynne
5+
/.spi.yml @gwynne @0xTim
6+
/.gitignore @gwynne @0xTim
7+
/LICENSE @gwynne @0xTim
8+
/README.md @gwynne @0xTim

.github/CONTRIBUTING.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Contributing to Fluent's SQLite Driver
2+
3+
👋 Welcome to the Vapor team!
4+
5+
## Xcode
6+
7+
To open the project in Xcode:
8+
9+
- Clone the repo to your computer
10+
- Drag and drop the folder onto Xcode
11+
12+
To test within Xcode, press `CMD+U`.
13+
14+
## SPM
15+
16+
To develop using SPM, open the code in your favorite code editor. Use the following commands from within the project's root folder to build and test.
17+
18+
```sh
19+
swift build
20+
swift test
21+
```
22+
23+
## SemVer
24+
25+
Vapor follows [SemVer](https://semver.org). This means that any changes to the source code that can cause
26+
existing code to stop compiling _must_ wait until the next major version to be included.
27+
28+
Code that is only additive and will not break any existing code can be included in the next minor release.
29+
30+
----------
31+
32+
Join us on Discord if you have any questions: [vapor.team](http://vapor.team).
33+
34+
— Thanks! 🙌

.github/workflows/test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: test
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
25
on:
3-
pull_request: { branches: ['*'] }
6+
pull_request: { types: [opened, reopened, synchronize, ready_for_review] }
47
push: { branches: [ main ] }
58

69
jobs:

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ let package = Package(
1313
.library(name: "FluentSQLiteDriver", targets: ["FluentSQLiteDriver"]),
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.27.0"),
17-
.package(url: "https://github.com/vapor/sqlite-kit.git", from: "4.0.0"),
18-
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
16+
.package(url: "https://github.com/vapor/fluent-kit.git", from: "1.43.0"),
17+
.package(url: "https://github.com/vapor/sqlite-kit.git", from: "4.3.1"),
18+
.package(url: "https://github.com/apple/swift-log.git", from: "1.5.2"),
1919
],
2020
targets: [
2121
.target(name: "FluentSQLiteDriver", dependencies: [

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
<a href="LICENSE">
1616
<img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
1717
</a>
18-
<a href="https://github.com/vapor/fluent-sqlite-driver/actions">
19-
<img src="https://github.com/vapor/fluent-sqlite-driver/workflows/test/badge.svg" alt="Continuous Integration">
18+
<a href="https://github.com/vapor/fluent-sqlite-driver/actions/workflows/test.yml">
19+
<img src="https://github.com/vapor/fluent-sqlite-driver/actions/workflows/test.yml/badge.svg?event=push" alt="Continuous Integration">
20+
</a>
21+
<a href="https://codecov.io/gh/vapor/fluent-sqlite-driver">
22+
<img src="https://codecov.io/gh/vapor/fluent-sqlite-driver/branch/main/graph/badge.svg?token=srIFeETGfJ" alt="Test Coverage">
2023
</a>
2124
<a href="https://swift.org">
22-
<img src="http://img.shields.io/badge/swift-5.2-brightgreen.svg" alt="Swift 5.2">
25+
<img src="http://img.shields.io/badge/swift-5.6-brightgreen.svg" alt="Swift 5.6">
2326
</a>
2427
</p>

Sources/FluentSQLiteDriver/SQLiteConverterDelegate.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,4 @@ struct SQLiteConverterDelegate: SQLConverterDelegate {
1616
default: return nil
1717
}
1818
}
19-
20-
func nestedFieldExpression(_ column: String, _ path: [String]) -> SQLExpression {
21-
let path = path.joined(separator: ".")
22-
return SQLRaw("JSON_EXTRACT(\(column), '$.\(path)')")
23-
}
2419
}

0 commit comments

Comments
 (0)