[PHP-CVS] cvs: php4 /ext/fbsql php_fbsql.c

[Frank M. Kromann]

fmk             Thu Mar 22 13:16:23 2001 EDT

  Modified files:              
    /php4/ext/fbsql     php_fbsql.c 
  Log:
  Adding warning when query fails
  
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.5 php4/ext/fbsql/php_fbsql.c:1.6
--- php4/ext/fbsql/php_fbsql.c:1.5      Wed Mar 21 13:53:45 2001
+++ php4/ext/fbsql/php_fbsql.c  Thu Mar 22 13:16:23 2001
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_fbsql.c,v 1.5 2001/03/21 21:53:45 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.6 2001/03/22 21:16:23 fmk Exp $ */
 
 /* TODO:
  *
@@ -788,7 +788,6 @@
                        fbcdcClose(c);
                        fbcdcRelease(c);
                        free(result);
-/*                     printf("Returning Null\n"); */
                        return NULL;
                }
                result->retainCount      = 2;
@@ -813,7 +812,6 @@
                link->databases[i] = result;
 
                FB_SQL_G(databaseCount)++;
-/*             printf("Return database %x %x\n",result,c); */
        }
        link->currentDatabase     = result;
        return_value->value.lval  = result->index;
@@ -1514,6 +1512,26 @@
        FBSQLLS_FETCH();
 
        meta     = fbcdcExecuteDirectSQL(database->connection,sql);
+
+       if (fbcmdErrorCount(meta) > 0) {
+               FBCErrorMetaData *errorMeta;
+               char             *errorMessage;
+               unsigned         error_type = 0;
+
+               errorMeta = fbcdcErrorMetaData(database->connection, meta);
+               error_type = fbcemdErrorCodeAtIndex(errorMeta, 0);
+               errorMessage = fbcemdAllErrorMessages(errorMeta);
+               if (error_type != 250) {
+                       php_error(E_WARNING, "Error executing SQL-statement (%s)", 
+sql);
+               }
+//             free(errorMessage);
+               fbcemdRelease(errorMeta);
+
+               if (error_type != 250) {
+                       fbcmdRelease(meta);
+                       return NULL;
+               }
+       }
 
        if (fbcmdHasMetaDataArray(meta)) {
                sR = fbcmdMetaDataArrayCount(meta);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]