darlinghq/fmdb
1
0
Fork 0
mirror of https://github.com/darlinghq/fmdb.git synced 2025-02-18 20:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
394 Commits 10 Branches 19 Tags
Commit Graph

394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Ryan
f0277ac36a Fix note in executeQuery documentation 2015-01-25 00:49:18 -05:00
August Mueller
70dd7f7ee0 version bump. v2.5 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
Rob Ryan
3bee035764 Swift instructions 2014-10-13 15:07:08 -04:00
Rob Ryan
ca84a7cb7e Modified extras 
Added `FMDatabaseVariadic` Swift extension for FMDatabase.
Moved InMemoryOnDiskIO
 2014-10-13 14:14:42 -04:00
Rob Ryan
298602b44a Add Swift extension 
Added extension for variadic renditions of `executeUpdate` and `executeQuery`.
 2014-10-13 14:13:27 -04:00
Roshan Muralidharan
25f34a14f4 Adding 'nextWithError' method to FMResultSet to obtain error details 2014-10-09 13:58:57 -05:00
August "Gus" Mueller
f6f96d44bf Merge pull request #306 from nemesis/patch-1 
Bump version in README.markdown
 2014-10-03 09:48:20 -07:00
Constantin Lungu
fc10e5fe7f Removed an unneeded newline in multiple statements code block 2014-10-03 11:28:43 +03:00
Constantin Lungu
2c1e08ba27 Updated CocoaPods section of README and also trimmed whitespace 2014-10-03 11:26:17 +03:00
Costea Lungu
7c418f7e75 Bump version in README.markdown 2014-10-02 19:25:40 +03:00
August "Gus" Mueller
15b6ebbc55 Merge pull request #302 from stephanheilner/podspec_tagname 
Use correct tag version name
 2014-09-23 09:14:10 -07:00
Stephan Heilner
3fe3e499e5 Use correct tag version name 2014-09-23 09:54:39 -06:00
August "Gus" Mueller
911279324f Merge pull request #300 from stephanheilner/podspec_update 
Created separate FTS subspec which includes custom FM tokenizers
v2.4 		2014-09-19 09:10:49 -07:00
Stephan Heilner
425466da5b Instead of using + in the subspec name, created a subsubspec 2014-09-17 10:55:40 -06:00
Stephan Heilner
fc1fc94f45 Created FTS and standalone+FTS subspecs 2014-09-17 10:06:46 -06:00
Stephan Heilner
3347b1c74f Created separate FTS subspec which includes custom FM tokenizers 2014-09-16 15:55:10 -06:00
August Mueller
b2293c16a4 Moved some files around. 2014-09-10 11:08:41 -07:00
Andrew Goodale
cf9e686a8e Added FTS3 source files and tests to FMDB project. 2014-08-28 12:55:56 -06:00
Andrew Goodale
4d5ad5f819 Can now access all the offsets() integers, not just the first. 
Fixed byte position issues with custom tokenizers.
 2014-08-28 12:55:04 -06:00
Andrew Goodale
0cf527cc4a Merge remote-tracking branch 'ccgus/master' 2014-08-26 13:00:38 -06:00
August Mueller
98be50b188 pedantic 2014-08-25 09:21:12 -07:00
August Mueller
cbb9cda827 sssssh clang, it'll be alright. 2014-08-23 13:15:44 -07:00
August Mueller
e713da239b Move the CocoaPods markers down to the CocoaPods section. 2014-08-13 10:03:19 -07:00
August "Gus" Mueller
d607c84f29 Merge pull request #293 from reiz/master 
Adding 2 Badges
 2014-08-13 10:01:44 -07:00
Robert Reiz
fe739de09c Add References Badge to Readme 2014-08-11 09:30:37 +02:00
Robert Reiz
22bb96a239 Add Dependency Badge 2014-08-11 09:29:51 +02:00
August Mueller
7eeb72d77b Merge branch 'robertmryan-master' 2014-08-02 14:12:52 -07:00
Andrew Goodale
aa511210e9 Fix offsets for two-word query terms. 2014-07-31 21:15:36 -04:00