Changed enum type SqliteValueType to OPTLYSqliteValueType (#271)

* changed enum type SqliteValueType to OPTLYSqliteValueType

* Copyright headers updated

Author: arafay-folio3

OptimizelySDKShared/OPTLYFMDB/src/optlyfmdb/OPTLYFMDBDatabase.h

@@ -1,6 +1,6 @@
 /****************************************************************************
  * Modifications to FMDB by Optimizely, Inc.                                *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -1039,12 +1039,12 @@ typedef int(^OPTLYFMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDicti
  For example:
  
     [db makeFunctionNamed:@"RemoveDiacritics" arguments:1 block:^(void *context, int argc, void **argv) {
-        SqliteValueType type = [self.db valueType:argv[0]];
-        if (type == SqliteValueTypeNull) {
+        OPTLYSqliteValueType type = [self.db valueType:argv[0]];
+        if (type == OPTLYSqliteValueTypeNull) {
             [self.db resultNullInContext:context];
              return;
         }
-        if (type != SqliteValueTypeText) {
+        if (type != OPTLYSqliteValueTypeText) {
             [self.db resultError:@"Expected text" context:context];
             return;
         }
@@ -1069,15 +1069,15 @@ typedef int(^OPTLYFMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDicti
 
 - (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
+typedef NS_ENUM(int, OPTLYSqliteValueType) {
+    OPTLYSqliteValueTypeInteger = 1,
+    OPTLYSqliteValueTypeFloat   = 2,
+    OPTLYSqliteValueTypeText    = 3,
+    OPTLYSqliteValueTypeBlob    = 4,
+    OPTLYSqliteValueTypeNull    = 5
 };
 
-- (SqliteValueType)valueType:(void *)argv;
+- (OPTLYSqliteValueType)valueType:(void *)argv;
 
 /**
  Get integer value of parameter in custom function.

OptimizelySDKShared/OPTLYFMDB/src/optlyfmdb/OPTLYFMDBDatabase.m

@@ -1,6 +1,6 @@
 /****************************************************************************
  * Modifications to FMDB by Optimizely, Inc.                                *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -1502,7 +1502,7 @@ - (void)makeFunctionNamed:(NSString *)name arguments:(int)arguments block:(void
 #endif
 }
 
-- (SqliteValueType)valueType:(void *)value {
+- (OPTLYSqliteValueType)valueType:(void *)value {
     return sqlite3_value_type(value);
 }
 

OptimizelySDKShared/OPTLYFMDBTests/OPTLYFMDBDatabaseTests.m

@@ -7,7 +7,7 @@
 //
 /****************************************************************************
  * Modifications to FMDB by Optimizely, Inc.                                *
- * Copyright 2017, Optimizely, Inc. and contributors                        *
+ * Copyright 2018, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -1098,12 +1098,12 @@ - (void)testCustomFunctionNoMemoryErrorResult {
 
 - (void)createCustomFunctions {
     [self.db makeFunctionNamed:@"RemoveDiacritics" arguments:1 block:^(void *context, int argc, void **argv) {
-        SqliteValueType type = [self.db valueType:argv[0]];
-        if (type == SqliteValueTypeNull) {
+        OPTLYSqliteValueType type = [self.db valueType:argv[0]];
+        if (type == OPTLYSqliteValueTypeNull) {
             [self.db resultNullInContext:context];
             return;
         }
-        if (type != SqliteValueTypeText) {
+        if (type != OPTLYSqliteValueTypeText) {
             [self.db resultError:@"Expected text" context:context];
             return;
         }
@@ -1113,9 +1113,9 @@ - (void)createCustomFunctions {
     }];
 
     [self.db makeFunctionNamed:@"Hypotenuse" arguments:2 block:^(void *context, int argc, void **argv) {
-        SqliteValueType type1 = [self.db valueType:argv[0]];
-        SqliteValueType type2 = [self.db valueType:argv[1]];
-        if (type1 != SqliteValueTypeFloat && type1 != SqliteValueTypeInteger && type2 != SqliteValueTypeFloat && type2 != SqliteValueTypeInteger) {
+        OPTLYSqliteValueType type1 = [self.db valueType:argv[0]];
+        OPTLYSqliteValueType type2 = [self.db valueType:argv[1]];
+        if (type1 != OPTLYSqliteValueTypeFloat && type1 != OPTLYSqliteValueTypeInteger && type2 != OPTLYSqliteValueTypeFloat && type2 != OPTLYSqliteValueTypeInteger) {
             [self.db resultError:@"Expected numeric" context:context];
             return;
         }
@@ -1125,8 +1125,8 @@ - (void)createCustomFunctions {
     }];
 
     [self.db makeFunctionNamed:@"SetAlternatingByteToOne" arguments:1 block:^(void *context, int argc, void **argv) {
-        SqliteValueType type = [self.db valueType:argv[0]];
-        if (type != SqliteValueTypeBlob) {
+        OPTLYSqliteValueType type = [self.db valueType:argv[0]];
+        if (type != OPTLYSqliteValueTypeBlob) {
             [self.db resultError:@"Expected blob" context:context];
             return;
         }