diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad9cf8a04..cfb5cd2546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
#### 4.x Releases
-- `4.12.x` Releases - [4.12.0](#4120) | [4.12.1](#4121)
+- `4.12.x` Releases - [4.12.0](#4120) | [4.12.1](#4121) | [4.12.2](#4122)
- `4.11.x` Releases - [4.11.0](#4110)
- `4.10.x` Releases - [4.10.0](#4100)
- `4.9.x` Releases - [4.9.0](#490)
@@ -69,6 +69,15 @@ GRDB adheres to [Semantic Versioning](https://semver.org/), with one exception:
## Next Release
-->
+## 4.12.2
+
+Released April 13, 2020 • [diff](https://github.com/groue/GRDB.swift/compare/v4.12.1...v4.12.2)
+
+**Fixed**
+
+- [#757](https://github.com/groue/GRDB.swift/pull/757): Don't load association inflections unless necessary
+
+
## 4.12.1
Released March 29, 2020 • [diff](https://github.com/groue/GRDB.swift/compare/v4.12.0...v4.12.1)
diff --git a/GRDB.swift.podspec b/GRDB.swift.podspec
index 268f423774..9b1b9de849 100644
--- a/GRDB.swift.podspec
+++ b/GRDB.swift.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GRDB.swift'
- s.version = '4.12.1'
+ s.version = '4.12.2'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.summary = 'A toolkit for SQLite databases, with a focus on application development.'
diff --git a/GRDB/Utils/Inflections.swift b/GRDB/Utils/Inflections.swift
index da6c5b1761..01051b2d63 100644
--- a/GRDB/Utils/Inflections.swift
+++ b/GRDB/Utils/Inflections.swift
@@ -9,14 +9,20 @@ extension String {
return String(first).uppercased() + dropFirst()
}
+ // Never inline this property, in order to make sure Inflections.default
+ // is lazily loaded. See https://github.com/groue/GRDB.swift/issues/755#issuecomment-612418053
/// "player" -> "players"
/// "players" -> "players"
+ @inline(never)
var pluralized: String {
return Inflections.default.pluralize(self)
}
+ // Never inline this property, in order to make sure Inflections.default
+ // is lazily loaded. See https://github.com/groue/GRDB.swift/issues/755#issuecomment-612418053
/// "player" -> "player"
/// "players" -> "player"
+ @inline(never)
var singularized: String {
return Inflections.default.singularize(self)
}
diff --git a/Makefile b/Makefile
index 6c49e77bc8..b3089021c1 100644
--- a/Makefile
+++ b/Makefile
@@ -466,12 +466,12 @@ ifdef JAZZY
--author 'Gwendal Roué' \
--author_url https://github.com/groue \
--github_url https://github.com/groue/GRDB.swift \
- --github-file-prefix https://github.com/groue/GRDB.swift/tree/v4.12.1 \
- --module-version 4.12.1 \
+ --github-file-prefix https://github.com/groue/GRDB.swift/tree/v4.12.2 \
+ --module-version 4.12.2 \
--module GRDB \
--root-url http://groue.github.io/GRDB.swift/docs/4.12/ \
--output Documentation/Reference \
- --podspec GRDB.swift.podspec
+ --xcodebuild-arguments -project,GRDB.xcodeproj,-scheme,GRDBiOS
else
@echo Jazzy must be installed for doc
@exit 1
diff --git a/README.md b/README.md
index 7cda208121..36ee6fbbbb 100644
--- a/README.md
+++ b/README.md
@@ -12,14 +12,14 @@
---
-**Latest release**: March 29, 2020 • version 4.12.1 • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 3 to GRDB 4](Documentation/GRDB3MigrationGuide.md)
+**Latest release**: April 13, 2020 • version 4.12.2 • [CHANGELOG](CHANGELOG.md) • [Migrating From GRDB 3 to GRDB 4](Documentation/GRDB3MigrationGuide.md)
**Requirements**: iOS 9.0+ / macOS 10.9+ / tvOS 9.0+ / watchOS 2.0+ • Swift 4.2+ / Xcode 10.0+
| Swift version | GRDB version |
| ------------- | ----------------------------------------------------------- |
-| **Swift 5** | **v4.12.1** |
-| **Swift 4.2** | **v4.12.1** |
+| **Swift 5** | **v4.12.2** |
+| **Swift 4.2** | **v4.12.2** |
| Swift 4.1 | [v3.7.0](https://github.com/groue/GRDB.swift/tree/v3.7.0) |
| Swift 4 | [v2.10.0](https://github.com/groue/GRDB.swift/tree/v2.10.0) |
| Swift 3.2 | [v1.3.0](https://github.com/groue/GRDB.swift/tree/v1.3.0) |
diff --git a/Support/Info.plist b/Support/Info.plist
index 0d1771ddc3..0bb59a4ea6 100644
--- a/Support/Info.plist
+++ b/Support/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 4.12.1
+ 4.12.2
CFBundleSignature
????
CFBundleVersion