Commit Graph
299 Commits
Author SHA1 Message Date
August Mueller 04ac082376 ARCified 2014-04-17 16:03:55 -07:00
August Mueller de7e71a32b executeBatch:withRowResultBlock: 2014-04-17 10:14:57 -07: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
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
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
ccgus 75b5dddc87 I hate tabs. 2014-01-17 12:28:47 -08:00
August "Gus" Mueller 929d1e9dc6 Merge pull request #223 from hartdev/master
Fixed consistency problems with errorsOnCrash
2014-01-17 12:25:28 -08:00
David Hart cbb64d4fc5 Fixed consistency problems with errorsOnCrash 2014-01-17 20:51:52 +01:00
Mike Ash 6fbd05f6c3 Add a deadlock check to -[FMDatabaseQueue inDatabase:] 2014-01-17 14:51:12 -05:00
August "Gus" Mueller 395f7b7a98 Merge pull request #220 from robertmryan/master
Change the use of #if / #endif
2.2-pod
2014-01-13 10:53:58 -08:00
robertmryan 04f2019a4e Change the use of #if / #endif so that Xcode document items pop over doesn’t get confused. Now when you pull down the document items pop over, all methods are shown. 2014-01-11 15:27:32 -05:00
August Mueller 9d989cc659 Cleanup and contribs. 2014-01-07 20:41:34 -08:00
ccgus e6424da53b Header fix. 2014-01-07 10:38:10 -08:00
ccgus 88ebd477b8 Might help to export the retry timeout interface for the tests! Also, new test to check @imoldmans' patches. 2014-01-07 10:27:38 -08:00
imoldman 72abbca772 improve type detect in FMDatabase.bindObject:obj when obj is a NSNumber
We should enum all possible in NSNumber, or we may get an incomprehensible result.

e.g. the result of `[@NO objCType]` is `@encode(char)` not `@encode(BOOL)` under XCode5
2014-01-07 14:12:08 +08:00
August Mueller 74b01bd458 Cleanup 2014-01-01 09:27:45 -08:00
Timur Islamgulov 3f8cee50c4 Fix for issue #211: Add 'databasePool:didAddDatabase:' method to FMDatabasePoolDelegate protocol 2013-12-18 21:01:32 +04:00
ccgus 3c6d3ca6e1 Notes on what's been going on. 2013-12-10 10:27:05 -08:00
ccgus 8d2dac4001 Merge branch 'master' of github.com:ccgus/fmdb into busyTimeout 2013-12-10 10:16:53 -08:00
ccgus dd7da6f0a4 Merge branch 'testcases' of git://github.com/GrahamDennis/fmdb into GrahamDennis-testcases 2013-12-10 10:05:43 -08:00
ccgus 84c19dca63 Cleanup 2013-12-10 10:01:11 -08:00
August "Gus" Mueller 4250e03227 Merge pull request #213 from 5at5ish/master
Fix for issue #203: Add 'databaseClass' class method for FMDatabaseQueue.
2013-12-10 10:00:45 -08:00
August "Gus" Mueller 4ef996a622 Merge pull request #206 from GrahamDennis/dispatch-arc-simplify
Simplify conditionals used to determine whether dispatch objects need explicit releasing.
2013-12-10 09:53:40 -08:00
Timur Islamgulov a1eb7305f8 Fix for issue #203: Add 'databaseClass' class method for FMDatabaseQueue. Subclasses can override this method to return specified Class of 'FMDatabase' subclass. 2013-12-05 15:42:38 +04:00
ccgus 2224f216e7 if DEBUG is defined, then you'll get a little more info when you've got open result sets out when using the queue. 2013-12-02 14:20:12 -08:00
Graham Dennis 1faf00c9ef Fix -[FMDatabaseTests testApplicationID]
There were compile errors in this code because I just copy/pasted it from fmdb.m without making the changes for XCTest.  It wasn't causing problems for me because I am using a version of SQLite older than the preprocessor check.
2013-11-29 15:47:24 +11:00