Added PDO-native firebird driver

Renamed ibase_* based driver to firebird-ibase.php

sys/databases/firebird-ibase.php

@@ -0,0 +1,439 @@
+<?php
+/**
+ * OpenSQLManager
+ *
+ * Free Database manager for Open Source Databases
+ *
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/OpenSQLManager
+ * @license 	http://philsturgeon.co.uk/code/dbad-license 
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * Firebird Database class
+ * 
+ * PDO-firebird isn't stable, so this is a wrapper of the ibase_ public functions.
+ */
+class firebird extends DB_PDO {
+
+	protected $conn, $statement, $trans, $count, $result;
+	
+	/**
+	 * Open the link to the database
+	 * 
+	 * @param string $db
+	 * @param string $user 
+	 * @param string $pass
+	 */
+	public function __construct($dbpath, $user='sysdba', $pass='masterkey')
+	{
+		$this->conn = ibase_connect($dbpath, $user, $pass, 'utf-8');
+		
+		$class = __CLASS__."_sql";
+		$this->sql = new $class;
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Close the link to the database
+	 */
+	public function __destruct()
+	{
+		@ibase_close($this->conn);
+		@ibase_free_result($this->statement);
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Empty a database table
+	 * 
+	 * @param string $table
+	 */
+	public function truncate($table)
+	{
+		// Firebird lacka a truncate command
+		$sql = 'DELETE FROM "'.$table.'"';
+		$this->query($sql);
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Wrapper public function to better match PDO
+	 *
+	 * @param string $sql
+	 * @param  array $params
+	 * @return $this
+	 */
+	public function query($sql)
+	{
+		$this->count = 0;
+		$this->statement = ibase_query($this->conn, $sql);
+		return $this->statement;
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Emulate PDO fetch public function
+	 * 
+	 * @param  int $fetch_style
+	 * @return mixed
+	 */
+	public function fetch($fetch_style=PDO::FETCH_ASSOC)
+	{
+		switch($fetch_style)
+		{
+			case PDO::FETCH_OBJ:
+				return ibase_fetch_object($this->statement, IBASE_FETCH_BLOBS);
+			break;
+
+			case PDO::FETCH_NUM:
+				return ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS);
+			break;
+
+			default:
+				return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
+			break;
+		}
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Emulate PDO fetchAll public function
+	 * 
+	 * @param  int  $fetch_style
+	 * @return mixed
+	 */
+	public function fetchAll($fetch_style=PDO::FETCH_ASSOC)
+	{
+		$all = array();
+
+		while($row = $this->fetch($fetch_style))
+		{
+			$all[] = $row;
+		}
+		
+		$this->result = $all;
+
+		return $all;
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Emulate PDO prepare
+	 *
+	 * @param string $query
+	 * @return $this
+	 */
+	public function prepare($query, $options=NULL)
+	{
+		$this->statement = ibase_prepare($this->conn, $query);
+		return $this->statement;
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * List tables for the current database
+	 * 
+	 * @return array
+	 */
+	public function get_tables()
+	{	
+		$sql = <<<SQL
+			SELECT "RDB\$RELATION_NAME" FROM "RDB\$RELATIONS" 
+			WHERE "RDB\$RELATION_NAME" NOT LIKE 'RDB$%'
+			AND "RDB\$RELATION_NAME" NOT LIKE 'MON$%'
+SQL;
+
+		$this->statement = $this->query($sql);
+		
+		$tables = array();
+		
+		while($row = $this->fetch(PDO::FETCH_ASSOC))
+		{
+			$tables[] = $row['RDB$RELATION_NAME'];
+		}
+		
+		return $tables;
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * List system tables for the current database
+	 * 
+	 * @return array
+	 */
+	public function get_system_tables()
+	{
+		$sql = <<<SQL
+			SELECT "RDB\$RELATION_NAME" FROM "RDB\$RELATIONS"
+			WHERE "RDB\$RELATION_NAME" LIKE 'RDB$%'
+			OR "RDB\$RELATION_NAME" LIKE 'MON$%';
+SQL;
+
+		$this->statement = $this->query($sql);
+
+		$tables = array();
+
+		while($row = $this->fetch(PDO::FETCH_ASSOC))
+		{
+			$tables[] = $row['RDB$RELATION_NAME'];
+		}
+		
+		return $tables;
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Return the number of rows affected by the previous query
+	 * 
+	 * @return int
+	 */
+	public function affected_rows($statement="")
+	{
+		return ibase_affected_rows($this->conn);
+	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Return the number of rows returned for a SELECT query
+	 * 
+	 * @return int
+	 */
+	public function num_rows()
+	{
+		// @todo: Redo this similar to the codeigniter driver
+		if(isset($this->result))
+		{
+			return count($this->result);
+		}
+
+		//Fetch all the rows for the result
+		$this->result = $this->fetchAll();
+
+		return count($this->result);
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Start a database transaction
+	 * 
+	 * @return bool
+	 */
+	public function beginTransaction()
+	{
+		if(($this->trans =& ibase_trans($this->conn)) !== NULL)
+		{
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Commit a database transaction
+	 * 
+	 * @return bool
+	 */
+	public function commit()
+	{
+		return ibase_commit($this->trans);
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Rollback a transaction
+	 * 
+	 * @return bool
+	 */
+	public function rollBack()
+	{
+		return ibase_rollback($this->trans);
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Run a prepared statement query
+	 * 
+	 * @param  array $args
+	 * @return bool
+	 */
+	public function execute($args)
+	{
+		//Add the prepared statement as the first parameter
+		array_unshift($args, $this->statement);
+		
+		// Let php do all the hard stuff in converting 
+		// the array of arguments into a list of arguments
+		return call_user_func_array('ibase_execute', $args);
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Prepare and execute a query
+	 *
+	 * @param string $sql
+	 * @param array $args
+	 * @return resource
+	 */
+	public function prepare_execute($sql, $args)
+	{
+		$query = $this->prepare($sql);
+		
+		// Set the statement in the class variable for easy later access
+		$this->statement =& $query;
+		
+		return $this->execute($args);
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Method to emulate PDO->quote
+	 * 
+	 * @param string $str
+	 * @return string
+	 */
+	public function quote($str, $param_type=NULL)
+	{
+		if(is_numeric($str))
+		{
+			return $str;
+		}
+
+		return "'".str_replace("'", "''", $str)."'";
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Method to emulate PDO->errorInfo / PDOStatement->errorInfo
+	 *
+	 * @return array
+	 */
+	public function errorInfo()
+	{
+		$code = ibase_errcode();
+		$msg = ibase_errmsg();
+
+		return array(0, $code, $msg);
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Bind a prepared query with arguments for executing
+	 *
+	 * @param string $sql
+	 * @param mixed $args
+	 * @return FALSE
+	 */
+	public function prepare_query($sql, $args)
+	{
+		// You can't bind query statements before execution with
+		// the firebird database
+		return FALSE;
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Create an SQL backup file for the current database's structure
+	 *
+	 * @return string
+	 */
+	public function backup_structure()
+	{
+		// @todo Implement Backup function
+		return '';	
+	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Create an SQL backup file for the current database's data
+	 *
+	 * @param array $exclude
+	 * @param bool $system_tables
+	 * @return string
+	 */
+	public function backup_data($exclude=array(), $system_tables=FALSE)
+	{
+		// Determine which tables to use
+		if($system_tables == TRUE)
+		{
+			$tables = array_merge($this->get_system_tables(), $this->get_tables());
+		}
+		else
+		{
+			$tables = $this->get_tables();
+		}
+		
+		// Filter out the tables you don't want
+		if( ! empty($exclude))
+		{
+			$tables = array_diff($tables, $exclude);
+		}
+		
+		$output_sql = '';
+		
+		// Get the data for each object
+		foreach($tables as $t)
+		{
+			$sql = 'SELECT * FROM "'.trim($t).'"';
+			$res = $this->query($sql);
+			$obj_res = $this->fetchAll(PDO::FETCH_ASSOC);
+			
+			unset($res);
+			
+			// Nab the column names by getting the keys of the first row
+			$columns = @array_keys($obj_res[0]);
+			
+			$insert_rows = array();
+			
+			// Create the insert statements
+			foreach($obj_res as $row)
+			{
+				$row = array_values($row);
+			
+				// Quote values as needed by type
+				if(stripos($t, 'RDB$') === FALSE)
+				{
+					$row = array_map(array(&$this, 'quote'), $row);
+					$row = array_map('trim', $row);
+				}
+				
+				$row_string = 'INSERT INTO "'.trim($t).'" ("'.implode('","', $columns).'") VALUES ('.implode(',', $row).');';
+				
+				unset($row);
+				
+				$insert_rows[] = $row_string;
+			}
+			
+			unset($obj_res);
+			
+			$output_sql .= "\n\nSET TRANSACTION;\n".implode("\n", $insert_rows)."\nCOMMIT;";
+		}
+		
+		return $output_sql;
+	}
+}
+// End of firebird-ibase.php

sys/databases/firebird.php

@@ -12,41 +12,18 @@
 
 // --------------------------------------------------------------------------
 
-/**
+class Firebird extends DB_PDO {
- * Firebird Database class
- * 
- * PDO-firebird isn't stable, so this is a wrapper of the ibase_ public functions.
- */
-class firebird extends DB_PDO {
 
-	protected $conn, $statement, $trans, $count, $result;
+	protected $statement, $trans, $result;
-	
-	/**
-	 * Open the link to the database
-	 * 
-	 * @param string $db
-	 * @param string $user 
-	 * @param string $pass
-	 */
-	public function __construct($dbpath, $user='sysdba', $pass='masterkey')
-	{
-		$this->conn = ibase_connect($dbpath, $user, $pass, 'utf-8');
-		
-		$class = __CLASS__."_sql";
-		$this->sql = new $class;
-	}
-	
-	// --------------------------------------------------------------------------
 
 	/**
-	 * Close the link to the database
+	 * Constructor
 	 */
-	public function __destruct()
+	public function __construct($dbpath, $user, $pass)
 	{
-		@ibase_close($this->conn);
+		parent::__construct("firebird:{$dbpath}", $user, $pass);
-		@ibase_free_result($this->statement);
 	}
-	
+
 	// --------------------------------------------------------------------------
 
 	/**
@@ -60,85 +37,7 @@ class firebird extends DB_PDO {
 		$sql = 'DELETE FROM "'.$table.'"';
 		$this->query($sql);
 	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Wrapper public function to better match PDO
-	 *
-	 * @param string $sql
-	 * @param  array $params
-	 * @return $this
-	 */
-	public function query($sql)
-	{
-		$this->count = 0;
-		$this->statement = ibase_query($this->conn, $sql);
-		return $this->statement;
-	}
-	
-	// --------------------------------------------------------------------------
 
-	/**
-	 * Emulate PDO fetch public function
-	 * 
-	 * @param  int $fetch_style
-	 * @return mixed
-	 */
-	public function fetch($fetch_style=PDO::FETCH_ASSOC)
-	{
-		switch($fetch_style)
-		{
-			case PDO::FETCH_OBJ:
-				return ibase_fetch_object($this->statement, IBASE_FETCH_BLOBS);
-			break;
-
-			case PDO::FETCH_NUM:
-				return ibase_fetch_row($this->statement, IBASE_FETCH_BLOBS);
-			break;
-
-			default:
-				return ibase_fetch_assoc($this->statement, IBASE_FETCH_BLOBS);
-			break;
-		}
-	}
-	
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Emulate PDO fetchAll public function
-	 * 
-	 * @param  int  $fetch_style
-	 * @return mixed
-	 */
-	public function fetchAll($fetch_style=PDO::FETCH_ASSOC)
-	{
-		$all = array();
-
-		while($row = $this->fetch($fetch_style))
-		{
-			$all[] = $row;
-		}
-		
-		$this->result = $all;
-
-		return $all;
-	}
-	
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Emulate PDO prepare
-	 *
-	 * @param string $query
-	 * @return $this
-	 */
-	public function prepare($query, $options=NULL)
-	{
-		$this->statement = ibase_prepare($this->conn, $query);
-		return $this->statement;
-	}
-	
 	// --------------------------------------------------------------------------
 
 	/**
@@ -165,7 +64,7 @@ SQL;
 		
 		return $tables;
 	}
-	
+
 	// --------------------------------------------------------------------------
 
 	/**
@@ -195,18 +94,6 @@ SQL;
 	
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Return the number of rows affected by the previous query
-	 * 
-	 * @return int
-	 */
-	public function affected_rows($statement="")
-	{
-		return ibase_affected_rows($this->conn);
-	}
-	
-	// --------------------------------------------------------------------------
-
 	/**
 	 * Return the number of rows returned for a SELECT query
 	 * 
@@ -225,136 +112,9 @@ SQL;
 
 		return count($this->result);
 	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Start a database transaction
-	 * 
-	 * @return bool
-	 */
-	public function beginTransaction()
-	{
-		if(($this->trans =& ibase_trans($this->conn)) !== NULL)
-		{
-			return TRUE;
-		}
-
-		return FALSE;
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Commit a database transaction
-	 * 
-	 * @return bool
-	 */
-	public function commit()
-	{
-		return ibase_commit($this->trans);
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Rollback a transaction
-	 * 
-	 * @return bool
-	 */
-	public function rollBack()
-	{
-		return ibase_rollback($this->trans);
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Run a prepared statement query
-	 * 
-	 * @param  array $args
-	 * @return bool
-	 */
-	public function execute($args)
-	{
-		//Add the prepared statement as the first parameter
-		array_unshift($args, $this->statement);
-		
-		// Let php do all the hard stuff in converting 
-		// the array of arguments into a list of arguments
-		return call_user_func_array('ibase_execute', $args);
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Prepare and execute a query
-	 *
-	 * @param string $sql
-	 * @param array $args
-	 * @return resource
-	 */
-	public function prepare_execute($sql, $args)
-	{
-		$query = $this->prepare($sql);
-		
-		// Set the statement in the class variable for easy later access
-		$this->statement =& $query;
-		
-		return $this->execute($args);
-	}
 
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Method to emulate PDO->quote
-	 * 
-	 * @param string $str
-	 * @return string
-	 */
-	public function quote($str, $param_type=NULL)
-	{
-		if(is_numeric($str))
-		{
-			return $str;
-		}
-
-		return "'".str_replace("'", "''", $str)."'";
-	}
-
-	// --------------------------------------------------------------------------
-
-	/**
-	 * Method to emulate PDO->errorInfo / PDOStatement->errorInfo
-	 *
-	 * @return array
-	 */
-	public function errorInfo()
-	{
-		$code = ibase_errcode();
-		$msg = ibase_errmsg();
-
-		return array(0, $code, $msg);
-	}
-	
-	// --------------------------------------------------------------------------
-	
-	/**
-	 * Bind a prepared query with arguments for executing
-	 *
-	 * @param string $sql
-	 * @param mixed $args
-	 * @return FALSE
-	 */
-	public function prepare_query($sql, $args)
-	{
-		// You can't bind query statements before execution with
-		// the firebird database
-		return FALSE;
-	}
-	
-	// --------------------------------------------------------------------------
-	
 	/**
 	 * Create an SQL backup file for the current database's structure
 	 *
@@ -435,5 +195,7 @@ SQL;
 		
 		return $output_sql;
 	}
+
 }
+
 // End of firebird.php

sys/windows/widgets/db_info_widget.php

@@ -351,7 +351,7 @@ class DB_Info_Widget extends GtkTable {
 		}
 
 		// Add firebird support, if exists
-		if(function_exists('ibase_connect'))
+		if(function_exists('ibase_connect') && ! in_array('firebird', $pdo_drivers))
 		{
 			$drivers[] = "Firebird";
 		}

tests/index.php

@@ -53,9 +53,9 @@ foreach(pdo_drivers() as $d)
 }
 
 // Load Firebird if there is support
-if(function_exists('ibase_connect'))
+if(function_exists('ibase_connect') && ! in_array('firebird', pdo_drivers()))
 {
-	require_once("{$src_path}firebird.php");
+	require_once("{$src_path}firebird-base.php");
 	require_once("{$src_path}firebird_sql.php");
 	require_once("{$test_path}firebird.php");
 }