Use raw string literals in several places to avoid quoting

joto · joto · commit 519183d58fee · 2022-03-16T14:25:53.000+01:00
diff --git a/src/db-copy-mgr.hpp b/src/db-copy-mgr.hpp
@@ -333,10 +333,10 @@ class db_copy_mgr_t
         for (char const *c = s; *c; ++c) {
             switch (*c) {
             case '"':
-                m_current->buffer += "\\\\\"";
+                m_current->buffer += R"(\\")";
                 break;
             case '\\':
-                m_current->buffer += "\\\\\\\\";
+                m_current->buffer += R"(\\\\)";
                 break;
             case '\n':
                 m_current->buffer += "\\n";
diff --git a/src/flex-table-column.cpp b/src/flex-table-column.cpp
@@ -183,5 +183,5 @@ std::string flex_table_column_t::sql_modifiers() const
 
 std::string flex_table_column_t::sql_create() const
 {
-    return "\"{}\" {} {},"_format(m_name, sql_type_name(), sql_modifiers());
+    return R"("{}" {} {},)"_format(m_name, sql_type_name(), sql_modifiers());
 }
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
@@ -247,7 +247,7 @@ void table_connection_t::stop(bool updateable, bool append)
         m_db_connection->exec(sql);
 
         m_db_connection->exec("DROP TABLE {}"_format(table().full_name()));
-        m_db_connection->exec("ALTER TABLE {} RENAME TO \"{}\""_format(
+        m_db_connection->exec(R"(ALTER TABLE {} RENAME TO "{}")"_format(
             table().full_tmp_name(), table().name()));
         m_id_index_created = false;
 
@@ -263,7 +263,7 @@ void table_connection_t::stop(bool updateable, bool append)
 
         // Use fillfactor 100 for un-updateable imports
         m_db_connection->exec(
-            "CREATE INDEX ON {} USING GIST (\"{}\") {} {}"_format(
+            R"(CREATE INDEX ON {} USING GIST ("{}") {} {})"_format(
                 table().full_name(), table().geom_column().name(),
                 (updateable ? "" : "WITH (fillfactor = 100)"),
                 tablespace_clause(table().index_tablespace())));
diff --git a/src/pgsql-helper.cpp b/src/pgsql-helper.cpp
@@ -65,7 +65,7 @@ void drop_geom_check_trigger(pg_conn_t *db_connection,
 {
     std::string func_name = qualified_name(schema, table + "_osm2pgsql_valid");
 
-    db_connection->exec("DROP TRIGGER \"{}\" ON {};"_format(
+    db_connection->exec(R"(DROP TRIGGER "{}" ON {};)"_format(
         table + "_osm2pgsql_valid", qualified_name(schema, table)));
 
     db_connection->exec("DROP FUNCTION IF EXISTS {} ();"_format(func_name));
diff --git a/src/table.cpp b/src/table.cpp
@@ -107,12 +107,12 @@ void table_t::start(std::string const &conninfo, std::string const &table_space)
 
         //first with the regular columns
         for (auto const &column : m_columns) {
-            sql += "\"{}\" {},"_format(column.name, column.type_name);
+            sql += R"("{}" {},)"_format(column.name, column.type_name);
         }
 
         //then with the hstore columns
         for (auto const &hcolumn : m_hstore_columns) {
-            sql += "\"{}\" hstore,"_format(hcolumn);
+            sql += R"("{}" hstore,)"_format(hcolumn);
         }
 
         //add tags column
@@ -225,7 +225,7 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
         m_sql_conn->exec(sql);
 
         m_sql_conn->exec("DROP TABLE {}"_format(qual_name));
-        m_sql_conn->exec("ALTER TABLE {} RENAME TO \"{}\""_format(
+        m_sql_conn->exec(R"(ALTER TABLE {} RENAME TO "{}")"_format(
             qual_tmp_name, m_target->name));
 
         log_info("Creating geometry index on table '{}'...", m_target->name);
@@ -258,7 +258,7 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
             }
             for (auto const &hcolumn : m_hstore_columns) {
                 m_sql_conn->exec(
-                    "CREATE INDEX ON {} USING GIN (\"{}\") {}"_format(
+                    R"(CREATE INDEX ON {} USING GIN ("{}") {})"_format(
                         qual_name, hcolumn,
                         tablespace_clause(table_space_index)));
             }

Original file line number	Diff line number	Diff line change
`@@ -183,5 +183,5 @@ std::string flex_table_column_t::sql_modifiers() const`
`183`	`183`
`184`	`184`	`std::string flex_table_column_t::sql_create() const`
`185`	`185`	`{`
`186`		`- return "\"{}\" {} {},"_format(m_name, sql_type_name(), sql_modifiers());`
	`186`	`+ return R"("{}" {} {},)"_format(m_name, sql_type_name(), sql_modifiers());`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ void drop_geom_check_trigger(pg_conn_t *db_connection,`
`65`	`65`	`{`
`66`	`66`	`std::string func_name = qualified_name(schema, table + "_osm2pgsql_valid");`
`67`	`67`
`68`		`- db_connection->exec("DROP TRIGGER \"{}\" ON {};"_format(`
	`68`	`+ db_connection->exec(R"(DROP TRIGGER "{}" ON {};)"_format(`
`69`	`69`	`table + "_osm2pgsql_valid", qualified_name(schema, table)));`
`70`	`70`
`71`	`71`	`db_connection->exec("DROP FUNCTION IF EXISTS {} ();"_format(func_name));`