Merge branch 'robertmryan-master'

CHANGES_AND_TODO_LIST.txt

@@ -3,6 +3,9 @@ Zip, nada, zilch.  Got any ideas?
 
 If you would like to contribute some code ... awesome!  I just ask that you make it conform to the coding conventions already set in here, and to add the necessary of tests for your new code to tests target.  And of course, the code should be of general use to more than just a couple of folks.  Send your patches to gus@flyingmeat.com.
 
+2020.03.25 Version 2.7.8
+    Add `valueForColumn` functions to expose `sqlite3_column_type`. Add comments to `dataForColumn` re SQL behavior of zero-length BLOBs.
+
 2020.05.06 Version 2.7.7
     Add `prepare` and `bind` methods so you can prepare a statement once and bind values repeatedly.
 

FMDB.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'FMDB'
-  s.version = '2.7.7'
+  s.version = '2.7.8'
   s.summary = 'A Cocoa / Objective-C wrapper around SQLite.'
   s.homepage = 'https://github.com/ccgus/fmdb'
   s.license = 'MIT'

README.markdown

@@ -78,7 +78,7 @@ Declare FMDB as a package dependency.
 .package(
     name: "FMDB", 
     url: "https://github.com/ccgus/fmdb", 
-    .upToNextMinor(from: "2.7.7")),
+    .upToNextMinor(from: "2.7.8")),
 ```
 
 Use FMDB in target dependencies

Tests/FMDatabaseTests.m

@@ -1123,12 +1123,16 @@ - (void)createCustomFunctions {
 
 }
 
-- (void)testVersionNumber {
-    XCTAssertEqual([FMDatabase FMDBVersion], 0x0277); // this is going to break everytime we bump it.
-}
+/* This is deprecated, and as such, should be excluded from tests
+ *
+ * - (void)testVersionNumber {
+ *     XCTAssertEqual([FMDatabase FMDBVersion], 0x0278); // this is going to break every time we bump it.
+ * }
+  *
+ */
 
 - (void)testUserVersion {
-    NSComparisonResult result = [[FMDatabase FMDBUserVersion] compare:@"2.7.7" options:NSNumericSearch];
+    NSComparisonResult result = [[FMDatabase FMDBUserVersion] compare:@"2.7.8" options:NSNumericSearch];
     XCTAssertEqual(result, NSOrderedSame);
 }
 

Tests/FMResultSetTests.m

@@ -8,7 +8,6 @@
 
 #import "FMDBTempDBTests.h"
 #import "FMDatabase.h"
-#import "FMResultSet.h"
 
 #if FMDB_SQLITE_STANDALONE
 #import <sqlite3/sqlite3.h>
@@ -93,4 +92,40 @@ - (void)testNextWithError_WithMisuseError
     XCTAssertEqual(error.code, SQLITE_MISUSE, @"SQLITE_MISUSE should be the last error");
 }
 
+- (void)testColumnTypes
+{
+    [self.db executeUpdate:@"CREATE TABLE testTable (intValue INTEGER, floatValue FLOAT, textValue TEXT, blobValue BLOB)"];
+    NSString *sql = @"INSERT INTO testTable (intValue, floatValue, textValue, blobValue) VALUES (?, ?, ?, ?)";
+    NSError *error;
+    NSData *data = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
+    NSData *zeroLengthData = [NSData data];
+    NSNull *null = [NSNull null];
+    [self.db executeUpdate:sql values:@[@42, @M_PI, @"test", data] error:&error];
+    [self.db executeUpdate:sql values:@[null, null, null, null] error:&error];
+    [self.db executeUpdate:sql values:@[null, null, null, zeroLengthData] error:&error];
+
+    FMResultSet *resultSet = [self.db executeQuery:@"SELECT * FROM testTable"];
+    XCTAssertNotNil(resultSet);
+
+    XCTAssertTrue([resultSet next]);
+    XCTAssertEqual([resultSet typeForColumn:@"intValue"],   SqliteValueTypeInteger);
+    XCTAssertEqual([resultSet typeForColumn:@"floatValue"], SqliteValueTypeFloat);
+    XCTAssertEqual([resultSet typeForColumn:@"textValue"],  SqliteValueTypeText);
+    XCTAssertEqual([resultSet typeForColumn:@"blobValue"],  SqliteValueTypeBlob);
+    XCTAssertNotNil([resultSet dataForColumn:@"blobValue"]);
+
+    XCTAssertTrue([resultSet next]);
+    XCTAssertEqual([resultSet typeForColumn:@"intValue"],   SqliteValueTypeNull);
+    XCTAssertEqual([resultSet typeForColumn:@"floatValue"], SqliteValueTypeNull);
+    XCTAssertEqual([resultSet typeForColumn:@"textValue"],  SqliteValueTypeNull);
+    XCTAssertEqual([resultSet typeForColumn:@"blobValue"],  SqliteValueTypeNull);
+    XCTAssertNil([resultSet dataForColumn:@"blobValue"]);
+
+    XCTAssertTrue([resultSet next]);
+    XCTAssertEqual([resultSet typeForColumn:@"blobValue"],  SqliteValueTypeBlob);
+    XCTAssertNil([resultSet dataForColumn:@"blobValue"]);
+
+    [resultSet close];
+}
+
 @end

fmdb.xcodeproj/project.pbxproj

@@ -606,7 +606,7 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1240;
 				TargetAttributes = {
 					83C73EFD1C326AB000FFC730 = {
 						CreatedOnToolsVersion = 7.2;
@@ -1106,6 +1106,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 2.7.8;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.flyingmeat.FMDB-iOS";
 				PRODUCT_NAME = FMDB;
@@ -1147,6 +1148,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 2.7.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.flyingmeat.FMDB-iOS";
 				PRODUCT_NAME = FMDB;

fmdb.xcodeproj/xcshareddata/xcschemes/FMDB MacOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

fmdb.xcodeproj/xcshareddata/xcschemes/FMDB iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

fmdb.xcodeproj/xcshareddata/xcschemes/FMDB watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1140"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,15 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "83C73EFD1C326AB000FFC730"
-            BuildableName = "FMDB.framework"
-            BlueprintName = "FMDB iOS"
-            ReferencedContainer = "container:fmdb.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <Testables>
       </Testables>
    </TestAction>

src/fmdb/FMDatabase.h

@@ -1123,7 +1123,7 @@ func executeUpdate(sql: String, values: [Any]?) throws -> Bool { }
 
 + (NSString*)sqliteLibVersion;
 
-/// The FMDB version number as a string in the form of @c "2.7.7" .
+/// The FMDB version number as a string in the form of @c "2.7.8" .
 ///
 /// If you want to compare version number strings, you can use NSNumericSearch option:
 ///
@@ -1194,14 +1194,6 @@ NSAssert(rs, @"Error %@", [db lastErrorMessage]);
 
 - (void)makeFunctionNamed:(NSString *)name maximumArguments:(int)count withBlock:(void (^)(void *context, int argc, void * _Nonnull * _Nonnull argv))block __deprecated_msg("Use makeFunctionNamed:arguments:block:");
 
-typedef NS_ENUM(int, SqliteValueType) {
-    SqliteValueTypeInteger = 1,
-    SqliteValueTypeFloat   = 2,
-    SqliteValueTypeText    = 3,
-    SqliteValueTypeBlob    = 4,
-    SqliteValueTypeNull    = 5
-};
-
 - (SqliteValueType)valueType:(void *)argv;
 
 /**

src/fmdb/FMDatabase.m

@@ -112,7 +112,7 @@ - (NSURL *)databaseURL {
 }
 
 + (NSString*)FMDBUserVersion {
-    return @"2.7.7";
+    return @"2.7.8";
 }
 
 + (SInt32)FMDBVersion {

src/fmdb/FMResultSet.h

@@ -17,6 +17,16 @@ NS_ASSUME_NONNULL_BEGIN
 @class FMDatabase;
 @class FMStatement;
 
+/** Types for columns in a result set.
+ */
+typedef NS_ENUM(int, SqliteValueType) {
+    SqliteValueTypeInteger = 1,
+    SqliteValueTypeFloat   = 2,
+    SqliteValueTypeText    = 3,
+    SqliteValueTypeBlob    = 4,
+    SqliteValueTypeNull    = 5
+};
+
 /** Represents the results of executing a query on an @c FMDatabase .
  
  See also
@@ -304,6 +314,9 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param columnIdx Zero-based index for column.
 
+ @warning For zero length BLOBs, this will return `nil`. Use `typeForColumn` to determine whether this was really a zero
+    length BLOB or `NULL`.
+
  @return Data value of the result set's column.
  */
 
@@ -313,6 +326,9 @@ NS_ASSUME_NONNULL_BEGIN
 
  @param columnName @c NSString  value of the name of the column.
 
+ @warning For zero length BLOBs, this will return `nil`. Use `typeForColumnIndex` to determine whether this was really a zero
+ length BLOB or `NULL`.
+
  @return `(const unsigned char *)` value of the result set's column.
  */
 
@@ -342,6 +358,25 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (id _Nullable)objectForColumnName:(NSString*)columnName __deprecated_msg("Use objectForColumn instead");
 
+/** Column type by column name.
+
+ @param columnName Name of the column.
+
+ @return The `SqliteValueType` of the value in this column.
+ */
+
+- (SqliteValueType)typeForColumn:(NSString*)columnName;
+
+/** Column type by column index.
+
+ @param columnIdx Index of the column.
+
+ @return The `SqliteValueType` of the value in this column.
+ */
+
+- (SqliteValueType)typeForColumnIndex:(int)columnIdx;
+
+
 /** Result set object for column.
 
  @param columnIdx Zero-based index for column.

src/fmdb/FMResultSet.m

@@ -432,6 +432,14 @@ - (id)objectForColumn:(NSString*)columnName {
     return [self objectForColumnIndex:[self columnIndexForName:columnName]];
 }
 
+- (SqliteValueType)typeForColumn:(NSString*)columnName {
+    return sqlite3_column_type([_statement statement], [self columnIndexForName:columnName]);
+}
+
+- (SqliteValueType)typeForColumnIndex:(int)columnIdx {
+    return sqlite3_column_type([_statement statement], columnIdx);
+}
+
 // returns autoreleased NSString containing the name of the column in the result set
 - (NSString*)columnNameForIndex:(int)columnIdx {
     return [NSString stringWithUTF8String: sqlite3_column_name([_statement statement], columnIdx)];

src/fmdb/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.7</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

src/sample/main.m

@@ -302,7 +302,8 @@ int main (int argc, const char * argv[]) {
     [db executeUpdate:@"create table blobTable (a text, b blob)"];
     
     // let's read in an image from safari's app bundle.
-    NSData *safariCompass = [NSData dataWithContentsOfFile:@"/Applications/Safari.app/Contents/Resources/compass.icns"];
+    NSData *safariCompass = [NSData dataWithContentsOfFile:@"/Applications/Safari.app/Contents/Resources/AppIcon.icns"];
+    assert(safariCompass);
     if (safariCompass) {
         [db executeUpdate:@"insert into blobTable (a, b) values (?,?)", @"safari's compass", safariCompass];
         
@@ -543,7 +544,8 @@ int main (int argc, const char * argv[]) {
     [db executeUpdate:@"create table nulltest2 (s text, d data, i integer, f double, b integer)"];
     
     // grab the data for this again, since we overwrote it with some memory that has since disapeared.
-    safariCompass = [NSData dataWithContentsOfFile:@"/Applications/Safari.app/Contents/Resources/compass.icns"];
+    safariCompass = [NSData dataWithContentsOfFile:@"/Applications/Safari.app/Contents/Resources/AppIcon.icns"];
+    assert(safariCompass);
     
     [db executeUpdate:@"insert into nulltest2 (s, d, i, f, b) values (?, ?, ?, ?, ?)" , @"Hi", safariCompass, [NSNumber numberWithInt:12], [NSNumber numberWithFloat:4.4f], [NSNumber numberWithBool:YES]];
     [db executeUpdate:@"insert into nulltest2 (s, d, i, f, b) values (?, ?, ?, ?, ?)" , nil, nil, nil, nil, [NSNull null]];