Justtechjobs.com Find a programming school near you






Online Campus Both


php4-beta | 199912

[PHP4BETA] cvs: /php4/ext/odbc php_odbc.c php_odbc.h From: Andreas Karajannis (Andreas.Karajannis <email protected>)
Date: 12/11/99

kara Sat Dec 11 05:57:12 1999 EDT

  Modified files:
    /php4/ext/odbc php_odbc.c php_odbc.h
  Log:
  Don't include functions not supported by Solid
  
  
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.15 php4/ext/odbc/php_odbc.c:1.16
--- php4/ext/odbc/php_odbc.c:1.15 Thu Dec 9 04:59:17 1999
+++ php4/ext/odbc/php_odbc.c Sat Dec 11 05:56:41 1999
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_odbc.c,v 1.15 1999/12/09 09:59:17 lurcher Exp $ */
+/* $Id: php_odbc.c,v 1.16 1999/12/11 10:56:41 kara Exp $ */
 
 #if COMPILE_DL
 #include "dl/phpdl.h"
@@ -99,19 +99,19 @@
         PHP_FE(odbc_define, NULL)*/
         PHP_FE(odbc_tables, NULL)
         PHP_FE(odbc_columns, NULL)
-#ifndef HAVE_DBMAKER /* not supported now */
+ PHP_FE(odbc_gettypeinfo, NULL)
+ PHP_FE(odbc_primarykeys, NULL)
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) /* not supported now */
         PHP_FE(odbc_columnprivileges, NULL)
+ PHP_FE(odbc_tableprivileges, NULL)
 #endif
+#if !defined(HAVE_SOLID) /* not supported */
         PHP_FE(odbc_foreignkeys, NULL)
- PHP_FE(odbc_gettypeinfo, NULL)
- PHP_FE(odbc_primarykeys, NULL)
- PHP_FE(odbc_procedurecolumns, NULL)
         PHP_FE(odbc_procedures, NULL)
+ PHP_FE(odbc_procedurecolumns, NULL)
+#endif
         PHP_FE(odbc_specialcolumns, NULL)
         PHP_FE(odbc_statistics, NULL)
-#ifndef HAVE_DBMAKER /* not supported now */
- PHP_FE(odbc_tableprivileges, NULL)
-#endif
         PHP_FALIAS(odbc_do, odbc_exec, NULL)
         { NULL, NULL, NULL }
 };
@@ -2323,7 +2323,7 @@
 }
 /* }}} */
 
-#ifndef HAVE_DBMAKER
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID)
 /* {{{ proto int odbc_columnprivileges(int connection_id, string catalog, string schema, string table, string column )
    call the SQLColumnPrivileges function */
 PHP_FUNCTION(odbc_columnprivileges)
@@ -2401,8 +2401,9 @@
         ZEND_REGISTER_RESOURCE(return_value, result, le_result);
 }
 /* }}} */
-#endif /* HAVE_DBMAKER */
+#endif /* HAVE_DBMAKER || HAVE_SOLID*/
 
+#if !defined(HAVE_SOLID)
 /* {{{ proto int odbc_foreignkeys(int connection_id, string pk_catalog, string pk_schema, string pk_table, string fk_catalog, string fk_schema, string fk_table )
    call the SQLForeignKeys function */
 PHP_FUNCTION(odbc_foreignkeys)
@@ -2500,6 +2501,7 @@
         ZEND_REGISTER_RESOURCE(return_value, result, le_result);
 }
 /* }}} */
+#endif /* HAVE_SOLID */
 
 /* {{{ proto int odbc_gettypeinfo(int connection_id [, int data_type ] )
    call the SQLGetTypeInfo function */
@@ -2648,6 +2650,7 @@
 }
 /* }}} */
 
+#if !defined(HAVE_SOLID)
 /* {{{ proto int odbc_procedurecolumns(int connection_id [, string database, string schema, string proc, string column ] )
    call the SQLProcedureColumns function */
 PHP_FUNCTION(odbc_procedurecolumns)
@@ -2729,7 +2732,9 @@
         ZEND_REGISTER_RESOURCE(return_value, result, le_result);
 }
 /* }}} */
+#endif /* HAVE_SOLID */
 
+#if !defined(HAVE_SOLID)
 /* {{{ proto int odbc_procedures(int connection_id [, string database, string schema, string proc ] )
    call the SQLProcedures function */
 PHP_FUNCTION(odbc_procedures)
@@ -2808,6 +2813,7 @@
         ZEND_REGISTER_RESOURCE(return_value, result, le_result);
 }
 /* }}} */
+#endif /* HAVE_SOLID */
 
 /* {{{ proto int odbc_specialcolumns(int connection_id, int type, string catalog, string schema, string name, int scope, int nullable )
    call the SQLSpecialColumns function */
@@ -2981,7 +2987,7 @@
 }
 /* }}} */
 
-#ifndef HAVE_DBMAKER
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID)
 /* {{{ proto int odbc_tableprivilegess(int connection_id, string catalog, string schema, string table )
    call the SQLTablePrivilegess function */
 PHP_FUNCTION(odbc_tableprivileges)
Index: php4/ext/odbc/php_odbc.h
diff -u php4/ext/odbc/php_odbc.h:1.9 php4/ext/odbc/php_odbc.h:1.10
--- php4/ext/odbc/php_odbc.h:1.9 Tue Nov 30 07:41:36 1999
+++ php4/ext/odbc/php_odbc.h Sat Dec 11 05:56:42 1999
@@ -28,7 +28,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_odbc.h,v 1.9 1999/11/30 12:41:36 lurcher Exp $ */
+/* $Id: php_odbc.h,v 1.10 1999/12/11 10:56:42 kara Exp $ */
 
 #ifndef _PHP_ODBC_H
 #define _PHP_ODBC_H
@@ -189,15 +189,19 @@
 */
 PHP_FUNCTION(odbc_tables);
 PHP_FUNCTION(odbc_columns);
+#if !defined(HAVE_DBMAKER) && !defined(HAVE_SOLID) /* not supported now */
 PHP_FUNCTION(odbc_columnprivileges);
+PHP_FUNCTION(odbc_tableprivileges);
+#endif
+#if !defined(HAVE_SOLID) /* not supported */
 PHP_FUNCTION(odbc_foreignkeys);
+PHP_FUNCTION(odbc_procedures);
+PHP_FUNCTION(odbc_procedurecolumns);
+#endif
 PHP_FUNCTION(odbc_gettypeinfo);
 PHP_FUNCTION(odbc_primarykeys);
-PHP_FUNCTION(odbc_procedurecolumns);
-PHP_FUNCTION(odbc_procedures);
 PHP_FUNCTION(odbc_specialcolumns);
 PHP_FUNCTION(odbc_statistics);
-PHP_FUNCTION(odbc_tableprivileges);
 
 typedef struct odbc_connection {
 #if defined( HAVE_IBMDB2 ) || defined( HAVE_UNIXODBC ) 

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: php4beta-unsubscribe <email protected>
For additional commands, e-mail: php4beta-help <email protected>
To contact the list administrators, e-mail: php4beta-admin <email protected>