lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch utfsql.diff from Nirgal

Browse Source
This commit is contained in:
Nirgal Vourgre 2011-08-28 19:49:54 -04:00 committed by Brian Bruns
parent aee657f603
commit 07f915b3c7
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -41,7 +41,7 @@ dnl ---------------------------------------------------------------------
sql=true sql=true
AC_MSG_CHECKING( Are we using flex ) AC_MSG_CHECKING( Are we using flex )
if test "x$LEX" = "xflex"; then if test "x$LEX" = "xflex"; then
LFLAGS="$LFLAGS -i" LFLAGS="$LFLAGS -i -8"
AC_MSG_RESULT( yes ); AC_MSG_RESULT( yes );
else else
AC_MSG_RESULT( no - SQL engine disable); AC_MSG_RESULT( no - SQL engine disable);

13
src/sql/lexer.l
View File

@ -63,7 +63,7 @@ like { return LIKE; }
return IDENT; return IDENT;
} }
[A-Za-z][A-Za-z0-9_#@]* { yylval.name = strdup(yytext); return NAME; } [a-z\xa0-\xff][a-z0-9_#@\xa0-\xff]* { yylval.name = strdup(yytext); return NAME; }
'[^']*'' { '[^']*'' {
yyless(yyleng-1); yyless(yyleng-1);
@ -74,10 +74,13 @@ like { return LIKE; }
return STRING; return STRING;
} }
(-*[0-9]+|([0-9]*\.[0-9]+)([eE][-+]?[0-9]+)?) { (-*[0-9]+|([0-9]*\.[0-9]+)(e[-+]?[0-9]+)?) {
yylval.name = strdup(yytext); return NUMBER; yylval.name = strdup(yytext); return NUMBER;
} }
~?(\/?[A-Za-z0-9\.]+)+ { yylval.name = strdup(yytext); return PATH; } ~?(\/?[a-z0-9\.\xa0-\xff]+)+ {
yylval.name = strdup(yytext); return PATH;
}
. { return yytext[0]; } . { return yytext[0]; }
%% %%

1
src/sql/mdbsql.c
View File

@ -806,4 +806,3 @@ mdb_sql_dump_results(MdbSQL *sql)
/* the column and table names are no good now */ /* the column and table names are no good now */
mdb_sql_reset(sql); mdb_sql_reset(sql);
} }

38
src/util/mdb-sql.c
View File

@ -74,7 +74,7 @@ char *readline(char *prompt)
char *buf, line[1000]; char *buf, line[1000];
int i = 0; int i = 0;
printf("%s",prompt); puts(prompt);
if (! fgets(line,1000,stdin)) { if (! fgets(line,1000,stdin)) {
return NULL; return NULL;
} }
@ -91,6 +91,15 @@ int i = 0;
} }
#endif #endif
static int strlen_utf(const char *s) {
int len = 0;
while (*s) {
if ((*s++ & 0xc0) != 0x80)
len++;
}
return len;
}
void void
do_set_cmd(MdbSQL *sql, char *s) do_set_cmd(MdbSQL *sql, char *s)
{ {
@ -215,25 +224,22 @@ void print_value(FILE *out, char *v, int sz, int first)
int i; int i;
int vlen; int vlen;
if (first) { if (first)
fprintf(out,"|"); fputc('|', out);
} vlen = strlen_utf(v);
vlen = strlen(v); fputs(v, out);
for (i=0;i<sz;i++) { for (i=vlen;i<sz;i++)
fprintf(out,"%c",i >= vlen ? ' ' : v[i]); fputc(' ', out);
} fputc('|', out);
fprintf(out,"|");
} }
static void print_break(FILE *out, int sz, int first) static void print_break(FILE *out, int sz, int first)
{ {
int i; int i;
if (first) { if (first)
fprintf(out,"+"); fputc('+', out);
} for (i=0;i<sz;i++)
for (i=0;i<sz;i++) { fputc('-', out);
fprintf(out,"-"); fputc('+', out);
}
fprintf(out,"+");
} }
void print_rows_retrieved(FILE *out, unsigned long row_count) void print_rows_retrieved(FILE *out, unsigned long row_count)
{ {