lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-11-26 02:09:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debian patch 150-backend-quote from Nirgal Vourgère

Browse Source
This commit is contained in:
Brian Bruns
2010-06-20 16:27:42 -04:00
parent 4c83570d41
commit 30e5a6f4bb
5 changed files with 138 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/util/mdb-export.c
View File

@@ -28,7 +28,6 @@
#define is_text_type(x) (x==MDB_TEXT || x==MDB_MEMO || x==MDB_SDATETIME || x==MDB_BINARY)
static char *sanitize_name(char *str, int sanitize);
static char *escapes(char *s);
void
@@ -71,11 +70,11 @@ main(int argc, char **argv)
char *escape_char = NULL;
char header_row = 1;
char quote_text = 1;
char insert_statements = 0;
char *insert_dialect = NULL;
char sanitize = 0;
int opt;
while ((opt=getopt(argc, argv, "HQq:X:d:D:R:IS"))!=-1) {
while ((opt=getopt(argc, argv, "HQq:X:d:D:R:I:S"))!=-1) {
switch (opt) {
case 'H':
header_row = 0;
@@ -93,7 +92,7 @@ main(int argc, char **argv)
row_delimiter = escapes(optarg);
break;
case 'I':
insert_statements = 1;
insert_dialect = (char*) g_strdup(optarg);
header_row = 0;
break;
case 'S':
@@ -130,7 +129,7 @@ main(int argc, char **argv)
fprintf(stderr," -Q don't wrap text-like fields in quotes\n");
fprintf(stderr," -d <delimiter> specify a column delimiter\n");
fprintf(stderr," -R <delimiter> specify a row delimiter\n");
fprintf(stderr," -I INSERT statements (instead of CSV)\n");
fprintf(stderr," -I <backend> INSERT statements (instead of CSV)\n");
fprintf(stderr," -D <format> set the date format (see strftime(3) for details)\n");
fprintf(stderr," -S Sanitize names (replace spaces etc. with underscore)\n");
fprintf(stderr," -q <char> Use <char> to wrap text-like fields. Default is \".\n");
@@ -153,6 +152,13 @@ main(int argc, char **argv)
exit(1);
}
if (insert_dialect)
if (!mdb_set_default_backend(mdb, insert_dialect)) {
fprintf(stderr, "Invalid backend type\n");
mdb_exit();
exit(1);
}
table = mdb_read_table_by_name(mdb, argv[argc-1], MDB_TABLE);
if (!table) {
fprintf(stderr, "Error: Table %s does not exist in this database.\n", argv[argc-1]);
@@ -175,25 +181,34 @@ main(int argc, char **argv)
mdb_bind_column(table, j+1, bound_values[j], &bound_lens[j]);
}
if (header_row) {
col=g_ptr_array_index(table->columns,0);
fprintf(stdout,"%s",sanitize_name(col->name,sanitize));
for (j=1;j<table->num_cols;j++) {
for (j=0; j<table->num_cols; j++) {
col=g_ptr_array_index(table->columns,j);
fprintf(stdout,delimiter);
fprintf(stdout,"%s",sanitize_name(col->name,sanitize));
if (j)
fprintf(stdout,delimiter);
fprintf(stdout,"%s", sanitize ? sanitize_name(col->name) : col->name);
}
fprintf(stdout,"\n");
}
while(mdb_fetch_row(table)) {
if (insert_statements) {
fprintf(stdout, "INSERT INTO %s (",
sanitize_name(argv[optind + 1],sanitize));
if (insert_dialect) {
char *quoted_name;
if (sanitize)
quoted_name = sanitize_name(argv[optind + 1]);
else
quoted_name = mdb->default_backend->quote_name(argv[optind + 1]);
fprintf(stdout, "INSERT INTO %s (", quoted_name);
free(quoted_name);
for (j=0;j<table->num_cols;j++) {
if (j>0) fprintf(stdout, ", ");
col=g_ptr_array_index(table->columns,j);
fprintf(stdout,"%s", sanitize_name(col->name,sanitize));
if (sanitize)
quoted_name = sanitize_name(col->name);
else
quoted_name = mdb->default_backend->quote_name(col->name);
fprintf(stdout,"%s", quoted_name);
free(quoted_name);
}
fprintf(stdout, ") VALUES (");
}
@@ -208,12 +223,12 @@ main(int argc, char **argv)
fprintf(stdout,delimiter);
}
if (!bound_lens[j]) {
print_col(insert_statements?"NULL":"",0,col->col_type, quote_char, escape_char);
print_col(insert_dialect?"NULL":"",0,col->col_type, quote_char, escape_char);
} else {
print_col(bound_values[j], quote_text, col->col_type, quote_char, escape_char);
}
}
if (insert_statements) fprintf(stdout,")");
if (insert_dialect) fprintf(stdout,");");
fprintf(stdout, row_delimiter);
}
for (j=0;j<table->num_cols;j++) {
@@ -233,25 +248,6 @@ main(int argc, char **argv)
exit(0);
}
static char *sanitize_name(char *str, int sanitize)
{
static char namebuf[256];
char *p = namebuf;
if (!sanitize)
return str;
while (*str) {
*p = isalnum(*str) ? *str : '_';
p++;
str++;
}
*p = 0;
return namebuf;
}
static char *escapes(char *s)
{
char *d = (char *) g_strdup(s);

58
src/util/mdb-schema.c
View File

@@ -24,7 +24,6 @@
#include "dmalloc.h"
#endif
static char *sanitize_name(char *str, int sanitize);
static void generate_table_schema(MdbCatalogEntry *entry, char *namespace, int sanitize);
int
@@ -128,16 +127,32 @@ generate_table_schema(MdbCatalogEntry *entry, char *namespace, int sanitize)
MdbHandle *mdb = entry->mdb;
unsigned int i;
MdbColumn *col;
char* table_name;
char* quoted_name;
if (namespace) {
table_name = malloc(strlen(namespace)+strlen(entry->object_name)+1);
strcpy(table_name, namespace);
strcat(table_name, entry->object_name);
} else
{
table_name = strdup(entry->object_name);
}
if (sanitize)
quoted_name = sanitize_name(table_name);
else
quoted_name = mdb->default_backend->quote_name(table_name);
free(table_name);
/* drop the table if it exists */
fprintf (stdout, "DROP TABLE %s%s;\n", (namespace) ? namespace : "",
sanitize_name(entry->object_name, sanitize));
fprintf (stdout, "DROP TABLE %s;\n", quoted_name);
/* create the table */
fprintf (stdout, "CREATE TABLE %s%s\n", (namespace) ? namespace : "",
sanitize_name(entry->object_name, sanitize));
fprintf (stdout, "CREATE TABLE %s\n", quoted_name);
fprintf (stdout, " (\n");
free(quoted_name);
table = mdb_read_table (entry);
/* get the columns */
@@ -147,9 +162,14 @@ generate_table_schema(MdbCatalogEntry *entry, char *namespace, int sanitize)
for (i = 0; i < table->num_cols; i++) {
col = g_ptr_array_index (table->columns, i);
fprintf (stdout, "\t%s\t\t\t%s", sanitize_name(col->name,sanitize),
mdb_get_coltype_string (mdb->default_backend, col->col_type));
if (sanitize)
quoted_name = sanitize_name(col->name);
else
quoted_name = mdb->default_backend->quote_name(col->name);
fprintf (stdout, "\t%s\t\t\t%s", quoted_name,
mdb_get_coltype_string (mdb->default_backend, col->col_type));
free(quoted_name);
if (mdb_coltype_takes_length(mdb->default_backend,
col->col_type)) {
@@ -173,23 +193,3 @@ generate_table_schema(MdbCatalogEntry *entry, char *namespace, int sanitize)
mdb_free_tabledef (table);
}
static char *sanitize_name(char *str, int sanitize)
{
static char namebuf[256];
char *p = namebuf;
if (!sanitize)
return str;
while (*str) {
*p = isalnum(*str) ? *str : '_';
p++;
str++;
}
*p = 0;
return namebuf;
}