mirror of
https://github.com/osm2pgsql-dev/osm2pgsql.git
synced 2025-08-19 16:28:16 +00:00
35a16af0d0
- list of tags read from file - slim mode works again - relations properly supported - more efficient DB usage It includes some restructuring of the code, in particular, the output module manages the mid-level now and the main program doesn't call it at all. This moves many of the previous hacks to the output module which can manage the mid-level as appropriate for its output (i.e. slim mode requires different semantics from ram mode)
89 lines
2.6 KiB
C
89 lines
2.6 KiB
C
/* Helper functions for the postgresql connections */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <libpq-fe.h>
|
|
|
|
#include "osmtypes.h" // For exit_nicely()
|
|
#include "pgsql.h"
|
|
|
|
void escape(char *out, int len, const char *in)
|
|
{
|
|
/* Apply escaping of TEXT COPY data
|
|
Escape: backslash itself, newline, carriage return, and the current delimiter character (tab)
|
|
file:///usr/share/doc/postgresql-8.1.8/html/sql-copy.html
|
|
*/
|
|
int count = 0;
|
|
const char *old_in = in, *old_out = out;
|
|
|
|
if (!len)
|
|
return;
|
|
|
|
while(*in && count < len-3) {
|
|
switch(*in) {
|
|
case '\\': *out++ = '\\'; *out++ = '\\'; count+= 2; break;
|
|
// case 8: *out++ = '\\'; *out++ = '\b'; count+= 2; break;
|
|
// case 12: *out++ = '\\'; *out++ = '\f'; count+= 2; break;
|
|
case '\n': *out++ = '\\'; *out++ = '\n'; count+= 2; break;
|
|
case '\r': *out++ = '\\'; *out++ = '\r'; count+= 2; break;
|
|
case '\t': *out++ = '\\'; *out++ = '\t'; count+= 2; break;
|
|
// case 11: *out++ = '\\'; *out++ = '\v'; count+= 2; break;
|
|
default: *out++ = *in; count++; break;
|
|
}
|
|
in++;
|
|
}
|
|
*out = '\0';
|
|
|
|
if (*in)
|
|
fprintf(stderr, "%s truncated at %d chars: %s\n%s\n", __FUNCTION__, count, old_in, old_out);
|
|
}
|
|
|
|
int pgsql_exec(PGconn *sql_conn, const char *sql, ExecStatusType expect)
|
|
{
|
|
PGresult *res;
|
|
#ifdef DEBUG_PGSQL
|
|
fprintf( stderr, "Executing: %s\n", sql );
|
|
#endif
|
|
res = PQexec(sql_conn, sql);
|
|
if (PQresultStatus(res) != expect) {
|
|
fprintf(stderr, "%s failed: %s\n", sql, PQerrorMessage(sql_conn));
|
|
PQclear(res);
|
|
exit_nicely();
|
|
}
|
|
PQclear(res);
|
|
return 0;
|
|
}
|
|
|
|
int pgsql_CopyData(const char *context, PGconn *sql_conn, const char *sql)
|
|
{
|
|
#ifdef DEBUG_PGSQL
|
|
fprintf( stderr, "%s>>> %s\n", context, sql );
|
|
#endif
|
|
int r = PQputCopyData(sql_conn, sql, strlen(sql));
|
|
if (r != 1) {
|
|
fprintf(stderr, "%s - bad result during COPY, data %s\n", context, sql);
|
|
exit_nicely();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
PGresult *pgsql_execPrepared( PGconn *sql_conn, const char *stmtName, int nParams, const char *const * paramValues, ExecStatusType expect)
|
|
{
|
|
#ifdef DEBUG_PGSQL
|
|
fprintf( stderr, "ExecPrepared: %s\n", stmtName );
|
|
#endif
|
|
PGresult *res = PQexecPrepared(sql_conn, stmtName, nParams, paramValues, NULL, NULL, 0);
|
|
if (PQresultStatus(res) != expect) {
|
|
fprintf(stderr, "%s failed: %s(%d)\n", stmtName, PQerrorMessage(sql_conn), PQresultStatus(res));
|
|
PQclear(res);
|
|
exit_nicely();
|
|
}
|
|
if( expect != PGRES_TUPLES_OK )
|
|
{
|
|
PQclear(res);
|
|
res = NULL;
|
|
}
|
|
return res;
|
|
}
|
|
|