Add testing capability to pgsql capability code

And use it to test flex index setup.

Author: joto

src/pgsql-capabilities-int.hpp

@@ -0,0 +1,36 @@
+#ifndef OSM2PGSQL_PGSQL_CAPABILITIES_INT_HPP
+#define OSM2PGSQL_PGSQL_CAPABILITIES_INT_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2022 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+#include "pgsql-capabilities.hpp"
+
+#include <map>
+#include <set>
+#include <string>
+
+struct database_capabilities_t
+{
+    std::map<std::string, std::string> settings;
+
+    std::set<std::string> extensions;
+    std::set<std::string> schemas;
+    std::set<std::string> tablespaces;
+    std::set<std::string> index_methods;
+
+    std::string database_name;
+
+    uint32_t database_version = 0;
+    postgis_version postgis{};
+};
+
+database_capabilities_t &database_capabilities_for_testing() noexcept;
+
+#endif // OSM2PGSQL_PGSQL_CAPABILITIES_INT_HPP

src/pgsql-capabilities.cpp

@@ -10,35 +10,23 @@
 #include "format.hpp"
 #include "logging.hpp"
 #include "pgsql-capabilities.hpp"
+#include "pgsql-capabilities-int.hpp"
 #include "pgsql.hpp"
 #include "version.hpp"
 
-#include <map>
-#include <set>
 #include <stdexcept>
-#include <string>
-
-struct database_capabilities_t
-{
-    std::map<std::string, std::string> settings;
-
-    std::set<std::string> extensions;
-    std::set<std::string> schemas;
-    std::set<std::string> tablespaces;
-    std::set<std::string> index_methods;
-
-    std::string database_name;
-
-    uint32_t database_version = 0;
-    postgis_version postgis{};
-};
 
 static database_capabilities_t &capabilities() noexcept
 {
     static database_capabilities_t c;
     return c;
 }
 
+database_capabilities_t &database_capabilities_for_testing() noexcept
+{
+    return capabilities();
+}
+
 static void init_set_from_query(std::set<std::string> *set,
                                 pg_conn_t const &db_connection,
                                 char const *table, char const *column,

tests/CMakeLists.txt

@@ -84,6 +84,7 @@ set_test(test-wkb LABELS NoDB)
 
 # these tests require LUA support
 if (WITH_LUA)
+    set_test(test-flex-indexes)
     set_test(test-output-flex)
     set_test(test-output-flex-multi-input)
     set_test(test-output-flex-nodes)