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

Patch nosanitize.diff form Nirgal

Browse Source
This commit is contained in:
Nirgal Vourgre
2011-08-28 18:56:03 -04:00
committed by Brian Bruns
parent b5cabb1834
commit 8ef50c444e
7 changed files with 20 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,13 +84,12 @@ main(int argc, char **argv)
char header_row = 1;
char quote_text = 1;
char *insert_dialect = NULL;
char sanitize = 0;
char *namespace = "";
int opt;
char *value;
size_t length;
while ((opt=getopt(argc, argv, "HQq:X:d:D:R:I:N:S"))!=-1) {
while ((opt=getopt(argc, argv, "HQq:X:d:D:R:I:N:"))!=-1) {
switch (opt) {
case 'H':
header_row = 0;
@@ -111,9 +110,6 @@ main(int argc, char **argv)
insert_dialect = (char*) g_strdup(optarg);
header_row = 0;
break;
case 'S':
sanitize = 1;
break;
case 'D':
mdb_set_date_fmt(optarg);
break;
@@ -150,7 +146,6 @@ main(int argc, char **argv)
fprintf(stderr," -R <delimiter> specify a row delimiter\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");
fprintf(stderr," -X <char> Use <char> to escape quoted characters within a field. Default is doubling.\n");
fprintf(stderr," -N <namespace> Prefix identifiers with namespace\n");
@@ -206,7 +201,7 @@ main(int argc, char **argv)
col=g_ptr_array_index(table->columns,j);
if (j)
fputs(delimiter, stdout);
fputs(sanitize ? sanitize_name(col->name) : col->name, stdout);
fputs(col->name, stdout);
}
fputs("\n", stdout);
}
@@ -215,19 +210,13 @@ main(int argc, char **argv)
if (insert_dialect) {
char *quoted_name;
if (sanitize)
quoted_name = sanitize_name(argv[optind + 1]);
else
quoted_name = mdb->default_backend->quote_schema_name(NULL, argv[optind + 1]);
quoted_name = mdb->default_backend->quote_schema_name(NULL, argv[optind + 1]);
fprintf(stdout, "INSERT INTO %s%s (", namespace, quoted_name);
free(quoted_name);
for (j=0;j<table->num_cols;j++) {
if (j>0) fputs(", ", stdout);
col=g_ptr_array_index(table->columns,j);
if (sanitize)
quoted_name = sanitize_name(col->name);
else
quoted_name = mdb->default_backend->quote_schema_name(NULL, col->name);
quoted_name = mdb->default_backend->quote_schema_name(NULL, col->name);
fputs(quoted_name, stdout);
free(quoted_name);
}

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

@@ -39,7 +39,6 @@ main (int argc, char **argv)
fprintf (stderr, "where options are:\n");
fprintf (stderr, " -T <table> Only create schema for named table\n");
fprintf (stderr, " -N <namespace> Prefix identifiers with namespace\n");
fprintf (stderr, " -S Sanitize names (replace spaces etc. with underscore)\n");
exit (1);
}
@@ -64,11 +63,9 @@ main (int argc, char **argv)
{"no-indexes", 0, NULL, 0},
{"relations", 0, NULL, 0},
{"no-relations", 0, NULL, 0},
{"sanitize", 0, NULL, 'S'},
{"no-sanitize", 0, NULL, 0},
{NULL, 0, NULL, 0},
};
opt = getopt_long(argc, argv, "T:N:S", long_options, &option_index);
opt = getopt_long(argc, argv, "T:N:", long_options, &option_index);
if (opt == -1)
break;
@@ -130,10 +127,6 @@ main (int argc, char **argv)
export_options &= ~MDB_SHEXP_RELATIONS;
break;
}
if (!strcmp(long_options[option_index].name, "no-sanitize")) {
export_options &= ~MDB_SHEXP_SANITIZE;
break;
}
fprintf(stderr, "unimplemented option %s", long_options[option_index].name);
if (optarg)
fprintf(stderr, " with arg %s", optarg);
@@ -148,10 +141,6 @@ main (int argc, char **argv)
case 'N':
namespace = (char *) g_strdup(optarg);
break;
case 'S':
export_options |= MDB_SHEXP_SANITIZE;
break;
}
}