forked from Lainports/freebsd-ports
8aea544d5b
The last release introduces a bug, which causes BOOL values inserted into PostgreSQL converted to INT. This causes exceptions when tried. Since this is a serious issue, we apply the upstream patch until it gets official released Approved by: madpilot Sponsored by: Bounce Experts Differential Revision: https://reviews.freebsd.org/D30117
42 lines
1.3 KiB
C
42 lines
1.3 KiB
C
--- pgsql_statement.c.orig 2021-04-27 14:35:54 UTC
|
|
+++ pgsql_statement.c
|
|
@@ -54,21 +54,8 @@
|
|
#define VARCHARLABEL "varchar"
|
|
#define VARCHAROID 1043
|
|
|
|
-#define PG_INT32_MIN (-0x7FFFFFFF-1)
|
|
-#define PG_INT32_MAX (0x7FFFFFFF)
|
|
|
|
-#if defined(_MSC_VER)
|
|
-# define strtoll(s, f, b) _atoi64(s)
|
|
-#elif !defined(HAVE_STRTOLL)
|
|
-# if defined(HAVE_ATOLL)
|
|
-# define strtoll(s, f, b) atoll(s)
|
|
-# else
|
|
-# define strtoll(s, f, b) strtol(s, f, b)
|
|
-# endif
|
|
-#endif
|
|
|
|
-
|
|
-
|
|
static int pgsql_stmt_dtor(pdo_stmt_t *stmt)
|
|
{
|
|
pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
|
|
@@ -403,16 +390,7 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, str
|
|
S->param_formats[param->paramno] = 0;
|
|
}
|
|
|
|
- if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_INT) {
|
|
- /* we need to check if the number requires bigints */
|
|
- long long val = strtoll(Z_STRVAL_P(parameter), NULL, 10);
|
|
-
|
|
- if (val > PG_INT32_MAX || val < PG_INT32_MIN) {
|
|
- S->param_types[param->paramno] = INT8OID;
|
|
- } else {
|
|
- S->param_types[param->paramno] = INT4OID;
|
|
- }
|
|
- } else if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
|
|
+ if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
|
|
S->param_types[param->paramno] = 0;
|
|
S->param_formats[param->paramno] = 1;
|
|
} else {
|