Permalink
Commits on Nov 19, 2015
  1. Merge pull request #431 from johngoren/patch-1

    Fixed typo
    ccgus committed Nov 19, 2015
  2. Fixed typo

    johngoren committed Nov 19, 2015
Commits on Nov 10, 2015
Commits on Nov 5, 2015
  1. Merge pull request #426 from NextThought/inclusion-via-project

    Project file updates to support inclusion of FMDB via including the project in a workspace.
    ccgus committed Nov 5, 2015
  2. Merge pull request #427 from frankenbot/master

    Update redirects
    ccgus committed Nov 5, 2015
  3. Update redirects

    ReadmeCritic committed Nov 5, 2015
Commits on Nov 1, 2015
  1. add copy headers step for FMDB-IOS target. And expose core headers fo…

    …r the FMDB and FMDB-IOS static lib targets
    cutz committed Nov 1, 2015
Commits on Oct 30, 2015
  1. Add renditions of executeQuery and executeUpdate that throw errors in…

    … Swift
    
    These renditions are `executeQuery:values:error:` and `executeUpdate:values:error:`.
    
    Updated README, which has Swift 2 example, accordingly.
    robertmryan committed Oct 30, 2015
Commits on Oct 28, 2015
  1. Merge pull request #419 from Fjohn666/patch-1

    swift framework compatibility when using FTS 3
    ccgus committed Oct 28, 2015
  2. Merge pull request #418 from everettjf/master

    Added HAVE_USLEEP=1 to fmdb/SQLCipher
    ccgus committed Oct 28, 2015
Commits on Oct 27, 2015
  1. Merge pull request #423 from robertmryan/master

    Update Swift comments
    ccgus committed Oct 27, 2015
  2. Update Swift comments

    Update comments to conform to new markup syntax in Swift 2.
    robertmryan committed Oct 27, 2015
Commits on Oct 26, 2015
  1. Merge pull request #421 from robertmryan/master

    Updated README for Swift 2 changes
    ccgus committed Oct 26, 2015
Commits on Oct 23, 2015
  1. Update README

    Replace `println` with `print`
    robertmryan committed Oct 23, 2015
  2. Update README

    Fix Swift code sample so that it doesn't try to do `stringByAppendingPathComponent` on `String` object (because that method no longer exists). You can use `NSString` or shift to use `NSURL` pattern as suggested here.
    robertmryan committed Oct 23, 2015
  3. swift framwork module compatibility

    added this inclusion to be compatible with swift module
    Fjohn666 committed Oct 23, 2015
  4. swift framwork module compatibility

    remove this include to be compatible with swift framework in pods
    Fjohn666 committed Oct 23, 2015
Commits on Oct 21, 2015
  1. add HAVE_USLEEP=1 to fmdb/SQLCipher

    for the warning in line 237 of FMDatabase.m:
    
     int requestedSleepInMillseconds = arc4random_uniform(50) + 50;
            int actualSleepInMilliseconds =
    sqlite3_sleep(requestedSleepInMillseconds);
            if (actualSleepInMilliseconds != requestedSleepInMillseconds) {
                NSLog(@"WARNING: Requested sleep of %i milliseconds, but
    SQLite returned %i. Maybe SQLite wasn't built with HAVE_USLEEP=1?",
    requestedSleepInMillseconds, actualSleepInMilliseconds);
            }
            return 1;
    everettjf committed Oct 21, 2015
Commits on Oct 9, 2015
  1. Merge branch 'skylarsch-master'

    ccgus committed Oct 9, 2015
Commits on Oct 2, 2015
  1. Compiler warning cleanup for extra flags.

    If FMDB is embedded in a project with the `-Wall` & `-Wextra` ‘Other warning flags’ enabled the unused parameters in these methods and the extra semicolon raise warnings at build time.
    skylarsch committed Oct 2, 2015
Commits on Aug 19, 2015
  1. Merge pull request #399 from evands/fts3_tokenizer_test_improvement

    Added tokenization test
    ccgus committed Aug 19, 2015
  2. Added tests for a simple tokenizer which shortens some strings (by re…

    …moving plurals). This test fails prior to [2c34277] and now passes.
    Evan D. Schoenberg, M.D committed Aug 19, 2015
  3. Merge pull request #398 from evands/fix-fts3-tokenization-isolated

    Fix custom tokenizers in FTS3
    ccgus committed Aug 19, 2015
Commits on Aug 17, 2015
  1. Fix tokenization in FTS3 if the tokenizer shortens the input (as most…

    … tokenizers do).
    Evan D. Schoenberg, M.D committed Aug 17, 2015
Commits on Aug 12, 2015
  1. Merge pull request #393 from clemensg/fmdb_podspec

    Replace deprecated unicode61 dependency and improve comments
    ccgus committed Aug 12, 2015
Commits on Aug 3, 2015
  1. Merge pull request #395 from ccgus/revert-394-framework

    Revert "Framework branch"
    ccgus committed Aug 3, 2015
  2. Revert "Framework branch"

    ccgus committed Aug 3, 2015
  3. Merge pull request #394 from robertmryan/framework

    Framework branch
    ccgus committed Aug 3, 2015
Commits on Aug 2, 2015
  1. Fix version number checks

    I missed a few `SQLITE_VERSION_NUMBER` checks in the headers
    robertmryan committed Aug 2, 2015
  2. README framework

    robertmryan committed Aug 2, 2015
  3. 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 ccgus#309.
    robertmryan committed Aug 2, 2015