delete unused stuff

Author: lonvia

middle-pgsql.cpp

@@ -291,7 +291,6 @@ void pgsql_parse_nodes(const char *string, osmium::memory::Buffer &buffer,
 } // anonymous namespace
 
 
-// escape means we return '\N' for copy mode, otherwise we return just nullptr
 void middle_pgsql_t::buffer_store_tags(osmium::OSMObject const &obj, bool attrs)
 {
     if (obj.tags().empty() && !attrs) {

output-pgsql.cpp

@@ -21,10 +21,6 @@
 #include <ctime>
 #include <unistd.h>
 
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/exception_ptr.hpp>
-#include <boost/format.hpp>
-
 #include "expire-tiles.hpp"
 #include "middle.hpp"
 #include "node-ram-cache.hpp"
@@ -39,37 +35,6 @@
 #include "wildcmp.hpp"
 #include "wkb.hpp"
 
-/* make the diagnostic information work with older versions of
- * boost - the function signature changed at version 1.54.
- */
-#if BOOST_VERSION >= 105400
-#define BOOST_DIAGNOSTIC_INFO(e) boost::diagnostic_information((e), true)
-#else
-#define BOOST_DIAGNOSTIC_INFO(e) boost::diagnostic_information((e))
-#endif
-
-/* example from: pg_dump -F p -t planet_osm gis
-COPY planet_osm (osm_id, name, place, landuse, leisure, "natural", man_made, waterway, highway, railway, amenity, tourism, learning, building, bridge, layer, way) FROM stdin;
-17959841        \N      \N      \N      \N      \N      \N      \N      bus_stop        \N      \N      \N      \N      \N      \N    -\N      0101000020E610000030CCA462B6C3D4BF92998C9B38E04940
-17401934        The Horn        \N      \N      \N      \N      \N      \N      \N      \N      pub     \N      \N      \N      \N    -\N      0101000020E6100000C12FC937140FD5BFB4D2F4FB0CE04940
-...
-
-mine - 01 01000000 48424298424242424242424256427364
-psql - 01 01000020 E6100000 30CCA462B6C3D4BF92998C9B38E04940
-       01 01000020 E6100000 48424298424242424242424256427364
-0x2000_0000 = hasSRID, following 4 bytes = srid, not supported by geos WKBWriter
-Workaround - output SRID=4326;<WKB>
-*/
-
-
-/*
-COPY planet_osm (osm_id, name, place, landuse, leisure, "natural", man_made, waterway, highway, railway, amenity, tourism, learning, bu
-ilding, bridge, layer, way) FROM stdin;
-198497  Bedford Road    \N      \N      \N      \N      \N      \N      residential     \N      \N      \N      \N      \N      \N    \N       0102000020E610000004000000452BF702B342D5BF1C60E63BF8DF49406B9C4D470037D5BF5471E316F3DF4940DFA815A6EF35D5BF9AE95E27F5DF4940B41EB
-E4C1421D5BF24D06053E7DF4940
-212696  Oswald Road     \N      \N      \N      \N      \N      \N      minor   \N      \N      \N      \N      \N      \N      \N    0102000020E610000004000000467D923B6C22D5BFA359D93EE4DF4940B3976DA7AD11D5BF84BBB376DBDF4940997FF44D9A06D5BF4223D8B8FEDF49404D158C4AEA04D
-5BF5BB39597FCDF4940
-*/
 void output_pgsql_t::pgsql_out_way(osmium::Way const &way, taglist_t *tags,
                                    bool polygon, bool roads)
 {

pgsql.cpp

@@ -7,22 +7,6 @@
 #include <memory>
 #include <boost/format.hpp>
 
-void escape(const std::string &src, std::string &dst)
-{
-    for (const char c: src) {
-        switch(c) {
-            case '\\':  dst.append("\\\\"); break;
-            //case 8:   dst.append("\\\b"); break;
-            //case 12:  dst.append("\\\f"); break;
-            case '\n':  dst.append("\\\n"); break;
-            case '\r':  dst.append("\\\r"); break;
-            case '\t':  dst.append("\\\t"); break;
-            //case 11:  dst.append("\\\v"); break;
-            default:    dst.push_back(c); break;
-        }
-    }
-}
-
 pg_result_t pgsql_exec_simple(PGconn *sql_conn, const ExecStatusType expect,
                               const std::string &sql)
 {

pgsql.hpp

@@ -34,5 +34,4 @@ int pgsql_exec(PGconn *sql_conn, const ExecStatusType expect, const char *fmt, .
 #endif
 ;
 
-void escape(const std::string &src, std::string& dst);
 #endif

tests/CMakeLists.txt

@@ -29,7 +29,6 @@ set(TESTS
   test-parse-extra-args.cpp
   test-parse-xml2.cpp
   test-persistent-node-cache.cpp
-  test-pgsql-escape.cpp
   test-wildcard-match.cpp
 )
 
@@ -51,7 +50,6 @@ set(TEST_NODB
  test-options-parse
  test-parse-diff
  test-parse-xml2
- test-pgsql-escape
  test-wildcard-match
 )