Commit Graph

570 Commits

Author SHA1 Message Date
August "Gus" Mueller
e052477dc8 Merge pull request #260 from robertmryan/master
Fix minor typos
2014-05-03 20:20:58 -07:00
robertmryan
2ff0b2b907 Fix minor typos 2014-05-03 21:32:31 -04:00
August Mueller
db78976efc Updated podspec for a tag that doesn't exist yet. 2014-04-23 16:14:46 -07:00
August Mueller
5e21152188 Added a version to the code, and added an API to it as well. 2014-04-23 16:12:18 -07:00
August Mueller
19e80be880 Notes, and a version number! 2014-04-23 16:03:05 -07:00
August Mueller
598cbf67cc Removed FMDatabaseSplitter, since it's no longer needed and cleaned up some code. 2014-04-23 15:59:20 -07:00
August Mueller
20878b003b Removed some tests from main.m (since I want to remove them all eventually in favor of the test suite), and fixed some warnings, and updated some logs. 2014-04-23 15:57:16 -07:00
August Mueller
9df60de06d sshhhh clang, it'll be alright. 2014-04-23 15:21:04 -07:00
August Mueller
941bfdd7b5 Notes and renames. 2014-04-23 10:40:35 -07:00
August Mueller
50f8efa236 Deprecation of a method, because its name sucked. 2014-04-23 10:30:04 -07:00
August Mueller
6d090b8b0b Cleanup and little changes. 2014-04-23 09:54:24 -07:00
August Mueller
5cd73023f1 Merge branch 'master' of git://github.com/robertmryan/fmdb into robertmryan-master 2014-04-23 09:26:17 -07:00
robertmryan
b044f2a7c7 Only run appledoc on the .h files. 2014-04-21 08:48:40 -04:00
Rob Ryan
1009892cf6 Added pragma mark because FMDatabase was getting a little hairy, and it makes it a little easier to navigate in Xcode; add appledoc not in FMDatabaseBusyHandler; changed the C functions to use consistent prefix (some used FMDB, some used FM, some used no prefix … they now all use FMDB 2014-04-18 13:31:30 -04:00
Rob Ryan
e5f8dd38d1 Updated appledoc headers 2014-04-18 13:28:06 -04:00
robertmryan
1a028871aa Add FMDB prefix to callback type 2014-04-17 13:55:56 -04:00
robertmryan
8ff0eb3a53 Updated test cases for executeBulkSQL 2014-04-17 13:31:50 -04:00
robertmryan
d10dc4f34f Fix FMDBQuickCheck for bulk test 2014-04-17 13:30:50 -04:00
robertmryan
f16470e339 Update documentation 2014-04-17 13:08:24 -04:00
robertmryan
0f707ec168 Add executeBulkSQL methods 2014-04-17 13:07:58 -04:00
Andrew Goodale
e5ce8ab615 Two tokenizer implementations 2014-04-17 09:24:26 -04:00
August "Gus" Mueller
8941bf15a4 Merge pull request #250 from OpenFibers/master
Some commits for FMSQLStatementSplitter
2014-04-16 10:42:45 -07:00
openthread
a29e7c4688 added appledoc-style documentation to headers of FMSQLStatementSplitter 2014-04-16 22:40:22 +08:00
openthread
1c03cc2251 README updated for FMSQLStatementSplitter usage 2014-04-16 22:30:39 +08:00
openthread
45e79efea4 added an example for using FMSQLStatementSplitter in main.m 2014-04-16 22:20:16 +08:00
openthread
bf22880125 fixed warnings in FMStatementSplitter when compiling for mac 64-bit 2014-04-16 22:15:55 +08:00
August Mueller
3691599e49 Update contrib stuff. 2014-04-14 10:59:59 -07:00
Andrew Goodale
fed71ec21e Support multiple named delegates using a single fts3 tokenizer module. 2014-04-09 20:37:10 -04:00
August Mueller
5e987e0c14 Notes on what's going on today. 2014-04-09 11:14:20 -07:00
August Mueller
3ffd3dc42c Merge branch 'master' of https://github.com/ccgus/fmdb into busyloopback 2014-04-09 11:08:12 -07:00
August Mueller
85979c37f3 notes. 2014-04-09 10:58:03 -07:00
August Mueller
a55254da0b Moved some stuff around. 2014-04-09 10:56:08 -07:00
openthread
2b7f7adff4 added batch sql splitter 2014-04-07 20:33:57 +08:00
Andrew Goodale
800557c6f4 Created category for FTS3 support.
Added protocol to implement custom tokenizer logic.
2014-03-28 13:24:05 -04:00
August Mueller
ad738140aa Merge branch 'master' of https://github.com/ccgus/fmdb into busyloopback 2014-03-15 12:25:40 -07:00
August "Gus" Mueller
c41fe67736 Merge pull request #240 from robertmryan/master
Reorganized directory structure a little
2014-03-15 12:24:14 -07:00
robertmryan
e3c269c974 Update podspec 2014-03-10 00:33:20 -04:00
robertmryan
ca95403092 Create FMDB.h to include all the standard includes; moved framework code into its own subdirectory, “fmdb”; renamed fmdb.m to main.m to avoid confusion with new FMDB.h file; moved .pch and main.m into src/sample 2014-03-10 00:26:47 -04:00
August Mueller
484b046a4a Discovered sqlite3_busy_handler, and got to kill some ivars and code. busyTimeout has been replaced by setMaxBusyRetryTimeInterval: - this is a _lot_ better than adding loops everywhere. 2014-02-28 13:05:44 -08:00
August Mueller
995dbb5540 Adding back in a loop for catching database busy errors. It needs to be added back in other spots as well, which I'll do - but I haven't thought of the best way to break out of the loop yet, so I'm going to request some comments on that. 2014-02-12 11:03:50 -08:00
August "Gus" Mueller
e42b50f243 Merge pull request #229 from pietrasm/master
Added a static library for iOS.
2014-01-30 10:18:21 -08:00
Michal Pietras
4ccc0353e7 Added a static library for iOS. 2014-01-24 16:15:34 +00:00
ccgus
99bf192e1e More notes to self. 2014-01-20 10:02:31 -08:00
ccgus
7daa30d27a Cleanup, and then while debugging a test, noticed that sqlite3_busy_timeout doesn't retry a sqlite3_step for you automatically. So that's a problem that I'll need to fix. 2014-01-20 10:01:06 -08:00
August "Gus" Mueller
f7e1a9298a Merge pull request #225 from DanOranges/master
Fixed [FMDatabase openWithFlags:] so it does not reopen the db unnecessarily
2014-01-20 09:29:23 -08:00
DanOrange
ec5258ada7 Removed an unnecessary header comment in FMDatabaseAdditions.h. 2014-01-20 09:07:27 -08:00
DanOrange
1f09e622e8 Added in support for userVersion property
This uses '#PRAGMA user_version' to store/retrieve a uint32 value. According the sqlite3 docs can be used by applications for any purpose. It is useful for tracking database versions, and is used on by the Android SDK calls for that purpose, which can be helpful when doing cross platform work.
2014-01-17 22:08:06 -08:00
DanOrange
294d54c1e0 Fixed [FMDatabase openWithFlags:] so it does not reopen the db unnecessarily
This is just copying what was done in [FMDatabase open:] by return YES if the database already exists. This solves a problem with issue #211 where any connection changes being made in the [FMDatabasePoolDelegeate databasePool: didAddDatabase:] would just get reset as the database would be reopened on each pool call. Likely inefficent as well.
2014-01-17 21:43:48 -08:00
ccgus
d54f817686 Contribs and notes. 2014-01-17 12:33:20 -08:00
August "Gus" Mueller
018a7b81dd Merge pull request #224 from mikeash/master
Add a deadlock check to -[FMDatabaseQueue inDatabase:]
2014-01-17 12:29:40 -08:00