Skip to content

Commit 136c8a8

Browse files
jberkeljberkel
committed
Remove FTS4 Tokenizer / SQLiteObjc
 Closes #1104
1 parent d7acf92 commit 136c8a8

File tree

8 files changed

+7
-445
lines changed

8 files changed

+7
-445
lines changed

‎Package.swift‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,10 @@ let package = Package(
1818
targets: [
1919
.target(
2020
name: "SQLite",
21-
dependencies: ["SQLiteObjc"],
2221
exclude: [
2322
"Info.plist"
2423
]
2524
),
26-
.target(
27-
name: "SQLiteObjc",
28-
dependencies: [],
29-
exclude: [
30-
"fts3_tokenizer.h"
31-
]
32-
),
3325
.testTarget(
3426
name: "SQLiteTests",
3527
dependencies: [
@@ -57,7 +49,8 @@ package.targets = [
5749
.testTarget(
5850
name: "SQLiteTests",
5951
dependencies: ["SQLite"],
60-
path: "Tests/SQLiteTests", exclude: [
52+
path: "Tests/SQLiteTests",
53+
exclude: [
6154
"FTSIntegrationTests.swift",
6255
"FTS4Tests.swift",
6356
"FTS5Tests.swift"

‎SQLite.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
03A65E741C6BB2DA0062603F /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
1818
03A65E761C6BB2E60062603F /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
1919
03A65E771C6BB2E60062603F /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
20-
03A65E781C6BB2EA0062603F /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
21-
03A65E791C6BB2EF0062603F /* SQLiteObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLiteObjc.m */; };
2220
03A65E7A1C6BB2F70062603F /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF21C3F06E900AE3E12 /* Statement.swift */; };
2321
03A65E7B1C6BB2F70062603F /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF31C3F06E900AE3E12 /* Value.swift */; };
2422
03A65E7C1C6BB2F70062603F /* FTS4.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF51C3F06E900AE3E12 /* FTS4.swift */; };
@@ -116,13 +114,7 @@
116114
3D67B3F61DB246D100A4F4C6 /* Setter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B021C3F06E900AE3E12 /* Setter.swift */; };
117115
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
118116
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
119-
3D67B3F91DB246E700A4F4C6 /* SQLiteObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLiteObjc.m */; };
120117
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
121-
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
122-
3DDC112F26CDBA0200CE369F /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DDC112E26CDBA0200CE369F /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
123-
3DDC113626CDBE1900CE369F /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DDC112E26CDBA0200CE369F /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
124-
3DDC113726CDBE1900CE369F /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DDC112E26CDBA0200CE369F /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
125-
3DDC113826CDBE1C00CE369F /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DDC112E26CDBA0200CE369F /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
126118
3DF7B78828842972005DD8CA /* Connection+Attach.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DF7B78728842972005DD8CA /* Connection+Attach.swift */; };
127119
3DF7B78928842972005DD8CA /* Connection+Attach.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DF7B78728842972005DD8CA /* Connection+Attach.swift */; };
128120
3DF7B78A28842972005DD8CA /* Connection+Attach.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DF7B78728842972005DD8CA /* Connection+Attach.swift */; };
@@ -152,8 +144,6 @@
152144
EE247ADE1C3F04ED00AE3E12 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EE247AD31C3F04ED00AE3E12 /* SQLite.framework */; };
153145
EE247B031C3F06E900AE3E12 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
154146
EE247B041C3F06E900AE3E12 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
155-
EE247B051C3F06E900AE3E12 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
156-
EE247B061C3F06E900AE3E12 /* SQLiteObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLiteObjc.m */; };
157147
EE247B071C3F06E900AE3E12 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF21C3F06E900AE3E12 /* Statement.swift */; };
158148
EE247B081C3F06E900AE3E12 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF31C3F06E900AE3E12 /* Value.swift */; };
159149
EE247B091C3F06E900AE3E12 /* FTS4.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF51C3F06E900AE3E12 /* FTS4.swift */; };
@@ -205,8 +195,6 @@
205195
EE247B641C3F3FDB00AE3E12 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
206196
EE247B651C3F3FEC00AE3E12 /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
207197
EE247B661C3F3FEC00AE3E12 /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
208-
EE247B671C3F3FEC00AE3E12 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
209-
EE247B681C3F3FEC00AE3E12 /* SQLiteObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLiteObjc.m */; };
210198
EE247B691C3F3FEC00AE3E12 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF21C3F06E900AE3E12 /* Statement.swift */; };
211199
EE247B6A1C3F3FEC00AE3E12 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF31C3F06E900AE3E12 /* Value.swift */; };
212200
EE247B6B1C3F3FEC00AE3E12 /* FTS4.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF51C3F06E900AE3E12 /* FTS4.swift */; };
@@ -272,13 +260,13 @@
272260
3717F907221F5D7C00B9BD3D /* CustomAggregationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAggregationTests.swift; sourceTree = "<group>"; };
273261
3D3C3CCB26E5568800759140 /* SQLite.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = SQLite.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
274262
3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
275-
3DDC112E26CDBA0200CE369F /* SQLiteObjc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SQLiteObjc.h; path = ../SQLiteObjc/include/SQLiteObjc.h; sourceTree = "<group>"; };
276263
3DF7B78728842972005DD8CA /* Connection+Attach.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Connection+Attach.swift"; sourceTree = "<group>"; };
277264
3DF7B78C28842C23005DD8CA /* ResultTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultTests.swift; sourceTree = "<group>"; };
278265
3DF7B790288449BA005DD8CA /* URIQueryParameter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URIQueryParameter.swift; sourceTree = "<group>"; };
279266
3DF7B79528846FCC005DD8CA /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = "<group>"; };
280267
3DF7B79A2884C353005DD8CA /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
281268
3DF7B79B2884C901005DD8CA /* Planning.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Planning.md; sourceTree = "<group>"; };
269+
3DFC0B862886C239001C8FC9 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
282270
49EB68C31F7B3CB400D89D40 /* Coding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coding.swift; sourceTree = "<group>"; };
283271
997DF2AD287FC06D00F8DF95 /* Query+with.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Query+with.swift"; sourceTree = "<group>"; };
284272
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -290,8 +278,6 @@
290278
EE247AE41C3F04ED00AE3E12 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
291279
EE247AEE1C3F06E900AE3E12 /* Blob.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Blob.swift; sourceTree = "<group>"; };
292280
EE247AEF1C3F06E900AE3E12 /* Connection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Connection.swift; sourceTree = "<group>"; };
293-
EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fts3_tokenizer.h; path = ../../SQLiteObjc/fts3_tokenizer.h; sourceTree = "<group>"; };
294-
EE247AF11C3F06E900AE3E12 /* SQLiteObjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SQLiteObjc.m; path = ../../SQLiteObjc/SQLiteObjc.m; sourceTree = "<group>"; };
295281
EE247AF21C3F06E900AE3E12 /* Statement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Statement.swift; sourceTree = "<group>"; };
296282
EE247AF31C3F06E900AE3E12 /* Value.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Value.swift; sourceTree = "<group>"; };
297283
EE247AF51C3F06E900AE3E12 /* FTS4.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTS4.swift; sourceTree = "<group>"; };
@@ -406,9 +392,10 @@
406392
EE247AC91C3F04ED00AE3E12 = {
407393
isa = PBXGroup;
408394
children = (
395+
3DFC0B862886C239001C8FC9 /* Package.swift */,
396+
3D3C3CCB26E5568800759140 /* SQLite.playground */,
409397
EE247AD51C3F04ED00AE3E12 /* SQLite */,
410398
EE247AE11C3F04ED00AE3E12 /* SQLiteTests */,
411-
3D3C3CCB26E5568800759140 /* SQLite.playground */,
412399
EE247B8A1C3F81D000AE3E12 /* Metadata */,
413400
EE247AD41C3F04ED00AE3E12 /* Products */,
414401
3D67B3E41DB2469200A4F4C6 /* Frameworks */,
@@ -435,7 +422,6 @@
435422
isa = PBXGroup;
436423
children = (
437424
EE247AD61C3F04ED00AE3E12 /* SQLite.h */,
438-
3DDC112E26CDBA0200CE369F /* SQLiteObjc.h */,
439425
EE247AF71C3F06E900AE3E12 /* Foundation.swift */,
440426
EE247AF81C3F06E900AE3E12 /* Helpers.swift */,
441427
EE247AD81C3F04ED00AE3E12 /* Info.plist */,
@@ -488,8 +474,6 @@
488474
children = (
489475
EE247AEE1C3F06E900AE3E12 /* Blob.swift */,
490476
EE247AEF1C3F06E900AE3E12 /* Connection.swift */,
491-
EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */,
492-
EE247AF11C3F06E900AE3E12 /* SQLiteObjc.m */,
493477
EE247AF21C3F06E900AE3E12 /* Statement.swift */,
494478
EE247AF31C3F06E900AE3E12 /* Value.swift */,
495479
19A1710E73A46D5AC721CDA9 /* Errors.swift */,
@@ -505,10 +489,10 @@
505489
EE247AF41C3F06E900AE3E12 /* Extensions */ = {
506490
isa = PBXGroup;
507491
children = (
492+
19A178A39ACA9667A62663CC /* Cipher.swift */,
508493
EE247AF51C3F06E900AE3E12 /* FTS4.swift */,
509-
EE247AF61C3F06E900AE3E12 /* RTree.swift */,
510494
19A1730E4390C775C25677D1 /* FTS5.swift */,
511-
19A178A39ACA9667A62663CC /* Cipher.swift */,
495+
EE247AF61C3F06E900AE3E12 /* RTree.swift */,
512496
);
513497
path = Extensions;
514498
sourceTree = "<group>";
@@ -576,8 +560,6 @@
576560
isa = PBXHeadersBuildPhase;
577561
buildActionMask = 2147483647;
578562
files = (
579-
03A65E781C6BB2EA0062603F /* fts3_tokenizer.h in Headers */,
580-
3DDC113626CDBE1900CE369F /* SQLiteObjc.h in Headers */,
581563
03A65E721C6BB2D30062603F /* SQLite.h in Headers */,
582564
);
583565
runOnlyForDeploymentPostprocessing = 0;
@@ -587,17 +569,13 @@
587569
buildActionMask = 2147483647;
588570
files = (
589571
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */,
590-
3DDC113726CDBE1900CE369F /* SQLiteObjc.h in Headers */,
591-
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */,
592572
);
593573
runOnlyForDeploymentPostprocessing = 0;
594574
};
595575
EE247AD01C3F04ED00AE3E12 /* Headers */ = {
596576
isa = PBXHeadersBuildPhase;
597577
buildActionMask = 2147483647;
598578
files = (
599-
EE247B051C3F06E900AE3E12 /* fts3_tokenizer.h in Headers */,
600-
3DDC113826CDBE1C00CE369F /* SQLiteObjc.h in Headers */,
601579
EE247AD71C3F04ED00AE3E12 /* SQLite.h in Headers */,
602580
);
603581
runOnlyForDeploymentPostprocessing = 0;
@@ -606,8 +584,6 @@
606584
isa = PBXHeadersBuildPhase;
607585
buildActionMask = 2147483647;
608586
files = (
609-
EE247B671C3F3FEC00AE3E12 /* fts3_tokenizer.h in Headers */,
610-
3DDC112F26CDBA0200CE369F /* SQLiteObjc.h in Headers */,
611587
EE247B621C3F3FDB00AE3E12 /* SQLite.h in Headers */,
612588
);
613589
runOnlyForDeploymentPostprocessing = 0;
@@ -869,7 +845,6 @@
869845
03A65E761C6BB2E60062603F /* Blob.swift in Sources */,
870846
03A65E7D1C6BB2F70062603F /* RTree.swift in Sources */,
871847
3DF7B793288449BA005DD8CA /* URIQueryParameter.swift in Sources */,
872-
03A65E791C6BB2EF0062603F /* SQLiteObjc.m in Sources */,
873848
03A65E7B1C6BB2F70062603F /* Value.swift in Sources */,
874849
03A65E821C6BB2FB0062603F /* Expression.swift in Sources */,
875850
03A65E731C6BB2D80062603F /* Foundation.swift in Sources */,
@@ -933,7 +908,6 @@
933908
isa = PBXSourcesBuildPhase;
934909
buildActionMask = 2147483647;
935910
files = (
936-
3D67B3F91DB246E700A4F4C6 /* SQLiteObjc.m in Sources */,
937911
3DF7B78B28842972005DD8CA /* Connection+Attach.swift in Sources */,
938912
49EB68C71F7B3CB400D89D40 /* Coding.swift in Sources */,
939913
997DF2B1287FC06D00F8DF95 /* Query+with.swift in Sources */,
@@ -986,7 +960,6 @@
986960
EE247B121C3F06E900AE3E12 /* Operators.swift in Sources */,
987961
EE247B141C3F06E900AE3E12 /* Schema.swift in Sources */,
988962
EE247B131C3F06E900AE3E12 /* Query.swift in Sources */,
989-
EE247B061C3F06E900AE3E12 /* SQLiteObjc.m in Sources */,
990963
EE247B071C3F06E900AE3E12 /* Statement.swift in Sources */,
991964
EE247B0D1C3F06E900AE3E12 /* AggregateFunctions.swift in Sources */,
992965
19A1717B10CC941ACB5533D6 /* FTS5.swift in Sources */,
@@ -1042,7 +1015,6 @@
10421015
EE247B651C3F3FEC00AE3E12 /* Blob.swift in Sources */,
10431016
EE247B6C1C3F3FEC00AE3E12 /* RTree.swift in Sources */,
10441017
3DF7B792288449BA005DD8CA /* URIQueryParameter.swift in Sources */,
1045-
EE247B681C3F3FEC00AE3E12 /* SQLiteObjc.m in Sources */,
10461018
EE247B6A1C3F3FEC00AE3E12 /* Value.swift in Sources */,
10471019
EE247B711C3F3FEC00AE3E12 /* Expression.swift in Sources */,
10481020
EE247B631C3F3FDB00AE3E12 /* Foundation.swift in Sources */,

‎Sources/SQLite/Extensions/FTS4.swift‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
// THE SOFTWARE.
2323
//
2424

25-
#if SWIFT_PACKAGE
26-
import SQLiteObjc
27-
#endif
28-
2925
extension Module {
3026

3127
public static func FTS4(_ column: Expressible, _ more: Expressible...) -> Module {
@@ -149,29 +145,6 @@ extension Tokenizer: CustomStringConvertible {
149145

150146
}
151147

152-
extension Connection {
153-
154-
public func registerTokenizer(_ submoduleName: String, next: @escaping (String) -> (String, Range<String.Index>)?) throws {
155-
try check(_SQLiteRegisterTokenizer(handle, Tokenizer.moduleName, submoduleName) {
156-
(input: UnsafePointer<Int8>, offset: UnsafeMutablePointer<Int32>, length: UnsafeMutablePointer<Int32>) in
157-
let string = String(cString: input)
158-
159-
guard let (token, range) = next(string) else { return nil }
160-
161-
let view: String.UTF8View = string.utf8
162-
163-
if let from = range.lowerBound.samePosition(in: view),
164-
let to = range.upperBound.samePosition(in: view) {
165-
offset.pointee += Int32(string[string.startIndex..<range.lowerBound].utf8.count)
166-
length.pointee = Int32(view.distance(from: from, to: to))
167-
return token
168-
} else {
169-
return nil
170-
}
171-
})
172-
}
173-
}
174-
175148
/// Configuration options shared between the [FTS4](https://www.sqlite.org/fts3.html) and
176149
/// [FTS5](https://www.sqlite.org/fts5.html) extensions.
177150
open class FTSConfig {

‎Sources/SQLite/SQLite.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22

33
FOUNDATION_EXPORT double SQLiteVersionNumber;
44
FOUNDATION_EXPORT const unsigned char SQLiteVersionString[];
5-
6-
#import "SQLiteObjc.h"

0 commit comments

Comments
 (0)