Changed to get sqlstatus and output appropriate error message

Author: SakiTakamachi

ext/pdo_firebird/firebird_driver.c

@@ -460,16 +460,65 @@ int preprocess(const zend_string* sql, char* sql_out, HashTable* named_params)
 }
 
 /* map driver specific error message to PDO error */
-void _firebird_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, char const *file, zend_long line) /* {{{ */
+void _firebird_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *errState, const char *msg, char const *file, int line) /* {{{ */
 {
-	pdo_error_type *const error_code = stmt ? &stmt->error_code : &dbh->error_code;
+	pdo_error_type *const err_state = stmt ? &stmt->error_code : &dbh->error_code;
+	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
+	pdo_firebird_error_info *einfo = &H->einfo;
+	zend_long sqlcode = -999;
+
+	einfo->file = file;
+	einfo->line = line;
+
+	if (einfo->errmsg) {
+		pefree(einfo->errmsg, dbh->is_persistent);
+		einfo->errmsg = NULL;
+	}
+
+	if (H->isc_status && (H->isc_status[0] == 1 && H->isc_status[1] > 0)) {
+		char buf[512];
+		size_t buf_size = sizeof(buf), read_len = 0, tmp_len;
+		const ISC_STATUS *s = H->isc_status;
+		sqlcode = isc_sqlcode(s);
+
+		while ((buf_size > (read_len + 1)) && (tmp_len = fb_interpret(&buf[read_len], (buf_size - read_len - 1), &s))) {
+			read_len += tmp_len;
+			strcpy(&buf[read_len++], " ");
+		}
+
+		/* remove last space */
+		if (read_len) {
+			buf[read_len - 1] = '\0';
+		}
+
+		einfo->errmsg = pestrdup(buf, dbh->is_persistent);
+
+#if FB_API_VER >= 25
+		char sqlstate[sizeof(pdo_error_type)];
+		fb_sqlstate(sqlstate, H->isc_status);
+		if (sqlstate != NULL && strlen(sqlstate) < sizeof(pdo_error_type)) {
+			strcpy(*err_state, sqlstate);
+			goto end;
+		}
+#endif
+	} else if (msg) {
+		einfo->errmsg = pestrdup(msg, dbh->is_persistent);
+	}
+
+	if (errState) {
+		strcpy(*err_state, errState);
+	} else {
+		strcpy(*err_state, "HY000");
+	}
 
-	strcpy(*error_code, "HY000");
+end:
+	einfo->errcode = sqlcode;
+	if (!dbh->methods) {
+		pdo_throw_exception(0, einfo->errmsg, err_state);
+	}
 }
 /* }}} */
 
-#define RECORD_ERROR(dbh) _firebird_error(dbh, NULL, __FILE__, __LINE__)
-
 /* called by PDO to close a db handle */
 static void firebird_handle_closer(pdo_dbh_t *dbh) /* {{{ */
 {
@@ -478,17 +527,17 @@ static void firebird_handle_closer(pdo_dbh_t *dbh) /* {{{ */
 	if (dbh->in_txn) {
 		if (dbh->auto_commit) {
 			if (isc_commit_transaction(H->isc_status, &H->tr)) {
-				RECORD_ERROR(dbh);
+				firebird_error(dbh);
 			}
 		} else {
 			if (isc_rollback_transaction(H->isc_status, &H->tr)) {
-				RECORD_ERROR(dbh);
+				firebird_error(dbh);
 			}
 		}
 	}
 
 	if (isc_detach_database(H->isc_status, &H->db)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 	}
 
 	if (H->date_format) {
@@ -501,6 +550,11 @@ static void firebird_handle_closer(pdo_dbh_t *dbh) /* {{{ */
 		efree(H->timestamp_format);
 	}
 
+	if (H->einfo.errmsg) {
+		pefree(H->einfo.errmsg, dbh->is_persistent);
+		H->einfo.errmsg = NULL;
+	}
+
 	pefree(H, dbh->is_persistent);
 }
 /* }}} */
@@ -547,7 +601,7 @@ static bool firebird_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, /* {{{ */
 
 		/* fill the output sqlda with information about the prepared query */
 		if (isc_dsql_describe(H->isc_status, &s, PDO_FB_SQLDA_VERSION, &S->out_sqlda)) {
-			RECORD_ERROR(dbh);
+			firebird_error(dbh);
 			break;
 		}
 
@@ -574,7 +628,7 @@ static bool firebird_handle_preparer(pdo_dbh_t *dbh, zend_string *sql, /* {{{ */
 
 	} while (0);
 
-	RECORD_ERROR(dbh);
+	firebird_error(dbh);
 
 	zend_hash_destroy(np);
 	FREE_HASHTABLE(np);
@@ -612,15 +666,15 @@ static zend_long firebird_handle_doer(pdo_dbh_t *dbh, const zend_string *sql) /*
 
 	/* execute the statement */
 	if (isc_dsql_execute2(H->isc_status, &H->tr, &stmt, PDO_FB_SQLDA_VERSION, &in_sqlda, &out_sqlda)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		ret = -1;
 		goto free_statement;
 	}
 
 	/* find out how many rows were affected */
 	if (isc_dsql_sql_info(H->isc_status, &stmt, sizeof(info_count), const_cast(info_count),
 			sizeof(result),	result)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		ret = -1;
 		goto free_statement;
 	}
@@ -648,13 +702,13 @@ static zend_long firebird_handle_doer(pdo_dbh_t *dbh, const zend_string *sql) /*
 
 	/* commit if we're in auto_commit mode */
 	if (dbh->auto_commit && isc_commit_retaining(H->isc_status, &H->tr)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 	}
 
 free_statement:
 
 	if (isc_dsql_free_statement(H->isc_status, &stmt, DSQL_drop)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 	}
 
 	return ret;
@@ -746,7 +800,7 @@ static bool firebird_handle_begin(pdo_dbh_t *dbh) /* {{{ */
 	}
 #endif
 	if (isc_start_transaction(H->isc_status, &H->tr, 1, &H->db, (unsigned short)(ptpb-tpb), tpb)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		return false;
 	}
 	return true;
@@ -759,7 +813,7 @@ static bool firebird_handle_commit(pdo_dbh_t *dbh) /* {{{ */
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 
 	if (isc_commit_transaction(H->isc_status, &H->tr)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		return false;
 	}
 	return true;
@@ -772,7 +826,7 @@ static bool firebird_handle_rollback(pdo_dbh_t *dbh) /* {{{ */
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
 
 	if (isc_rollback_transaction(H->isc_status, &H->tr)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		return false;
 	}
 	return true;
@@ -804,7 +858,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const zend_string *sql,
 
 	/* allocate the statement */
 	if (isc_dsql_allocate_statement(H->isc_status, &H->db, s)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		return 0;
 	}
 
@@ -820,7 +874,7 @@ static int firebird_alloc_prepare_stmt(pdo_dbh_t *dbh, const zend_string *sql,
 
 	/* prepare the statement */
 	if (isc_dsql_prepare(H->isc_status, &H->tr, s, 0, new_sql, H->sql_dialect, out_sqlda)) {
-		RECORD_ERROR(dbh);
+		firebird_error(dbh);
 		efree(new_sql);
 		return 0;
 	}
@@ -848,7 +902,7 @@ static bool firebird_handle_set_attribute(pdo_dbh_t *dbh, zend_long attr, zval *
 						if (bval) {
 							/* turning on auto_commit with an open transaction is illegal, because
 							   we won't know what to do with it */
-							H->last_app_error = "Cannot enable auto-commit while a transaction is already open";
+							firebird_error_with_info(dbh, "HY000", "Cannot enable auto-commit while a transaction is already open");
 							return false;
 						} else {
 							/* close the transaction */
@@ -992,21 +1046,11 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v
 static void pdo_firebird_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info) /* {{{ */
 {
 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
-	const ISC_STATUS *s = H->isc_status;
-	char buf[400];
-	zend_long i = 0, l, sqlcode = isc_sqlcode(s);
-
-	if (sqlcode) {
-		add_next_index_long(info, sqlcode);
-
-		while ((sizeof(buf)>(i+2))&&(l = fb_interpret(&buf[i],(sizeof(buf)-i-2),&s))) {
-			i += l;
-			strcpy(&buf[i++], " ");
-		}
-		add_next_index_string(info, buf);
-	} else if (H->last_app_error) {
-		add_next_index_long(info, -999);
-		add_next_index_string(info, const_cast(H->last_app_error));
+	if (H->einfo.errcode != IS_NULL) {
+		add_next_index_long(info, H->einfo.errcode);
+	}
+	if (H->einfo.errmsg) {
+		add_next_index_string(info, H->einfo.errmsg);
 	}
 }
 /* }}} */