Merge pull request #1853 from joto/test-flex-indexes

Test flex indexes

Author: lonvia

src/flex-lua-index.cpp

@@ -49,16 +49,18 @@ static void check_and_add_columns(flex_table_t const &table,
 
 void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
 {
+    // get method
     char const *const method =
         luaX_get_table_string(lua_state, "method", -1, "Index definition");
     if (!has_index_method(method)) {
         throw std::runtime_error{"Unknown index method '{}'."_format(method)};
     }
-
+    lua_pop(lua_state, 1);
     auto &index = table->add_index(method);
 
+    // get columns
     std::vector<std::string> columns;
-    lua_getfield(lua_state, -2, "column");
+    lua_getfield(lua_state, -1, "column");
     if (lua_isstring(lua_state, -1)) {
         check_and_add_column(*table, &columns, lua_tostring(lua_state, -1));
         index.set_columns(columns);
@@ -75,19 +77,21 @@ void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
             "The 'column' field in an index definition must contain a "
             "string or an array."};
     }
+    lua_pop(lua_state, 1);
 
+    // get expression
     std::string const expression = luaX_get_table_string(
-        lua_state, "expression", -3, "Index definition", "");
-
-    index.set_expression(expression);
-
+        lua_state, "expression", -1, "Index definition", "");
+    lua_pop(lua_state, 1);
     if (expression.empty() == columns.empty()) {
         throw std::runtime_error{"You must set either the 'column' or the "
                                  "'expression' field in index definition."};
     }
+    index.set_expression(expression);
 
+    // get include columns
     std::vector<std::string> include_columns;
-    lua_getfield(lua_state, -4, "include");
+    lua_getfield(lua_state, -1, "include");
     if (get_database_version() >= 110000) {
         if (lua_isstring(lua_state, -1)) {
             check_and_add_column(*table, &include_columns,
@@ -105,23 +109,26 @@ void flex_lua_setup_index(lua_State *lua_state, flex_table_t *table)
             "Database version ({}) doesn't support"
             " include columns in indexes."_format(get_database_version())};
     }
+    lua_pop(lua_state, 1);
 
+    // get tablespace
     std::string const tablespace = luaX_get_table_string(
-        lua_state, "tablespace", -5, "Index definition", "");
+        lua_state, "tablespace", -1, "Index definition", "");
+    lua_pop(lua_state, 1);
     check_identifier(tablespace, "tablespace");
     if (!has_tablespace(tablespace)) {
         throw std::runtime_error{"Unknown tablespace '{}'."_format(tablespace)};
     }
     index.set_tablespace(tablespace.empty() ? table->index_tablespace()
                                             : tablespace);
 
-    index.set_is_unique(luaX_get_table_bool(lua_state, "unique", -6,
+    // get unique
+    index.set_is_unique(luaX_get_table_bool(lua_state, "unique", -1,
                                             "Index definition", false));
+    lua_pop(lua_state, 1);
 
+    // get where condition
     index.set_where_condition(
-        luaX_get_table_string(lua_state, "where", -7, "Index definition", ""));
-
-    // stack has: "where", "unique", "tablespace", "includes", "expression",
-    // "column", "method"
-    lua_pop(lua_state, 7);
+        luaX_get_table_string(lua_state, "where", -1, "Index definition", ""));
+    lua_pop(lua_state, 1);
 }

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)