Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Middle refactor for SQL code #2284

Merged
merged 9 commits into from
Jan 6, 2025
Prev Previous commit
Next Next commit
Remove now unused build_sql() function
joto committed Jan 5, 2025

Verified

This commit was signed with the committer’s verified signature.
commit b26f92841a287e7a4c0f9f8ce40d152def5234d3
42 changes: 0 additions & 42 deletions src/middle-pgsql.cpp
Original file line number Diff line number Diff line change
@@ -71,48 +71,6 @@ void load_id_list(pg_conn_t const &db_connection, std::string const &table,
}
}

std::string build_sql(options_t const &options, std::string const &templ)
{
std::string const schema = "\"" + options.middle_dbschema + "\".";

params_t params;
params.set("prefix", options.prefix);
params.set("schema", schema);
params.set("unlogged", options.droptemp ? "UNLOGGED" : "");
params.set("data_tablespace", tablespace_clause(options.tblsslim_data));
params.set("index_tablespace", tablespace_clause(options.tblsslim_index));
params.set("way_node_index_id_shift", 5);

if (options.tblsslim_index.empty()) {
params.set("using_tablespace", "");
} else {
params.set("using_tablespace",
"USING INDEX TABLESPACE " + options.tblsslim_index);
}

if (options.extra_attributes) {
params.set("attribute_columns_definition",
" created timestamp with time zone,"
" version int4,"
" changeset_id int4,"
" user_id int4,");
params.set("attribute_columns_use",
", EXTRACT(EPOCH FROM created) AS created, version, "
"changeset_id, user_id, u.name");
params.set("users_table_access", "LEFT JOIN " + schema + '"' +
options.prefix +
"_users\" u ON o.user_id = u.id");
} else {
params.set("attribute_columns_definition", "");
params.set("attribute_columns_use", "");
params.set("users_table_access", "");
}

template_t sql_template{templ};
sql_template.set_params(params);
return sql_template.render();
}

} // anonymous namespace

middle_pgsql_t::table_desc::table_desc(options_t const &options,