Skip to content

Commit 84d25df

Browse files
committed
Merge branch 'development'
2 parents 7e506f6 + 5664c5a commit 84d25df

File tree

5 files changed

+19
-48
lines changed

5 files changed

+19
-48
lines changed

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
77

88
#### 7.x Releases
99

10-
- `7.0.0` Betas - [7.0.0-beta](#700-beta) - [7.0.0-beta.2](#700-beta2) - [7.0.0-beta.3](#700-beta3) - [7.0.0-beta.4](#700-beta4) - [7.0.0-beta.5](#700-beta5)
10+
- `7.0.0` Betas - [7.0.0-beta](#700-beta) - [7.0.0-beta.2](#700-beta2) - [7.0.0-beta.3](#700-beta3) - [7.0.0-beta.4](#700-beta4) - [7.0.0-beta.5](#700-beta5) - [7.0.0-beta.6](#700-beta6)
1111

1212
#### 6.x Releases
1313

@@ -131,6 +131,12 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
131131

132132
---
133133

134+
## 7.0.0-beta.6
135+
136+
Released October 13, 2024
137+
138+
- **New**: Bump custom SQLite builds to 3.46.1 by [@groue](https://github.com/groue) in [#1654](https://github.com/groue/GRDB.swift/pull/1654)
139+
134140
## 7.0.0-beta.5
135141

136142
Released October 13, 2024
@@ -166,7 +172,7 @@ Released September 29, 2024
166172

167173
[Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md) describes in detail how to bump the GRDB version in your application.
168174

169-
The new [Swift Concurrency and GRDB](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.5/documentation/grdb/swiftconcurrency) guide explains how to best integrate GRDB and Swift Concurrency.
175+
The new [Swift Concurrency and GRDB](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/swiftconcurrency) guide explains how to best integrate GRDB and Swift Concurrency.
170176

171177
The [demo app](Documentation/DemoApps/) was rewritten from scratch in a brand new Xcode 16 project.
172178

Documentation/GRDB7MigrationGuide.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Do not miss [Swift Concurrency and GRDB], for more recommendations regarding non
228228
- The async sequence returned by [`ValueObservation.values`](https://swiftpackageindex.com/groue/grdb.swiftdocumentation/grdb/valueobservation/values(in:scheduling:bufferingpolicy:)) now iterates on the cooperative thread pool by default. Use .mainActor as the scheduler if you need the previous behavior.
229229

230230
[Migrating to Swift 6]: https://www.swift.org/migration/documentation/migrationguide
231-
[Sharing a Database]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.5/documentation/grdb/databasesharing
232-
[Transaction Kinds]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.5/documentation/grdb/transactions#Transaction-Kinds
233-
[Swift Concurrency and GRDB]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.5/documentation/grdb/swiftconcurrency
234-
[Record]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.5/documentation/grdb/record
231+
[Sharing a Database]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/databasesharing
232+
[Transaction Kinds]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/transactions#Transaction-Kinds
233+
[Swift Concurrency and GRDB]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/swiftconcurrency
234+
[Record]: https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/record

GRDB.swift.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GRDB.swift'
3-
s.version = '7.0.0-beta.5'
3+
s.version = '7.0.0-beta.6'
44

55
s.license = { :type => 'MIT', :file => 'LICENSE' }
66
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'

README.md

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<a href="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml"><img alt="CI Status" src="https://github.com/groue/GRDB.swift/actions/workflows/CI.yml/badge.svg?branch=master"></a>
1616
</p>
1717

18-
**Latest release**: October 12, 2024 • [version 7.0.0-beta.5](https://github.com/groue/GRDB.swift/tree/v7.0.0-beta.5) • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md)
18+
**Latest release**: October 13, 2024 • [version 7.0.0-beta.6](https://github.com/groue/GRDB.swift/tree/v7.0.0-beta.6) • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 6 to GRDB 7](Documentation/GRDB7MigrationGuide.md)
1919

2020
**Requirements**: iOS 13.0+ / macOS 10.15+ / tvOS 13.0+ / watchOS 7.0+ &bull; SQLite 3.20.0+ &bull; Swift 6+ / Xcode 16+
2121

@@ -295,7 +295,7 @@ Documentation
295295
#### Records and the Query Interface
296296

297297
- [Records](#records): Fetching and persistence methods for your custom structs and class hierarchies
298-
- [Query Interface](#the-query-interface): A swift way to generate SQL &bull; [create tables](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseschema) &bull; [requests](#requests) • [associations between record types](Documentation/AssociationsBasics.md)
298+
- [Query Interface](#the-query-interface): A swift way to generate SQL &bull; [create tables, indexes, etc](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/databaseschema) &bull; [requests](#requests) • [associations between record types](Documentation/AssociationsBasics.md)
299299

300300
#### Application Tools
301301

@@ -441,7 +441,7 @@ Advanced topics:
441441

442442
- [Prepared Statements]
443443
- [Custom SQL Functions and Aggregates](#custom-sql-functions-and-aggregates)
444-
- [Database Schema Introspection](#database-schema-introspection)
444+
- [Database Schema Introspection](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/databaseschemaintrospection)
445445
- [Row Adapters](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/rowadapter)
446446
- [Raw SQLite Pointers](#raw-sqlite-pointers)
447447

@@ -1596,41 +1596,6 @@ try Int.fetchOne(db, request) // Int?
15961596
```
15971597

15981598

1599-
## Database Schema Introspection
1600-
1601-
GRDB comes with a set of schema introspection methods:
1602-
1603-
```swift
1604-
try dbQueue.read { db in
1605-
// Bool, true if the table exists
1606-
try db.tableExists("player")
1607-
1608-
// [ColumnInfo], the columns in the table
1609-
try db.columns(in: "player")
1610-
1611-
// PrimaryKeyInfo
1612-
try db.primaryKey("player")
1613-
1614-
// [ForeignKeyInfo], the foreign keys defined on the table
1615-
try db.foreignKeys(on: "player")
1616-
1617-
// [IndexInfo], the indexes defined on the table
1618-
try db.indexes(on: "player")
1619-
1620-
// Bool, true if column(s) is a unique key (primary key or unique index)
1621-
try db.table("player", hasUniqueKey: ["email"])
1622-
}
1623-
1624-
// Bool, true if argument is the name of an internal SQLite table
1625-
Database.isSQLiteInternalTable(...)
1626-
1627-
// Bool, true if argument is the name of an internal GRDB table
1628-
Database.isGRDBInternalTable(...)
1629-
```
1630-
1631-
For more information, see [`tableExists(_:)`](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/database/tableexists(_:)) and related methods.
1632-
1633-
16341599
## Raw SQLite Pointers
16351600

16361601
**If not all SQLite APIs are exposed in GRDB, you can still use the [SQLite C Interface](https://www.sqlite.org/c3ref/intro.html) and call [SQLite C functions](https://www.sqlite.org/c3ref/funclist.html).**
@@ -1678,7 +1643,7 @@ try dbQueue.write { db in
16781643
}
16791644
```
16801645

1681-
Of course, you need to open a [database connection], and [create database tables](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseschema) first.
1646+
Of course, you need to open a [database connection], and [create database tables](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/databaseschema) first.
16821647

16831648
To define a record type, define a type and extend it with protocols that come with focused sets of features.
16841649

@@ -3285,7 +3250,7 @@ So don't miss the [SQL API](#sqlite-api).
32853250

32863251
> **Note**: the generated SQL may change between GRDB releases, without notice: don't have your application rely on any specific SQL output.
32873252

3288-
- [The Database Schema](https://swiftpackageindex.com/groue/grdb.swift/documentation/grdb/databaseschema)
3253+
- [The Database Schema](https://swiftpackageindex.com/groue/grdb.swift/v7.0.0-beta.6/documentation/grdb/databaseschema)
32893254
- [Requests](#requests)
32903255
- [Expressions](#expressions)
32913256
- [SQL Operators](#sql-operators)

Support/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>7.0.0-beta.5</string>
18+
<string>7.0.0-beta.6</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)