Commit Graph

570 Commits

Author SHA1 Message Date
August "Gus" Mueller
522bfe06c7 Merge pull request #395 from ccgus/revert-394-framework
Revert "Framework branch"
2015-08-03 12:11:41 -07:00
August "Gus" Mueller
5eeda4f0b5 Revert "Framework branch" 2015-08-03 12:11:28 -07:00
August "Gus" Mueller
15c5966bd9 Merge pull request #394 from robertmryan/framework
Framework branch
2015-08-03 12:08:45 -07:00
Robert M. Ryan
66e492a6de Fix version number checks
I missed a few `SQLITE_VERSION_NUMBER` checks in the headers
2015-08-02 13:28:59 -04:00
Robert M. Ryan
972db9c9fa Fix code sample in framework discussion 2015-08-02 13:15:48 -04:00
Robert M. Ryan
09a6985054 README framework 2015-08-02 13:13:40 -04:00
Robert M. Ryan
dc937d3c64 README include framework discussion 2015-08-02 13:12:19 -04:00
Robert M. Ryan
fa010c9546 Update README with framework comment 2015-08-02 13:11:08 -04:00
Robert M. Ryan
11f6701599 Modified to support using framework
To use FMDB in framework, one should eliminate all non-modular headers. The main culprit here is `#import <sqlite3.h>`. The thing is, FMDB uses SQLite types and constants in these headers, so they had to be removed.

1. Removed `#import <sqlite3.h>` from all of the headers.

2. Moved `sqlite3` and `sqlite3_stmt` declarations in `FMDatabase.h` into `FMDatabasePrivate.h`. FMDB source that needs these will now `#import "FMDatabasePrivate.h" and will have access to them.

3. Removed `#if SQLITE_VERSION_NUMBER >= xxx` logic from the headers.

4. `lastInsertRowId` now returns `long long int`, not `sqlite3_int64`.

5. `sqliteHandle` now returns `void *` not `sqlite3 *`.

6. The `savepoint` and `release savepoint` and `rollback` now always compile regardless of SQLite version (but you'll get SQLite errors if you try those commands with earlier SQLite versions).

7. `makeFunctionNamed` has changed the block parameter type.

8. The FMDatabaseAdditions routines for `applicationID`, much like the `savepoint` routines, will be compiled regardless of SQLite version.

9. Some random usage of deferencing ivars from another class have been replaced with accessor methods.

Note, with all of these changes, in order to conform to modular headers, this is not entirely backward compatible. They'll have to make changes if

 - If they referenced the `_db` variable themselves (which they shouldn't be doing anyway; this never should have been in the public interface to start with);

 - If they referenced `_statement` variable of `FMStatement` (which is even less likely); or

 - If they used `makeFunctionNamed`, the signature of the block has changed (now uses `void` instead of SQLite types).

See issue https://github.com/ccgus/fmdb/issues/309.
2015-08-02 12:42:26 -04:00
Clemens Gruber
9556e236cb Replace deprecated unicode61 dependency and rephrase comments
The unicode61 tokenizer is now enabled by default and the corresponding build
option is no longer available. FMDB/standaone should depend on sqlite3/fts.
I also updated the comment to emphasize that the most recent stable version of
SQLite is built if the standalone subspec is selected, not a custom prebuilt
version.

Btw.: I am the sqlite3 podspec maintainer and am trying to keep the sqlite3 pod
as close to the official stable release schedule as possible: Delay < a few days

Signed-off-by: Clemens Gruber <clemensgru@gmail.com>
2015-08-02 16:58:54 +02:00
August Mueller
1b346b5271 Merge branch 'Sigmanet15-master' 2015-07-01 09:18:58 -07:00
Jonathan Gander
efdf7c5679 Syntax 2015-06-30 08:00:21 +02:00
Jonathan Gander
1ec55086cd Check block parameter after Facebook Infer analyze 2015-06-26 14:03:40 +02:00
August Mueller
1a30bddb8b Merge branch 'sechel-master' 2015-06-17 09:55:12 -07:00
August Mueller
d0c9dafb9f Merge branch 'master' of git://github.com/sechel/fmdb into sechel-master 2015-06-17 09:52:17 -07:00
August "Gus" Mueller
12ac4595bc Merge pull request #384 from thelastjedi/readme-patch-1
Added syntax highlighting in README
2015-06-17 09:45:39 -07:00
Harshita Chandra
4b827e35c0 add syntax highlighting
syntax highlight objective-c, swift and sql code snippets
2015-06-12 21:36:47 +05:30
Stefan Sechelmann
ca28671462 rename open with vfs method, add tests for custom vfs 2015-06-10 16:12:11 +02:00
Stefan Sechelmann
fac5f64ad9 create shared Test scheme 2015-06-10 15:12:42 +02:00
Stefan Sechelmann
ef9effb944 add database open with VSF virtual file system 2015-05-31 22:34:24 +02:00
August Mueller
c4d0ae7bd6 Swift 1.2 stuff. 2015-05-04 10:32:21 -07:00
August "Gus" Mueller
47a544bb8d Merge pull request #352 from harukizaemon/patch-1
Update FMDatabase.m to fix implicit signedness conversion
2015-04-03 09:38:22 -07:00
August "Gus" Mueller
424c6afedf Merge pull request #355 from jeffreyjackson/patch-1
Update README.markdown
2015-04-01 15:25:29 -07:00
Jeffrey Jackson
219534088c Update README.markdown 2015-04-01 16:20:32 -04:00
Simon Harris
fc7805386e Update FMDatabase.m
Fix warning: Implicit conversion changes signedness: 'unsigned int' to 'int'
2015-03-23 23:26:06 +11:00
August "Gus" Mueller
d5d8188592 Merge pull request #339 from robertmryan/master
Fix note in executeQuery documentation
2015-01-25 13:49:25 -08:00
Rob Ryan
f0277ac36a Fix note in executeQuery documentation 2015-01-25 00:49:18 -05:00
August Mueller
70dd7f7ee0 version bump. 2015-01-24 10:24:55 -08:00
August "Gus" Mueller
11ef325ad7 Merge pull request #335 from stephanheilner/new_tag
Updated podspec version to prepare for v2.5 tag
2015-01-24 10:23:47 -08:00
August Mueller
4eda6c75c4 Weird merge from robertmryan-master 2015-01-24 10:22:03 -08:00
Stephan Heilner
ebdeb879d6 Updated tag version 2015-01-22 14:13:14 -07:00
August Mueller
f199971b90 Cleanup. 2015-01-22 10:56:06 -08:00
August Mueller
48c333a82f Merge branch 'module_name' of git://github.com/stephanheilner/fmdb into stephanheilner-module_name 2015-01-22 10:49:33 -08:00
Stephan Heilner
52371b07bb Added tests for FTS change 2015-01-22 11:35:01 -07:00
August Mueller
87ae93c40d Merge branch 'module_name' of git://github.com/stephanheilner/fmdb into stephanheilner-module_name 2015-01-21 09:41:05 -08:00
August "Gus" Mueller
0148b72dfb Merge pull request #333 from clemensg/correct_fmdb_version
Correct reported FMDB version
2015-01-19 12:24:37 -08:00
Clemens Gruber
03ded1ed13 Correct reported FMDB version
Signed-off-by: Clemens Gruber <clemensgru@gmail.com>
2015-01-17 14:27:10 +01:00
Stephan Heilner
a8df75e87c Don't force custom tokenizer module name 2015-01-14 10:21:50 -07:00
August Mueller
6c20e62a0a Quick fix, thanks to @kangchuh 2015-01-12 21:13:29 -08:00
August Mueller
30e3f5b794 Merge branch 'ChristianKienle-master' 2014-12-30 10:01:52 -08:00
Christian Kienle
7e88c5ca20 Fixes wrong handling of sqlite3_column_bytes(...).
According to the official documentation of SQLite the order in which you call sqlite3_column_bytes and sqlite3_column_blob (and the related methods to retrieve the stored value) is important:

"In other words, you should call sqlite3_column_text(), sqlite3_column_blob(), or sqlite3_column_text16() first to force the result into the desired format, then invoke sqlite3_column_bytes() or sqlite3_column_bytes16() to find the size of the result. Do not mix calls to sqlite3_column_text() or sqlite3_column_blob() with calls to sqlite3_column_bytes16(), and do not mix calls to sqlite3_column_text16() with calls to sqlite3_column_bytes()."

This commit simply changes the order of those calls to conform to the official documentation.
2014-12-29 14:40:50 +01:00
August "Gus" Mueller
3d0bbdd679 Merge pull request #323 from layerhq/enhancement/jitter-in-busy-handler
Add jitter to SQLite Busy handler
2014-12-17 15:21:20 -08:00
Blake Watters
0a3a23322f Add jitter to SQLite Busy handler 2014-12-16 16:28:11 -08:00
August Mueller
e41c62f7fa Removed some inaccuracies from the docs. 2014-10-28 09:19:19 -07:00
August Mueller
79679e59bb Updated license. 2014-10-19 20:17:06 -07:00
August Mueller
dca59f3c3b Merge branch 'rosh89-FMResultSet_Next_Error_Handling' 2014-10-19 14:35:52 -07:00
August Mueller
a2db0af530 Cleanup and sdk fixes. 2014-10-19 14:35:42 -07:00
August Mueller
aa8fd46a6c Merge branch 'FMResultSet_Next_Error_Handling' of git://github.com/rosh89/fmdb into rosh89-FMResultSet_Next_Error_Handling 2014-10-19 14:30:35 -07:00
August Mueller
7b9b840715 Fix for Xcode 6.1 2014-10-14 11:24:56 -07:00
August "Gus" Mueller
ccb994dfab Merge pull request #311 from robertmryan/master
Added variadic rendition for `executeUpdate` and `executeQuery` for Swift as "extra"
2014-10-14 11:19:11 -07:00