From c9389642608f6a119d5040701a03cf1de2fddfba Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Mon, 20 Feb 2012 16:22:03 -0500
Subject: [PATCH] Fixed misc Firebird issues, added file chooser to add
 database dialog

---
 src/databases/firebird.php       |  2 +-
 src/databases/firebird_manip.php |  4 +---
 src/windows/add_db.php           | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/databases/firebird.php b/src/databases/firebird.php
index 4028958..64c29d3 100644
--- a/src/databases/firebird.php
+++ b/src/databases/firebird.php
@@ -54,7 +54,7 @@ class firebird {
 	function truncate($table)
 	{
 		// Firebird lacka a truncate command
-		$sql = "DELETE FROM {$table}";
+		$sql = 'DELETE FROM '.$table.'"';
 		$this->query($sql);
 	}
 	
diff --git a/src/databases/firebird_manip.php b/src/databases/firebird_manip.php
index 3ad5388..8b64f24 100644
--- a/src/databases/firebird_manip.php
+++ b/src/databases/firebird_manip.php
@@ -85,9 +85,7 @@ class firebird_manip extends db_manip{
 	 */
 	function delete_table($name)
 	{
-		return <<<SQL
-			DROP TABLE "{$name}"
-SQL;
+		return 'DROP TABLE "'.$name.'"';
 	}
 	
 }
diff --git a/src/windows/add_db.php b/src/windows/add_db.php
index ea493cb..a312850 100644
--- a/src/windows/add_db.php
+++ b/src/windows/add_db.php
@@ -17,7 +17,7 @@
  */
 class Add_DB extends GtkWindow {
 
-	var $conn, $dbtype, $host, $user, $pass, $database, $settings;
+	var $conn, $dbtype, $host, $user, $pass, $database, $settings, $db_file;
 	
 	function __construct()
 	{
@@ -74,6 +74,17 @@ class Add_DB extends GtkWindow {
 
 		}
 
+		// DB File
+		{
+			$filelbl = new GtkLabel("Database file");
+			$this->dbfile = new GtkFileChooserButton("Select a database file", Gtk::FILE_CHOOSER_ACTION_OPEN);
+			$filealign = new GtkAlignment(0, 0.5, 0, 0);
+			$filealign->add($filelbl);
+
+			$table->attach($filealign, 0, 1, ++$y1, ++$y2);
+			$table->attach($this->dbfile, 1, 2, $y1, $y2);
+		}
+
 		// Host
 		{
 			$this->_add_row($table, "DB Host", $this->host, $y1, $y2);