Merge remote-tracking branch 'origin/master' into rsgowman/protobuf_cpp

Also "fixed" BadFieldValueTagWithOtherValidTagsPresent test by changing
'false' to 'true'. Details: Depending on the version of nanopb, nanopb
would explicitly encode 'false', which shouldn't be done in proto3. When
it's explicitly encoded, the test worked properly. But when it was
(properly) dropped, the invalid tag is the only field that's actually
encoded, thus violating the assumptions of the test, leading to a test
failure. s/false/true fixes it, as now the boolean_value field is
(properly) encoded regardless of version.

1 files changed, 241 insertions, 0 deletions

diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/query.nanopb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/query.nanopb.h
new file mode 100644
index 0000000..68ac2a5
--- /dev/null
+++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/query.nanopb.h
@@ -0,0 +1,241 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.3.8 at Fri Jun  1 18:36:44 2018. */
+
+#ifndef PB_GOOGLE_FIRESTORE_V1BETA1_QUERY_PB_H_INCLUDED
+#define PB_GOOGLE_FIRESTORE_V1BETA1_QUERY_PB_H_INCLUDED
+#include <pb.h>
+
+#include "google/api/annotations.nanopb.h"
+
+#include "google/firestore/v1beta1/document.nanopb.h"
+
+#include "google/protobuf/wrappers.nanopb.h"
+
+/* @@protoc_insertion_point(includes) */
+#if PB_PROTO_HEADER_VERSION != 30
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Enum definitions */
+typedef enum _google_firestore_v1beta1_StructuredQuery_Direction {
+    google_firestore_v1beta1_StructuredQuery_Direction_DIRECTION_UNSPECIFIED = 0,
+    google_firestore_v1beta1_StructuredQuery_Direction_ASCENDING = 1,
+    google_firestore_v1beta1_StructuredQuery_Direction_DESCENDING = 2
+} google_firestore_v1beta1_StructuredQuery_Direction;
+#define _google_firestore_v1beta1_StructuredQuery_Direction_MIN google_firestore_v1beta1_StructuredQuery_Direction_DIRECTION_UNSPECIFIED
+#define _google_firestore_v1beta1_StructuredQuery_Direction_MAX google_firestore_v1beta1_StructuredQuery_Direction_DESCENDING
+#define _google_firestore_v1beta1_StructuredQuery_Direction_ARRAYSIZE ((google_firestore_v1beta1_StructuredQuery_Direction)(google_firestore_v1beta1_StructuredQuery_Direction_DESCENDING+1))
+
+typedef enum _google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator {
+    google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_OPERATOR_UNSPECIFIED = 0,
+    google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_AND = 1
+} google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator;
+#define _google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_MIN google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_OPERATOR_UNSPECIFIED
+#define _google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_MAX google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_AND
+#define _google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_ARRAYSIZE ((google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator)(google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_AND+1))
+
+typedef enum _google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator {
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_OPERATOR_UNSPECIFIED = 0,
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_LESS_THAN = 1,
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_LESS_THAN_OR_EQUAL = 2,
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_GREATER_THAN = 3,
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_GREATER_THAN_OR_EQUAL = 4,
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_EQUAL = 5,
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_ARRAY_CONTAINS = 7
+} google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator;
+#define _google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_MIN google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_OPERATOR_UNSPECIFIED
+#define _google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_MAX google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_ARRAY_CONTAINS
+#define _google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_ARRAYSIZE ((google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator)(google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_ARRAY_CONTAINS+1))
+
+typedef enum _google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator {
+    google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_OPERATOR_UNSPECIFIED = 0,
+    google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_IS_NAN = 2,
+    google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_IS_NULL = 3
+} google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator;
+#define _google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_MIN google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_OPERATOR_UNSPECIFIED
+#define _google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_MAX google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_IS_NULL
+#define _google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_ARRAYSIZE ((google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator)(google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_IS_NULL+1))
+
+/* Struct definitions */
+typedef struct _google_firestore_v1beta1_StructuredQuery_FieldReference {
+    pb_callback_t field_path;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_FieldReference) */
+} google_firestore_v1beta1_StructuredQuery_FieldReference;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_Projection {
+    pb_callback_t fields;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_Projection) */
+} google_firestore_v1beta1_StructuredQuery_Projection;
+
+typedef struct _google_firestore_v1beta1_Cursor {
+    pb_callback_t values;
+    bool before;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_Cursor) */
+} google_firestore_v1beta1_Cursor;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_CollectionSelector {
+    pb_callback_t collection_id;
+    bool all_descendants;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_CollectionSelector) */
+} google_firestore_v1beta1_StructuredQuery_CollectionSelector;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_CompositeFilter {
+    google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator op;
+    pb_callback_t filters;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_CompositeFilter) */
+} google_firestore_v1beta1_StructuredQuery_CompositeFilter;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_FieldFilter {
+    google_firestore_v1beta1_StructuredQuery_FieldReference field;
+    google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator op;
+    google_firestore_v1beta1_Value value;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_FieldFilter) */
+} google_firestore_v1beta1_StructuredQuery_FieldFilter;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_Order {
+    google_firestore_v1beta1_StructuredQuery_FieldReference field;
+    google_firestore_v1beta1_StructuredQuery_Direction direction;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_Order) */
+} google_firestore_v1beta1_StructuredQuery_Order;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_UnaryFilter {
+    google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator op;
+    pb_size_t which_operand_type;
+    union {
+        google_firestore_v1beta1_StructuredQuery_FieldReference field;
+    } operand_type;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_UnaryFilter) */
+} google_firestore_v1beta1_StructuredQuery_UnaryFilter;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery_Filter {
+    pb_size_t which_filter_type;
+    union {
+        google_firestore_v1beta1_StructuredQuery_CompositeFilter composite_filter;
+        google_firestore_v1beta1_StructuredQuery_FieldFilter field_filter;
+        google_firestore_v1beta1_StructuredQuery_UnaryFilter unary_filter;
+    } filter_type;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery_Filter) */
+} google_firestore_v1beta1_StructuredQuery_Filter;
+
+typedef struct _google_firestore_v1beta1_StructuredQuery {
+    google_firestore_v1beta1_StructuredQuery_Projection select;
+    pb_callback_t from;
+    google_firestore_v1beta1_StructuredQuery_Filter where;
+    pb_callback_t order_by;
+    google_protobuf_Int32Value limit;
+    int32_t offset;
+    google_firestore_v1beta1_Cursor start_at;
+    google_firestore_v1beta1_Cursor end_at;
+/* @@protoc_insertion_point(struct:google_firestore_v1beta1_StructuredQuery) */
+} google_firestore_v1beta1_StructuredQuery;
+
+/* Default values for struct fields */
+
+/* Initializer values for message structs */
+#define google_firestore_v1beta1_StructuredQuery_init_default {google_firestore_v1beta1_StructuredQuery_Projection_init_default, {{NULL}, NULL}, google_firestore_v1beta1_StructuredQuery_Filter_init_default, {{NULL}, NULL}, google_protobuf_Int32Value_init_default, 0, google_firestore_v1beta1_Cursor_init_default, google_firestore_v1beta1_Cursor_init_default}
+#define google_firestore_v1beta1_StructuredQuery_CollectionSelector_init_default {{{NULL}, NULL}, 0}
+#define google_firestore_v1beta1_StructuredQuery_Filter_init_default {0, {google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_default}}
+#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_default {(google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator)0, {{NULL}, NULL}}
+#define google_firestore_v1beta1_StructuredQuery_FieldFilter_init_default {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default, (google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator)0, google_firestore_v1beta1_Value_init_default}
+#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_init_default {(google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator)0, 0, {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default}}
+#define google_firestore_v1beta1_StructuredQuery_Order_init_default {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default, (google_firestore_v1beta1_StructuredQuery_Direction)0}
+#define google_firestore_v1beta1_StructuredQuery_FieldReference_init_default {{{NULL}, NULL}}
+#define google_firestore_v1beta1_StructuredQuery_Projection_init_default {{{NULL}, NULL}}
+#define google_firestore_v1beta1_Cursor_init_default {{{NULL}, NULL}, 0}
+#define google_firestore_v1beta1_StructuredQuery_init_zero {google_firestore_v1beta1_StructuredQuery_Projection_init_zero, {{NULL}, NULL}, google_firestore_v1beta1_StructuredQuery_Filter_init_zero, {{NULL}, NULL}, google_protobuf_Int32Value_init_zero, 0, google_firestore_v1beta1_Cursor_init_zero, google_firestore_v1beta1_Cursor_init_zero}
+#define google_firestore_v1beta1_StructuredQuery_CollectionSelector_init_zero {{{NULL}, NULL}, 0}
+#define google_firestore_v1beta1_StructuredQuery_Filter_init_zero {0, {google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_zero}}
+#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_zero {(google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator)0, {{NULL}, NULL}}
+#define google_firestore_v1beta1_StructuredQuery_FieldFilter_init_zero {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero, (google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator)0, google_firestore_v1beta1_Value_init_zero}
+#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_init_zero {(google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator)0, 0, {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero}}
+#define google_firestore_v1beta1_StructuredQuery_Order_init_zero {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero, (google_firestore_v1beta1_StructuredQuery_Direction)0}
+#define google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero {{{NULL}, NULL}}
+#define google_firestore_v1beta1_StructuredQuery_Projection_init_zero {{{NULL}, NULL}}
+#define google_firestore_v1beta1_Cursor_init_zero {{{NULL}, NULL}, 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define google_firestore_v1beta1_StructuredQuery_FieldReference_field_path_tag 2
+#define google_firestore_v1beta1_StructuredQuery_Projection_fields_tag 2
+#define google_firestore_v1beta1_Cursor_values_tag 1
+#define google_firestore_v1beta1_Cursor_before_tag 2
+#define google_firestore_v1beta1_StructuredQuery_CollectionSelector_collection_id_tag 2
+#define google_firestore_v1beta1_StructuredQuery_CollectionSelector_all_descendants_tag 3
+#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_op_tag 1
+#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_filters_tag 2
+#define google_firestore_v1beta1_StructuredQuery_FieldFilter_field_tag 1
+#define google_firestore_v1beta1_StructuredQuery_FieldFilter_op_tag 2
+#define google_firestore_v1beta1_StructuredQuery_FieldFilter_value_tag 3
+#define google_firestore_v1beta1_StructuredQuery_Order_field_tag 1
+#define google_firestore_v1beta1_StructuredQuery_Order_direction_tag 2
+#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_field_tag 2
+#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_op_tag 1
+#define google_firestore_v1beta1_StructuredQuery_Filter_composite_filter_tag 1
+#define google_firestore_v1beta1_StructuredQuery_Filter_field_filter_tag 2
+#define google_firestore_v1beta1_StructuredQuery_Filter_unary_filter_tag 3
+#define google_firestore_v1beta1_StructuredQuery_select_tag 1
+#define google_firestore_v1beta1_StructuredQuery_from_tag 2
+#define google_firestore_v1beta1_StructuredQuery_where_tag 3
+#define google_firestore_v1beta1_StructuredQuery_order_by_tag 4
+#define google_firestore_v1beta1_StructuredQuery_start_at_tag 7
+#define google_firestore_v1beta1_StructuredQuery_end_at_tag 8
+#define google_firestore_v1beta1_StructuredQuery_offset_tag 6
+#define google_firestore_v1beta1_StructuredQuery_limit_tag 5
+
+/* Struct field encoding specification for nanopb */
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_fields[9];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_CollectionSelector_fields[3];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_Filter_fields[4];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_CompositeFilter_fields[3];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_FieldFilter_fields[4];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_UnaryFilter_fields[3];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_Order_fields[3];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_FieldReference_fields[2];
+extern const pb_field_t google_firestore_v1beta1_StructuredQuery_Projection_fields[2];
+extern const pb_field_t google_firestore_v1beta1_Cursor_fields[3];
+
+/* Maximum encoded size of messages (where known) */
+/* google_firestore_v1beta1_StructuredQuery_size depends on runtime parameters */
+/* google_firestore_v1beta1_StructuredQuery_CollectionSelector_size depends on runtime parameters */
+/* google_firestore_v1beta1_StructuredQuery_Filter_size depends on runtime parameters */
+/* google_firestore_v1beta1_StructuredQuery_CompositeFilter_size depends on runtime parameters */
+#define google_firestore_v1beta1_StructuredQuery_FieldFilter_size (14 + google_firestore_v1beta1_StructuredQuery_FieldReference_size + google_firestore_v1beta1_Value_size)
+/* google_firestore_v1beta1_StructuredQuery_UnaryFilter_size depends on runtime parameters */
+#define google_firestore_v1beta1_StructuredQuery_Order_size (8 + google_firestore_v1beta1_StructuredQuery_FieldReference_size)
+/* google_firestore_v1beta1_StructuredQuery_FieldReference_size depends on runtime parameters */
+/* google_firestore_v1beta1_StructuredQuery_Projection_size depends on runtime parameters */
+/* google_firestore_v1beta1_Cursor_size depends on runtime parameters */
+
+/* Message IDs (where set with "msgid" option) */
+#ifdef PB_MSGID
+
+#define QUERY_MESSAGES \
+
+
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+/* @@protoc_insertion_point(eof) */
+
+#endif