Simplify support for new types for query input parameters.

Support force_null for them.

Author: sim1984

ext/pdo_firebird/firebird_driver.c

@@ -463,53 +463,6 @@ static int php_firebird_preprocess(const zend_string* sql, char* sql_out, HashTa
 
 #if FB_API_VER >= 40
 /* set coercing a data type */
-static void set_coercing_input_data_types(XSQLDA* sqlda)
-{
-	/* Data types introduced in Firebird 4.0 are difficult to process using the Firebird Legacy API. */ 
-	/* These data types include DECFLOAT(16), DECFLOAT(34), INT128 (NUMERIC/DECIMAL(38, x)), */
-	/* TIMESTAMP WITH TIME ZONE, and TIME WITH TIME ZONE. */
-	/* This function allows you to ensure minimal performance */ 
-	/* of queries if they contain parameters of the above types. */
-	unsigned int i;
-	short dtype;
-	short nullable;
-	XSQLVAR* var;
-	for (i=0, var = sqlda->sqlvar; i < sqlda->sqld; i++, var++) {
-		dtype = (var->sqltype & ~1); /* drop flag bit  */
-		nullable = (var->sqltype & 1); 
-		switch(dtype) {
-			case SQL_INT128:
-				var->sqltype = SQL_VARYING + nullable;
-				var->sqllen = 46;
-				var->sqlscale = 0;
-				break;
-
-			case SQL_DEC16:
-				var->sqltype = SQL_VARYING + nullable;
-				var->sqllen = 24;
-				break;
-
-			case SQL_DEC34:
-			    var->sqltype = SQL_VARYING + nullable;
-				var->sqllen = 43;
-				break;
-
-			case SQL_TIMESTAMP_TZ:
-				var->sqltype = SQL_VARYING + nullable;
-				var->sqllen = 58;
-				break;
-
-			case SQL_TIME_TZ:
-				var->sqltype = SQL_VARYING + nullable;
-				var->sqllen = 46;
-				break;
-
-			default:
-				break;
-		}
-	}	
-}
-
 static void set_coercing_output_data_types(XSQLDA* sqlda)
 {
 	/* Data types introduced in Firebird 4.0 are difficult to process using the Firebird Legacy API. */ 
@@ -728,11 +681,6 @@ static bool firebird_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, /* {{{ */
 			if (isc_dsql_describe_bind(H->isc_status, &s, PDO_FB_SQLDA_VERSION, S->in_sqlda)) {
 				break;
 			}
-
-#if FB_API_VER >= 40
-			/* set coercing a data type */
-			set_coercing_input_data_types(S->in_sqlda);
-#endif
 		}
 
 		stmt->driver_data = S;

ext/pdo_firebird/firebird_statement.c

@@ -822,6 +822,13 @@ static int pdo_firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param
 						case SQL_TIMESTAMP:
 						case SQL_TYPE_DATE:
 						case SQL_TYPE_TIME:
+#if FB_API_VER >= 40
+						case SQL_INT128:
+						case SQL_DEC16:
+						case SQL_DEC34:
+						case SQL_TIMESTAMP_TZ:
+						case SQL_TIME_TZ:
+#endif
 							force_null = (Z_STRLEN_P(parameter) == 0);
 					}
 					if (!force_null) {