psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 09:24:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplification in the COPY command composition

Browse Source 
Dropped the branch if NULL is specified or not: just use the default \N.

Also fixed copy_from/copy_to docstrings.
This commit is contained in:
Daniele Varrazzo 2011-10-19 20:31:09 +01:00
parent 0f4fd0d828
commit ff8158d7c0
1 changed files with 34 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
psycopg/cursor_type.c
View File

@ -1241,7 +1241,7 @@ exit:
/* extension: copy_from - implements COPY FROM */ /* extension: copy_from - implements COPY FROM */
#define psyco_curs_copy_from_doc \ #define psyco_curs_copy_from_doc \
"copy_from(file, table, sep='\\t', null='\\N', size=8192, columns=None) -- Copy table from file." "copy_from(file, table, sep='\\t', null='\\\\N', size=8192, columns=None) -- Copy table from file."
static int static int
_psyco_curs_has_read_check(PyObject* o, void* var) _psyco_curs_has_read_check(PyObject* o, void* var)
@ -1271,7 +1271,8 @@ psyco_curs_copy_from(cursorObject *self, PyObject *args, PyObject *kwargs)
char query_buffer[DEFAULT_COPYBUFF]; char query_buffer[DEFAULT_COPYBUFF];
Py_ssize_t query_size; Py_ssize_t query_size;
const char *table_name; const char *table_name;
const char *sep = "\t", *null = NULL; const char *sep = "\t";
const char *null = "\\N";
Py_ssize_t bufsize = DEFAULT_COPYBUFF; Py_ssize_t bufsize = DEFAULT_COPYBUFF;
PyObject *file, *columns = NULL, *res = NULL; PyObject *file, *columns = NULL, *res = NULL;
char *columnlist = NULL; char *columnlist = NULL;
@ -1303,13 +1304,13 @@ psyco_curs_copy_from(cursorObject *self, PyObject *args, PyObject *kwargs)
goto exit; goto exit;
} }
query = query_buffer;
if (null) {
if (!(quoted_null = psycopg_escape_string( if (!(quoted_null = psycopg_escape_string(
(PyObject*)self->conn, null, 0, NULL, NULL))) { (PyObject*)self->conn, null, 0, NULL, NULL))) {
PyErr_NoMemory(); PyErr_NoMemory();
goto exit; goto exit;
} }
query = query_buffer;
query_size = PyOS_snprintf(query, DEFAULT_COPYBUFF, query_size = PyOS_snprintf(query, DEFAULT_COPYBUFF,
"COPY %s%s FROM stdin WITH DELIMITER AS %s NULL AS %s", "COPY %s%s FROM stdin WITH DELIMITER AS %s NULL AS %s",
table_name, columnlist, quoted_delimiter, quoted_null); table_name, columnlist, quoted_delimiter, quoted_null);
@ -1323,22 +1324,6 @@ psyco_curs_copy_from(cursorObject *self, PyObject *args, PyObject *kwargs)
"COPY %s%s FROM stdin WITH DELIMITER AS %s NULL AS %s", "COPY %s%s FROM stdin WITH DELIMITER AS %s NULL AS %s",
table_name, columnlist, quoted_delimiter, quoted_null); table_name, columnlist, quoted_delimiter, quoted_null);
} }
}
else {
query_size = PyOS_snprintf(query, DEFAULT_COPYBUFF,
"COPY %s%s FROM stdin WITH DELIMITER AS %s",
table_name, columnlist, quoted_delimiter);
if (query_size >= DEFAULT_COPYBUFF) {
/* Got truncated, allocate dynamically */
if (!(query = PyMem_New(char, query_size + 1))) {
PyErr_NoMemory();
goto exit;
}
PyOS_snprintf(query, query_size + 1,
"COPY %s%s FROM stdin WITH DELIMITER AS %s",
table_name, columnlist, quoted_delimiter);
}
}
Dprintf("psyco_curs_copy_from: query = %s", query); Dprintf("psyco_curs_copy_from: query = %s", query);
@ -1366,7 +1351,7 @@ exit:
/* extension: copy_to - implements COPY TO */ /* extension: copy_to - implements COPY TO */
#define psyco_curs_copy_to_doc \ #define psyco_curs_copy_to_doc \
"copy_to(file, table, sep='\\t', null='\\N', columns=None) -- Copy table to file." "copy_to(file, table, sep='\\t', null='\\\\N', columns=None) -- Copy table to file."
static int static int
_psyco_curs_has_write_check(PyObject* o, void* var) _psyco_curs_has_write_check(PyObject* o, void* var)
@ -1390,7 +1375,8 @@ psyco_curs_copy_to(cursorObject *self, PyObject *args, PyObject *kwargs)
size_t query_size; size_t query_size;
char *columnlist = NULL; char *columnlist = NULL;
const char *table_name; const char *table_name;
const char *sep = "\t", *null = NULL; const char *sep = "\t";
const char *null = "\\N";
PyObject *file, *columns = NULL, *res = NULL; PyObject *file, *columns = NULL, *res = NULL;
char *quoted_delimiter = NULL; char *quoted_delimiter = NULL;
char *quoted_null = NULL; char *quoted_null = NULL;
@ -1417,16 +1403,16 @@ psyco_curs_copy_to(cursorObject *self, PyObject *args, PyObject *kwargs)
goto exit; goto exit;
} }
query = query_buffer;
if (null) {
if (!(quoted_null = psycopg_escape_string( if (!(quoted_null = psycopg_escape_string(
(PyObject*)self->conn, null, 0, NULL, NULL))) { (PyObject*)self->conn, null, 0, NULL, NULL))) {
PyErr_NoMemory(); PyErr_NoMemory();
goto exit; goto exit;
} }
query = query_buffer;
query_size = PyOS_snprintf(query, DEFAULT_COPYBUFF, query_size = PyOS_snprintf(query, DEFAULT_COPYBUFF,
"COPY %s%s TO stdout WITH DELIMITER AS %s" "COPY %s%s TO stdout WITH DELIMITER AS %s NULL AS %s",
" NULL AS %s", table_name, columnlist, quoted_delimiter, quoted_null); table_name, columnlist, quoted_delimiter, quoted_null);
if (query_size >= DEFAULT_COPYBUFF) { if (query_size >= DEFAULT_COPYBUFF) {
/* Got truncated, allocate dynamically */ /* Got truncated, allocate dynamically */
if (!(query = PyMem_New(char, query_size + 1))) { if (!(query = PyMem_New(char, query_size + 1))) {
@ -1434,24 +1420,8 @@ psyco_curs_copy_to(cursorObject *self, PyObject *args, PyObject *kwargs)
goto exit; goto exit;
} }
PyOS_snprintf(query, query_size + 1, PyOS_snprintf(query, query_size + 1,
"COPY %s%s TO stdout WITH DELIMITER AS %s" "COPY %s%s TO stdout WITH DELIMITER AS %s NULL AS %s",
" NULL AS %s", table_name, columnlist, quoted_delimiter, quoted_null); table_name, columnlist, quoted_delimiter, quoted_null);
}
}
else {
query_size = PyOS_snprintf(query, DEFAULT_COPYBUFF,
"COPY %s%s TO stdout WITH DELIMITER AS %s",
table_name, columnlist, quoted_delimiter);
if (query_size >= DEFAULT_COPYBUFF) {
/* Got truncated, allocate dynamically */
if (!(query = PyMem_New(char, query_size + 1))) {
PyErr_NoMemory();
goto exit;
}
PyOS_snprintf(query, query_size + 1,
"COPY %s%s TO stdout WITH DELIMITER AS %s",
table_name, columnlist, quoted_delimiter);
}
} }
Dprintf("psyco_curs_copy_to: query = %s", query); Dprintf("psyco_curs_copy_to: query = %s", query);