(cleanup)

Author: mpartel

.vscode/c_cpp_properties.json

@@ -6,7 +6,7 @@
                 "${workspaceFolder}/**",
                 "${workspaceFolder}/third_party/protobuf/src",
                 "/usr/include/postgresql",
-                "/usr/include/postgresql/11/server"
+                "/usr/include/postgresql/14/server"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/gcc",

build-and-test.sh

@@ -8,7 +8,7 @@ POSTGRES_VERSION=${POSTGRES_VERSION:-11}
 if [[ -n "${USE_DOCKER:-}" ]]; then
     unset USE_DOCKER
     docker build --build-arg=POSTGRES_VERSION="${POSTGRES_VERSION}" -t postgres-protobuf-build:"${POSTGRES_VERSION}" .
-    docker run postgres-protobuf-build:"${POSTGRES_VERSION}" env NO_CLEAN=1 __IN_DOCKER=1 /app/build-and-test.sh
+    docker run postgres-protobuf-build:"${POSTGRES_VERSION}" env NO_CLEAN=1 POSTGRES_VERSION="${POSTGRES_VERSION}" __IN_DOCKER=1 /app/build-and-test.sh
     exit $?
 fi
 

querying.cpp

@@ -458,7 +458,7 @@ class PrimitiveEmitter : public Emitter {
 
   void ReadPrimitive(const FieldInfo& field) override {
 #ifndef PROTOBUF_LITTLE_ENDIAN
-    static_assert(false, "big-endian not yet supported");
+#error "big-endian not yet supported"
 #endif
     PGPROTO_DEBUG("Emit primitive %d (wt %d, ty %d)", field.number,
                   field.wire_type, ty_);
@@ -697,7 +697,8 @@ class FieldSelector : public ProtobufVisitor {
 
   bool ShouldEmitCurrentIndex() const {
     return current_field_ == wanted_field_ &&
-           (!wanted_index_.has_value() || current_index_ == wanted_index_.value());
+           (!wanted_index_.has_value() ||
+            current_index_ == wanted_index_.value());
   }
 };
 
@@ -1298,7 +1299,7 @@ void QueryImpl::ParseNumericMapKey(const std::string& s,
                                    pb::FieldDescriptor::Type ty,
                                    FieldInfo::Value* v) {
 #ifndef PROTOBUF_LITTLE_ENDIAN
-  static_assert(false, "big-endian not yet supported");
+#error "big-endian not yet supported"
 #endif
   using T = pb::FieldDescriptor::Type;
   using WFL = pb::internal::WireFormatLite;