Fix the compatibility issue of missing fb_esp_rtdb_data_type values i…

…n firebase_rtdb_data_type enums.
mobizt · Sep 12, 2023 · d391140 · d391140
1 parent 504a97e
commit d391140
Show file tree

Hide file tree

Showing 41 changed files with 65 additions and 65 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase Arduino Client Library for ESP8266 and ESP32",
-  "version": "4.4.4",
+  "version": "4.4.5",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "The library supports Firebase products e.g. Realtime database, Cloud Firestore database, Firebase Storage and Google Cloud Storage, Cloud Functions for Firebase and Cloud Messaging. The library also supported other Arduino devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=Firebase Arduino Client Library for ESP8266 and ESP32
 
-version=4.4.4
+version=4.4.5
 
 author=Mobizt
 

diff --git a/src/FB_Const.h b/src/FB_Const.h
@@ -1,10 +1,10 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Created September 5, 2023
+ * Created September 12, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -186,6 +186,7 @@ enum firebase_con_mode
 
 enum firebase_data_type
 {
+    // Do not changes the order as it used by firebase_rtdb_data_type
     d_any = 0,
     d_null,
     d_integer,
@@ -205,15 +206,27 @@ enum firebase_data_type
 enum firebase_rtdb_data_type
 {
     firebase_rtdb_data_type_null = d_null,
-    firebase_rtdb_data_type_integer,
-    firebase_rtdb_data_type_float,
-    firebase_rtdb_data_type_double,
-    firebase_rtdb_data_type_boolean,
-    firebase_rtdb_data_type_string,
-    firebase_rtdb_data_type_json,
-    firebase_rtdb_data_type_array,
-    firebase_rtdb_data_type_blob,
-    firebase_rtdb_data_type_file
+    firebase_rtdb_data_type_integer = d_integer,
+    firebase_rtdb_data_type_float = d_float,
+    firebase_rtdb_data_type_double = d_double,
+    firebase_rtdb_data_type_boolean = d_boolean,
+    firebase_rtdb_data_type_string = d_string,
+    firebase_rtdb_data_type_json = d_json,
+    firebase_rtdb_data_type_array = d_array,
+    firebase_rtdb_data_type_blob = d_blob,
+    firebase_rtdb_data_type_file = d_file,
+
+    // old version compat
+    fb_esp_rtdb_data_type_null = d_null,
+    fb_esp_rtdb_data_type_integer = d_integer,
+    fb_esp_rtdb_data_type_float = d_float,
+    fb_esp_rtdb_data_type_double = d_double,
+    fb_esp_rtdb_data_type_boolean = d_boolean,
+    fb_esp_rtdb_data_type_string = d_string,
+    fb_esp_rtdb_data_type_json = d_json,
+    fb_esp_rtdb_data_type_array = d_array,
+    fb_esp_rtdb_data_type_blob = d_blob,
+    fb_esp_rtdb_data_type_file = d_file
 };
 
 enum firebase_request_method
@@ -309,20 +322,7 @@ enum firebase_rtdb_value_type
     firebase_rtdb_value_type_double = 7,
     firebase_rtdb_value_type_json = 8,
     firebase_rtdb_value_type_array = 9,
-    firebase_rtdb_value_type_blob = 10,
-
-    // old version compat
-    fb_esp_rtdb_value_type_any = 0,
-    fb_esp_rtdb_value_type_std_string = 1,
-    fb_esp_rtdb_value_type_arduino_string = 2,
-    fb_esp_rtdb_value_type_mb_string = 3,
-    fb_esp_rtdb_value_type_char_array = 4,
-    fb_esp_rtdb_value_type_int = 5,
-    fb_esp_rtdb_value_type_float = 6,
-    fb_esp_rtdb_value_type_double = 7,
-    fb_esp_rtdb_value_type_json = 8,
-    fb_esp_rtdb_value_type_array = 9,
-    fb_esp_rtdb_value_type_blob = 10
+    firebase_rtdb_value_type_blob = 10
 };
 
 enum firebase_rtdb_upload_status

diff --git a/src/FB_Error.h b/src/FB_Error.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Network.h b/src/FB_Network.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Utils.h b/src/FB_Utils.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/Firebase.cpp b/src/Firebase.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/Firebase.h b/src/Firebase.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h
@@ -1,6 +1,6 @@
 #ifndef FIREBASE_CLIENT_VERSION
 #define FIREBASE_CLIENT_VERSION "4.4.4"
-#define FIREBASE_CLIENT_VERSION_NUM 40404
+#define FIREBASE_CLIENT_VERSION_NUM 40405
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define FIREBASE_CLIENT_VERSION_CHECK(ver) (ver == FIREBASE_CLIENT_VERSION_NUM)

diff --git a/src/firestore/FB_Firestore.cpp b/src/firestore/FB_Firestore.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/firestore/FB_Firestore.h b/src/firestore/FB_Firestore.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/functions/FB_Functions.cpp b/src/functions/FB_Functions.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/functions/FB_Functions.h b/src/functions/FB_Functions.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/functions/FunctionsConfig.cpp b/src/functions/FunctionsConfig.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/functions/FunctionsConfig.h b/src/functions/FunctionsConfig.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/functions/PocicyBuilder.cpp b/src/functions/PocicyBuilder.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/functions/PolicyBuilder.h b/src/functions/PolicyBuilder.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/gcs/GCS.cpp b/src/gcs/GCS.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/gcs/GCS.h b/src/gcs/GCS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/FCM.h b/src/message/FCM.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/LFCM.h b/src/message/LFCM.h
@@ -1,6 +1,6 @@
 
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/storage/FCS.cpp b/src/storage/FCS.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/storage/FCS.h b/src/storage/FCS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40405)
 #error "Mixed versions compilation."
 #endif