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.

Sign up for GitHub

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
Merged

Middle refactor for SQL code #2284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0e7f92a
Move params.[ch]pp and template.[ch]pp into main src directory
joto Dec 13, 2024
1a7fc3e
Add versions of params_t::set() function and add some tests
joto Jan 3, 2025
cd2e128
Refactor: Use templates to create middle tables
joto Dec 13, 2024
777394f
Refactor: Use template rendering and explicit prepare function
joto Dec 13, 2024
094dfa0
Refactor: Switch index creation to new template code in middle
joto Dec 13, 2024
f2195c3
Refactor: Remove the last part of the table_sql struct, the name
joto Jan 2, 2025
25f77a8
Refactor: Remove m_users_table member variable
joto Jan 2, 2025
b26f928
Remove now unused build_sql() function
joto Jan 3, 2025
6259590
Fix unused variable
joto Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,7 @@ else()
src/gen/gen-tile-sql.cpp
src/gen/gen-tile-vector.cpp
src/gen/gen-tile.cpp
src/gen/params.cpp
src/gen/raster.cpp
src/gen/template.cpp
src/gen/tracer.cpp)
target_link_libraries(osm2pgsql-gen osm2pgsql_lib ${LIBS} ${POTRACE_LIBRARY} ${OpenCV_LIBS})
endif()
Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ target_sources(osm2pgsql_lib PRIVATE
output-null.cpp
output-pgsql.cpp
output.cpp
params.cpp
pgsql-capabilities.cpp
pgsql-helper.cpp
pgsql.cpp
Expand All @@ -58,6 +59,7 @@ target_sources(osm2pgsql_lib PRIVATE
tagtransform-c.cpp
tagtransform-lua.cpp
tagtransform.cpp
template.cpp
thread-pool.cpp
tile.cpp
util.cpp
Expand Down
Loading
Loading