simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 22:28:47 -04:00
Code Issues Releases Wiki Activity

accept integer as a float if explicitly requested

Browse source
This commit is contained in:
Kenichi Ishigaki 2012-04-27 13:54:51 +00:00
parent 9933faa0e8
commit d713d9e49b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dbdimp.c
View file

@ -168,7 +168,7 @@ sqlite_set_result(pTHX_ sqlite3_context *context, SV *result, int is_error)
* applyNumericAffinity, sqlite3Atoi64, etc from sqlite3.c * applyNumericAffinity, sqlite3Atoi64, etc from sqlite3.c
*/ */
static int static int
sqlite_is_number(pTHX_ const char *v, bool strict) sqlite_is_number(pTHX_ const char *v, int sql_type)
{ {
const char *z = v; const char *z = v;
int neg; int neg;
@ -176,7 +176,7 @@ sqlite_is_number(pTHX_ const char *v, bool strict)
int precision = 0; int precision = 0;
char format[10]; char format[10];
if (!strict) { if (sql_type != SQLITE_NULL) {
while (*z == ' ') { z++; v++; } while (*z == ' ') { z++; v++; }
} }
@ -228,7 +228,7 @@ sqlite_is_number(pTHX_ const char *v, bool strict)
#else #else
if (strEQ(form("%i", atoi(v)), v)) return 1; if (strEQ(form("%i", atoi(v)), v)) return 1;
#endif #endif
if (precision) { if (precision || sql_type == SQLITE_FLOAT) {
sprintf(format, "%%.%df", precision); sprintf(format, "%%.%df", precision);
if (strEQ(form(format, atof(v)), v)) return 2; if (strEQ(form(format, atof(v)), v)) return 2;
} }
@ -686,10 +686,10 @@ sqlite_st_execute(SV *sth, imp_sth_t *imp_sth)
* keep spaces when we just guess. * keep spaces when we just guess.
*/ */
if (imp_dbh->see_if_its_a_number) { if (imp_dbh->see_if_its_a_number) {
numtype = sqlite_is_number(aTHX_ data, TRUE); numtype = sqlite_is_number(aTHX_ data, SQLITE_NULL);
} }
else if (sql_type == SQLITE_INTEGER || sql_type == SQLITE_FLOAT) { else if (sql_type == SQLITE_INTEGER || sql_type == SQLITE_FLOAT) {
numtype = sqlite_is_number(aTHX_ data, FALSE); numtype = sqlite_is_number(aTHX_ data, sql_type);
} }
if (numtype == 1) { if (numtype == 1) {
@ -907,7 +907,7 @@ sqlite_st_fetch(SV *sth, imp_sth_t *imp_sth)
sv_setiv(AvARRAY(av)[i], sqlite3_column_int64(imp_sth->stmt, i)); sv_setiv(AvARRAY(av)[i], sqlite3_column_int64(imp_sth->stmt, i));
#else #else
val = (char*)sqlite3_column_text(imp_sth->stmt, i); val = (char*)sqlite3_column_text(imp_sth->stmt, i);
if (sqlite_is_number(aTHX_ val, TRUE) == 1) { if (sqlite_is_number(aTHX_ val, SQLITE_NULL) == 1) {
sv_setiv(AvARRAY(av)[i], atoi(val)); sv_setiv(AvARRAY(av)[i], atoi(val));
} else { } else {
sv_setpv(AvARRAY(av)[i], val); sv_setpv(AvARRAY(av)[i], val);