First cut at making a working DBX driver.

diff --git a/dialup_admin/lib/sql/drivers/pg/functions.php3 b/dialup_admin/lib/sql/drivers/pg/functions.php3
index f3cfc62..655aedd 100644 (file)
--- a/dialup_admin/lib/sql/drivers/pg/functions.php3
+++ b/dialup_admin/lib/sql/drivers/pg/functions.php3
@@ -10,11 +10,9 @@ function da_sql_host_connect($server,$config)
                $SQL_user = $config[sql_username];
                $SQL_passwd = $config[sql_password];
        }
-       if ($config[sql_debug] == 'true')
-               print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
-       return @pg_connect("host=$server port=$config[sql_port]
-                       dbname=$config[sql_database] user=$SQL_user
-                       password=$SQL_passwd");
+       // FIXME: This function is still Postgres specific. Needs to be configurable.
+       return @dbx_connect(DBX_PGSQL, "$server", "$config[sql_database]",
+                       "$SQL_user", "$SQL_passwd", DBX_PERSISTENT);
 }
 
 function da_sql_connect($config)
@@ -28,11 +26,9 @@ function da_sql_connect($config)
                $SQL_user = $config[sql_username];
                $SQL_passwd = $config[sql_password];
        }
-       if ($config[sql_debug] == 'true')
-               print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
-       return @pg_connect("host=$config[sql_server] port=$config[sql_port]
-                       dbname=$config[sql_database] user=$SQL_user
-                       password=$SQL_passwd");
+       // FIXME: This function is still Postgres specific. Needs to be configurable.
+       return @dbx_connect(DBX_PGSQL, "$server", "$config[sql_database]",
+                       "$SQL_user", "$SQL_passwd");
 }
 
 function da_sql_pconnect($config)
@@ -46,16 +42,14 @@ function da_sql_pconnect($config)
                $SQL_user = $config[sql_username];
                $SQL_passwd = $config[sql_password];
        }
-       if ($config[sql_debug] == 'true')
-               print "<b>DEBUG(SQL,MYSQL DRIVER): Connect: User=$SQL_user,Password=$SQL_passwd </b><br>\n";
-       return @pg_pconnect("host=$config[sql_server] port=$config[sql_port]
-                       dbname=$config[sql_database] user=$SQL_user
-                       password=$SQL_passwd");
+       // FIXME: This function is still Postgres specific. Needs to be configurable.
+       return @dbx_connect(DBX_PGSQL, "$server", "$config[sql_database]",
+                       "$SQL_user", "$SQL_passwd", DBX_PERSISTENT);
 }
 
 function da_sql_close($link,$config)
 {
-       @pg_close($link);
+       @dbx_close($link);
 }
 
 function da_sql_escape_string($string)
@@ -65,56 +59,56 @@ function da_sql_escape_string($string)
 
 function da_sql_query($link,$config,$query)
 {
-       if ($config[sql_debug] == 'true')
+       if ($config[sql_debug] == 'true') {
                print "<b>DEBUG(SQL,PG DRIVER): Query: <i>$query</i></b><br>\n";
-       return @pg_exec($link,$query);
+       }
+       return @dbx_query($link,$query);
 }
 
 function da_sql_num_rows($result,$config)
 {
        if ($config[sql_debug] == 'true')
-               print "<b>DEBUG(SQL,PG DRIVER): Query Result: Num rows:: " . @pg_numrows($result) . "</b><br>\n";
-       return @pg_numrows($result);
+               print "<b>DEBUG(SQL,PG DRIVER): Query Result: Num rows:: " . $result->rows . "</b><br>\n";
+       return $result->rows;
 }
 
+$dbx_global_record_counter = array() ;
 function da_sql_fetch_array($result,$config)
 {
-       $row = @pg_fetch_array($result,$config[tmp_pg_array_num][$result]++,PGSQL_ASSOC);
-       if ($row && $config[sql_debug] == 'true'){
-               print "<b>DEBUG(SQL,PG DRIVER): Query Result: <pre>";
-               print_r($row);
-               print  "</b></pre>\n";
+
+       global $dbx_global_record_counter;
+       if (!$dbx_global_record_counter[$result->handle]){
+               $dbx_global_record_counter[$result->handle] = 0;
+       }
+
+       if ($dbx_global_record_counter[$result->handle] <= $result->rows - 1 ){
+               return $result->data[$dbx_global_record_counter[$result->handle]++];
+       } elseif ($dbx_global_record_counter[$result->handle] > $result->rows - 1 ) {
+               $dbx_global_record_counter[$result->handle]++;
+               return NULL;
+       } else {
+               $dbx_global_record_counter[$result->handle]++;
+               return FALSE;
        }
-       if (!$row)
-               $config[tmp_pg_array_num][$result] = 0;
-       return $row;
 }
 
 function da_sql_affected_rows($link,$result,$config)
 {
+       // FIXME: This function is still Postgres specific.
        if ($config[sql_debug] == 'true')
-               print "<b>DEBUG(SQL,PG DRIVER): Query Result: Affected rows:: " . @pg_cmdtuples($result) . "</b><br>\n";
-       return @pg_cmdtuples($result);
+               print "<b>DEBUG(SQL,PG DRIVER): Query Result: Affected rows:: " . @pg_cmdtuples($result->handle) . "</b><br>\n";
+       return @pg_cmdtuples($result->handle);
 }
 
 function da_sql_list_fields($table,$link,$config)
 {
-       $res = @pg_exec($link,
-               "select count(*) from pg_attribute where attnum > '0' and
-               attrelid = (select oid from pg_class where relname='$table');");
+       $res = @dbx_query($link,"SELECT * FROM ".$table." LIMIT 1 ;"); 
        if ($res){
-               $row = @pg_fetch_row($res,0);
-               if ($row){
-                       if (!$row[0])
-                               return NULL;
-                       $fields[num] = $row[0];
-               }
+               $fields[num] = $res->cols;
        }
-       $res = @pg_exec($link,
-               "select attname from pg_attribute where attnum > '0' and
-               attrelid = (select oid from pg_class where relname='$table');");
+       $res = @dbx_query($link,"SELECT * FROM ".$table." LIMIT 1 ;");
        if ($res)
-               $fields[res]=$res;
+               $fields[res] = $res->info[name];
        else
                return NULL;
 
@@ -129,15 +123,12 @@ function da_sql_num_fields($fields,$config)
 
 function da_sql_field_name($fields,$num,$config)
 {
-       if ($fields){
-               $row = @pg_fetch_row($fields[res],$num);        
-               if ($row)
-                       return $row[0];
-       }
+       if ($fields)
+               return $fields[res][$num];
 }
 
 function da_sql_error($link,$config)
 {
-       return pg_errormessage($link);
+       return dbx_error($link);
 }
 ?>