diff options
| author | Ard Biesheuvel <abies@php.net> | 2003-09-23 23:08:59 +0000 |
|---|---|---|
| committer | Ard Biesheuvel <abies@php.net> | 2003-09-23 23:08:59 +0000 |
| commit | 50911d0904abe80b9efbbd973de3e38f52aa90b9 (patch) | |
| tree | c921c85a1338919f199a513d2b6cf14afd886055 | |
| parent | afdc20a094c97924fe2e054d52ba51dbf9587f81 (diff) | |
| download | php-git-50911d0904abe80b9efbbd973de3e38f52aa90b9.tar.gz | |
Always return long from ibase_gen_id() on IB < 6
| -rw-r--r-- | ext/interbase/interbase.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 843ca4fd80..f1300e3b15 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -3306,7 +3306,7 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) precision = 9; break; #ifdef SQL_INT64 - case SQL_INT64: + case SQL_INT64: precision = 18; break; #endif @@ -3317,8 +3317,8 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) } else { switch (var->sqltype & ~1) { case SQL_TEXT: - s = "CHAR"; - break; + s = "CHAR"; + break; case SQL_VARYING: s = "VARCHAR"; break; @@ -3328,13 +3328,13 @@ static void _php_ibase_field_info(zval *return_value, XSQLVAR *var) case SQL_LONG: s = "INTEGER"; break; - case SQL_FLOAT: + case SQL_FLOAT: s = "FLOAT"; break; - case SQL_DOUBLE: - case SQL_D_FLOAT: + case SQL_DOUBLE: + case SQL_D_FLOAT: s = "DOUBLE PRECISION"; break; #ifdef SQL_INT64 - case SQL_INT64: + case SQL_INT64: s = "BIGINT"; break; #endif @@ -4498,13 +4498,13 @@ PHP_FUNCTION(ibase_gen_id) /* don't return the generator value as a string unless it doesn't fit in a long */ #ifdef SQL_INT64 if (result > LONG_MAX) -#endif { char res[24]; sprintf(res,"%" LL_MASK "d", result); RETURN_STRING(res,1); } +#endif RETURN_LONG((long)result); } |