Adding SQL statement to the warning

fmk · fmk · commit 300ac8c23830 · 2001-08-10T20:34:05.000Z
diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
@@ -1449,7 +1449,7 @@ PHP_FUNCTION(fbsql_db_status)
 
 /* {{{ mdOk
  */
-int mdOk(PHPFBLink* link, FBCMetaData* md)
+int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql)
 {
 	FBCDatabaseConnection* c = link->connection;
 	int result = 1;
@@ -1475,7 +1475,7 @@ int mdOk(PHPFBLink* link, FBCMetaData* md)
 		if (FB_SQL_G(generateWarnings))
 		{
 			if (emg)
-				php_error(E_WARNING, emg);
+				php_error(E_WARNING, "Error in statement: '%s' %s", sql, emg);
 			else
 				php_error(E_WARNING,"No message");
 		}
@@ -1499,7 +1499,7 @@ static void phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link)
 
 	meta     = fbcdcExecuteDirectSQL(link->connection, sql);
 
-	if (!mdOk(link, meta))
+	if (!mdOk(link, meta, sql))
 	{
 		fbcmdRelease(meta);
 		ZVAL_BOOL(return_value, 0)

Original file line number	Diff line number	Diff line change
`@@ -1449,7 +1449,7 @@ PHP_FUNCTION(fbsql_db_status)`
`1449`	`1449`
`1450`	`1450`	`/* {{{ mdOk`
`1451`	`1451`	`*/`
`1452`		`-int mdOk(PHPFBLink* link, FBCMetaData* md)`
	`1452`	`+int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql)`
`1453`	`1453`	`{`
`1454`	`1454`	`FBCDatabaseConnection* c = link->connection;`
`1455`	`1455`	`int result = 1;`
`@@ -1475,7 +1475,7 @@ int mdOk(PHPFBLink* link, FBCMetaData* md)`
`1475`	`1475`	`if (FB_SQL_G(generateWarnings))`
`1476`	`1476`	`{`
`1477`	`1477`	`if (emg)`
`1478`		`- php_error(E_WARNING, emg);`
	`1478`	`+ php_error(E_WARNING, "Error in statement: '%s' %s", sql, emg);`
`1479`	`1479`	`else`
`1480`	`1480`	`php_error(E_WARNING,"No message");`
`1481`	`1481`	`}`
`@@ -1499,7 +1499,7 @@ static void phpfbQuery(INTERNAL_FUNCTION_PARAMETERS, char* sql, PHPFBLink* link)`
`1499`	`1499`
`1500`	`1500`	`meta = fbcdcExecuteDirectSQL(link->connection, sql);`
`1501`	`1501`
`1502`		`- if (!mdOk(link, meta))`
	`1502`	`+ if (!mdOk(link, meta, sql))`
`1503`	`1503`	`{`
`1504`	`1504`	`fbcmdRelease(meta);`
`1505`	`1505`	`ZVAL_BOOL(return_value, 0)`