ext/pdo: Implement PDO::ATTR_FETCH_TABLE_NAMES in PDO itself

Previously drivers had to implement this attribute themselves, and only
MySQL and Firebird did so, in spite of support being generic. Remove
driver-specific logic for this as well (Firebird's was harrowing).

Author: NattyNarwhal

ext/pdo/pdo_dbh.c

@@ -849,6 +849,13 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value, u
 			}
 			return false;
 
+		case PDO_ATTR_FETCH_TABLE_NAMES:
+			if (!pdo_get_bool_param(&bval, value)) {
+				return false;
+			}
+			dbh->fetch_table_names = bval;
+			return true;
+
 		case PDO_ATTR_ORACLE_NULLS:
 			if (!pdo_get_long_param(&lval, value)) {
 				return false;
@@ -1002,6 +1009,9 @@ PHP_METHOD(PDO, getAttribute)
 		case PDO_ATTR_CASE:
 			RETURN_LONG(dbh->desired_case);
 
+		case PDO_ATTR_FETCH_TABLE_NAMES:
+			RETURN_BOOL(dbh->fetch_table_names);
+
 		case PDO_ATTR_ORACLE_NULLS:
 			RETURN_LONG(dbh->oracle_nulls);
 

ext/pdo/pdo_stmt.c

@@ -150,6 +150,15 @@ bool pdo_stmt_describe_columns(pdo_stmt_t *stmt) /* {{{ */
 			}
 		}
 
+		/* prepend the table name if the attribute is set */
+		if (stmt->dbh->fetch_table_names && stmt->columns[col].table && ZSTR_LEN(stmt->columns[col].table)) {
+			/* XXX: Apply case to table as well? */
+			zend_string *table_name = stmt->columns[col].table;
+			zend_string *orig_name = stmt->columns[col].name;
+			stmt->columns[col].name = strpprintf(0, "%pS.%pS", table_name, orig_name);
+			zend_string_release(orig_name);
+		}
+
 		/* update the column index on named bound parameters */
 		if (stmt->bound_columns) {
 			struct pdo_bound_param_data *param;

ext/pdo/php_pdo_driver.h

@@ -458,6 +458,9 @@ struct _pdo_dbh_t {
 	/* when set, convert int/floats to strings */
 	bool stringify:1;
 
+	/* fetch table names; prepends to returned col name */
+	bool fetch_table_names:1;
+
 	/* bitmap for pdo_param_event(s) to skip in dispatch_param_event */
 	uint8_t skip_param_evt;
 

ext/pdo_firebird/firebird_driver.c

@@ -1094,13 +1094,6 @@ static bool pdo_firebird_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val
 			}
 			return true;
 
-		case PDO_ATTR_FETCH_TABLE_NAMES:
-			if (!pdo_get_bool_param(&bval, val)) {
-				return false;
-			}
-			H->fetch_table_names = bval;
-			return true;
-
 		case PDO_FB_ATTR_DATE_FORMAT:
 			{
 				zend_string *str = zval_try_get_string(val);
@@ -1258,10 +1251,6 @@ static int pdo_firebird_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 			}
 			return -1;
 
-		case PDO_ATTR_FETCH_TABLE_NAMES:
-			ZVAL_BOOL(val, H->fetch_table_names);
-			return 1;
-
 		case PDO_FB_ATTR_DATE_FORMAT:
 			ZVAL_STRING(val, H->date_format ? H->date_format : PDO_FB_DEF_DATE_FMT);
 			return 1;

ext/pdo_firebird/firebird_statement.c

@@ -304,27 +304,14 @@ static int pdo_firebird_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */
 	pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt->driver_data;
 	struct pdo_column_data *col = &stmt->columns[colno];
 	XSQLVAR *var = &S->out_sqlda.sqlvar[colno];
-	int colname_len;
-	char *cp;
 
 	if ((var->sqltype & ~1) == SQL_TEXT) {
 		var->sqltype = SQL_VARYING | (var->sqltype & 1);
 	}
-	colname_len = (S->H->fetch_table_names && var->relname_length)
-					? (var->aliasname_length + var->relname_length + 1)
-					: (var->aliasname_length);
 	col->precision = -var->sqlscale;
 	col->maxlen = var->sqllen;
-	col->name = zend_string_alloc(colname_len, 0);
+	col->name = zend_string_init(var->aliasname, var->aliasname_length, 0);
 	col->table = zend_string_init(var->relname, var->relname_length, 0);
-	cp = ZSTR_VAL(col->name);
-	if (colname_len > var->aliasname_length) {
-		memmove(cp, var->relname, var->relname_length);
-		cp += var->relname_length;
-		*cp++ = '.';
-	}
-	memmove(cp, var->aliasname, var->aliasname_length);
-	*(cp+var->aliasname_length) = '\0';
 
 	return 1;
 }

ext/pdo_firebird/php_pdo_firebird_int.h

@@ -77,10 +77,7 @@ typedef struct {
 
 	unsigned sql_dialect:2;
 
-	/* prepend table names on column names in fetch */
-	unsigned fetch_table_names:1;
-
-	unsigned _reserved:29;
+	unsigned _reserved:30;
 
 	pdo_firebird_error_info einfo;
 } pdo_firebird_db_handle;

ext/pdo_mysql/mysql_driver.c

@@ -460,13 +460,6 @@ static bool pdo_mysql_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *val)
 			((pdo_mysql_db_handle *)dbh->driver_data)->emulate_prepare = bval;
 			PDO_DBG_RETURN(true);
 
-		case PDO_ATTR_FETCH_TABLE_NAMES:
-			if (!pdo_get_bool_param(&bval, val)) {
-				PDO_DBG_RETURN(false);
-			}
-			((pdo_mysql_db_handle *)dbh->driver_data)->fetch_table_names = bval;
-			PDO_DBG_RETURN(true);
-
 #ifdef PDO_USE_MYSQLND
 		case PDO_ATTR_STRINGIFY_FETCHES:
 			if (!pdo_get_bool_param(&bval, val)) {
@@ -583,10 +576,6 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
 		}
 #endif
 
-		case PDO_ATTR_FETCH_TABLE_NAMES:
-			ZVAL_BOOL(return_value, H->fetch_table_names);
-			break;
-
 		default:
 			PDO_DBG_RETURN(0);
 	}

ext/pdo_mysql/mysql_statement.c

@@ -644,16 +644,12 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */
 	}
 	for (i = 0; i < stmt->column_count; i++) {
 
-		if (S->H->fetch_table_names) {
-			cols[i].name = strpprintf(0, "%s.%s", S->fields[i].table, S->fields[i].name);
-		} else {
 #ifdef PDO_USE_MYSQLND
-			cols[i].name = zend_string_copy(S->fields[i].sname);
+		cols[i].name = zend_string_copy(S->fields[i].sname);
 #else
-			cols[i].name = zend_string_init(S->fields[i].name, S->fields[i].name_length, 0);
+		cols[i].name = zend_string_init(S->fields[i].name, S->fields[i].name_length, 0);
 #endif
-			cols[i].table = zend_string_init(S->fields[i].table, S->fields[i].table_length, 0);
-		}
+		cols[i].table = zend_string_init(S->fields[i].table, S->fields[i].table_length, 0);
 
 		cols[i].precision = S->fields[i].decimals;
 		cols[i].maxlen = S->fields[i].length;

ext/pdo_mysql/php_pdo_mysql_int.h

@@ -103,7 +103,6 @@ typedef struct {
 	unsigned attached:1;
 	unsigned buffered:1;
 	unsigned emulate_prepare:1;
-	unsigned fetch_table_names:1;
 	unsigned local_infile:1;
 #ifndef PDO_USE_MYSQLND
 	zend_ulong max_buffer_size;