diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Actually open the gpkg. Fix the query quoting.

Browse Source
This commit is contained in:
Erica Fischer
2024-12-05 14:42:48 -08:00
parent 264665b0ce
commit ad47b93a81
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile-join.cpp
+7 -2
View File
@@ -83,7 +83,7 @@ std::vector<std::map<std::string, mvt_value>> get_joined_rows(sqlite3 *db, const
ret.resize(join_keys.size()); ret.resize(join_keys.size());
// double quotes for table and column identifiers // double quotes for table and column identifiers
const char *s = sqlite3_mprintf("select * from %w where %w in (", join_table.c_str(), join_table_column.c_str()); const char *s = sqlite3_mprintf("select * from \"%w\" where \"%w\" in (", join_table.c_str(), join_table_column.c_str());
std::string query = s; std::string query = s;
sqlite3_free((void *) s); sqlite3_free((void *) s);
@@ -92,7 +92,7 @@ std::vector<std::map<std::string, mvt_value>> get_joined_rows(sqlite3 *db, const
// single quotes for literals // single quotes for literals
if (v.type == mvt_string) { if (v.type == mvt_string) {
s = sqlite3_mprintf("%q", v.c_str()); s = sqlite3_mprintf("'%q'", v.c_str());
query += s; query += s;
sqlite3_free((void *) s); sqlite3_free((void *) s);
} else { } else {
@@ -105,6 +105,7 @@ std::vector<std::map<std::string, mvt_value>> get_joined_rows(sqlite3 *db, const
} }
query += ");"; query += ");";
printf("%s\n", query.c_str());
return ret; return ret;
} }
@@ -1508,6 +1509,10 @@ int main(int argc, char **argv) {
unidecode_data = read_unidecode(optarg); unidecode_data = read_unidecode(optarg);
} else if (strcmp(opt, "join-sqlite") == 0) { } else if (strcmp(opt, "join-sqlite") == 0) {
join_sqlite_fname = optarg; join_sqlite_fname = optarg;
if (sqlite3_open(optarg, &db) != SQLITE_OK) {
fprintf(stderr, "%s: %s\n", optarg, sqlite3_errmsg(db));
exit(EXIT_SQLITE);
}
} else if (strcmp(opt, "join-table") == 0) { } else if (strcmp(opt, "join-table") == 0) {
join_table = optarg; join_table = optarg;
} else if (strcmp(opt, "join-table-column") == 0) { } else if (strcmp(opt, "join-table-column") == 0) {