Skip to content

Added option -x for use TEXT for all character data types #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WandererTM wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added option -x for use TEXT for all character data types #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/pgdbf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <sys/types.h>

#include "pgdbf.h"
#define STANDARDOPTS "cCdDeEhm:i:nNpPqQrRtTuU"
#define STANDARDOPTS "cCdDeEhm:i:nNpPqQrRtTuUx"

int main(int argc, char **argv) {
/* Describing the DBF file */
Expand Down Expand Up @@ -112,6 +112,7 @@ int main(int argc, char **argv) {
int optusetransaction = 1;
int optusetruncatetable = 0;
int opttrimpadding = 1;
int optusetextdatatype = 0;

/* Describing the PostgreSQL table */
char *tablename;
Expand Down Expand Up @@ -220,6 +221,9 @@ int main(int argc, char **argv) {
case 'U':
optusetruncatetable = 0;
break;
case 'x':
optusetextdatatype = 1;
break;
case 'h':
default:
/* If we got here because someone requested '-h', exit
Expand Down Expand Up @@ -268,6 +272,7 @@ int main(int argc, char **argv) {
" -T do not use an enclosing transaction\n"
" -u issue a 'TRUNCATE' command before inserting data\n"
" -U do not issue a 'TRUNCATE' command before inserting data (default)\n"
" -x use TEXT for character data types\n"
"\n"
#if defined(HAVE_ICONV)
"If you don't specify an encoding via '-s', the data will be printed as is.\n"
Expand Down Expand Up @@ -576,7 +581,12 @@ int main(int argc, char **argv) {
case 'C':
case 'V':
case 'W':
if(optusecreatetable) printf("VARCHAR(%d)", fields[fieldnum].length);
if(optusecreatetable) {
if(optusetextdatatype)
printf("TEXT");
else
printf("VARCHAR(%d)", fields[fieldnum].length);
}
break;
case 'D':
if(optusecreatetable) printf("DATE");
Expand Down