Author: danmorg
Date: 2005-04-10 23:52:51 -0400 (Sun, 10 Apr 2005)
New Revision: 42774

Modified:
   trunk/sqlsharpgtk/ChangeLog
   trunk/sqlsharpgtk/TODO.TXT
   trunk/sqlsharpgtk/browser/FirebirdMetaData.cs
   trunk/sqlsharpgtk/browser/IMetaData.cs
   trunk/sqlsharpgtk/browser/Makefile
   trunk/sqlsharpgtk/browser/MySqlMetaData.cs
   trunk/sqlsharpgtk/browser/OracleMetaData.cs
   trunk/sqlsharpgtk/browser/PostgreSqlMetaData.cs
   trunk/sqlsharpgtk/browser/SchemaBrowser.cs
   trunk/sqlsharpgtk/browser/SqlMetaData.cs
   trunk/sqlsharpgtk/browser/SybaseMetaData.cs
   trunk/sqlsharpgtk/sqlsharpgtk/AboutDialog.cs
   trunk/sqlsharpgtk/sqlsharpgtk/DataGrid.cs
   trunk/sqlsharpgtk/sqlsharpgtk/LoginDialog.cs
   trunk/sqlsharpgtk/sqlsharpgtk/Makefile
   trunk/sqlsharpgtk/sqlsharpgtk/SqlEditorSharp.cs
   trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.cs
   trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.exe.config.in
Log:
2005-04-10  Daniel Morgan <[EMAIL PROTECTED]>

        * browser/SqlMetaData.cs: add meta data for Views and Stored Procedures 
and
        the source so a user can view or edit a stored procedure, sort tables
        
        * browser/PostgreSqlMetaData.cs: sort table, add stubs for views and 
procedures and source
        
        * browser/SchemaBrowser.cs: add support for providers 
        for Mono.Data.SqliteClient and MySQL.Data, handle cases where a schema 
provider does not implement
        a function, add support for Views, Stored Procedures, and Source of the 
Stored Procedures
        
        * browser/MySqlMetaData.cs: add stubs
        
        * browser/OracleMetaData.cs: sort tables, add support for views, stored 
procedures,
        and source of stored procedures, add support to show errors when a 
stored procedures
        has compile errors
        
        * browser/FirebirdMetaData.cs: add support for views and stored 
procedures
        
        * browser/SybaseMetaData.cs: sort tables, add support for stored 
procedures and views
        
        * browser/IMetaData.cs: add support for views, stored procedures, and 
source of
        stored procedure
        
        * browser/Makefile: add new .cs files to build for views and 
procedures, and add
        Sqlite meta data provider
        
        * sqlsharpgtk/DataGrid.cs: flush
        
        * sqlsharpgtk/LoginDialog.cs: if a setting is selected, make the 
setting name show up on
        the tree view and combo box for connections
        
        * sqlsharpgtk/sqlsharpgtk.exe.config.in: add example connection strings 
for SQL Lite v2.x or v3.x
        
        * sqlsharpgtk/AboutDialog.cs: add copyright
        
        * sqlsharpgtk/sqlsharpgtk.cs: app name is "Mono SQL# For GTK#", add 
Copy pop up menu item
        for the data grid which copies a row to the clipboard as comma 
separated values, show list
        of views and stored procedures in meta data tree view, add new menu 
item to pop up menu 
        to allow viewing/editing of a stored procedure, added shortcut for F7 
key to execute SQL
        AS-IS, if a setting was selected in the Login Dialog - show it in the 
tree view and combo as
        a connection name
        
        * sqlsharpgtk/SqlEditorSharp.cs: clean up
        
        * TODO.TXT: update TODO file    

Modified: trunk/sqlsharpgtk/ChangeLog
===================================================================
--- trunk/sqlsharpgtk/ChangeLog 2005-04-11 03:39:30 UTC (rev 42773)
+++ trunk/sqlsharpgtk/ChangeLog 2005-04-11 03:52:51 UTC (rev 42774)
@@ -1,3 +1,50 @@
+2005-04-10  Daniel Morgan <[EMAIL PROTECTED]>
+
+       * browser/SqlMetaData.cs: add meta data for Views and Stored Procedures 
and
+       the source so a user can view or edit a stored procedure, sort tables
+       
+       * browser/PostgreSqlMetaData.cs: sort table, add stubs for views and 
procedures and source
+       
+       * browser/SchemaBrowser.cs: add support for providers 
+       for Mono.Data.SqliteClient and MySQL.Data, handle cases where a schema 
provider does not implement
+       a function, add support for Views, Stored Procedures, and Source of the 
Stored Procedures
+       
+       * browser/MySqlMetaData.cs: add stubs
+       
+       * browser/OracleMetaData.cs: sort tables, add support for views, stored 
procedures,
+       and source of stored procedures, add support to show errors when a 
stored procedures
+       has compile errors
+       
+       * browser/FirebirdMetaData.cs: add support for views and stored 
procedures
+       
+       * browser/SybaseMetaData.cs: sort tables, add support for stored 
procedures and views
+       
+       * browser/IMetaData.cs: add support for views, stored procedures, and 
source of
+       stored procedure
+       
+       * browser/Makefile: add new .cs files to build for views and 
procedures, and add
+       Sqlite meta data provider
+       
+       * sqlsharpgtk/DataGrid.cs: flush
+       
+       * sqlsharpgtk/LoginDialog.cs: if a setting is selected, make the 
setting name show up on
+       the tree view and combo box for connections
+       
+       * sqlsharpgtk/sqlsharpgtk.exe.config.in: add example connection strings 
for SQL Lite v2.x or v3.x
+       
+       * sqlsharpgtk/AboutDialog.cs: add copyright
+       
+       * sqlsharpgtk/sqlsharpgtk.cs: app name is "Mono SQL# For GTK#", add 
Copy pop up menu item
+       for the data grid which copies a row to the clipboard as comma 
separated values, show list
+       of views and stored procedures in meta data tree view, add new menu 
item to pop up menu 
+       to allow viewing/editing of a stored procedure, added shortcut for F7 
key to execute SQL
+       AS-IS, if a setting was selected in the Login Dialog - show it in the 
tree view and combo as
+       a connection name
+       
+       * sqlsharpgtk/SqlEditorSharp.cs: clean up
+       
+       * TODO.TXT: update TODO file    
+
 2005-01-10  Daniel Morgan <[EMAIL PROTECTED]>
 
        * ChangeLog: fix the my email address

Modified: trunk/sqlsharpgtk/TODO.TXT
===================================================================
--- trunk/sqlsharpgtk/TODO.TXT  2005-04-11 03:39:30 UTC (rev 42773)
+++ trunk/sqlsharpgtk/TODO.TXT  2005-04-11 03:52:51 UTC (rev 42774)
@@ -6,8 +6,10 @@
 
 - add SQL# commands for disconnecting.
   Helpful for scripting.  
+- every connection needs to have at least one other connection for the schema 
browser
+  if four connections share the same provider and connection string, then 
there only
+  needs to have one extra connection for the schema browser
 
-
 Meta Data Tree View (Left Pane)
 -------------------------------
 
@@ -15,18 +17,38 @@
   expanded before
 - implement refresh 
 - add meta data for:
-  - more info about tables and columns
-  - views
-  - stored procedures and triggers
+  - tables (done)
+  - table columns (done except for sqlite)
+  - views (oracle, sybase, and sql server done)
+  - stored procedures (oracle, sybase, and sql server done) 
+    - Oracle - packages and package bodies
+             - list the functions and procedures in a package
+             - show invalid database objects in different color
+  - parameters for stored procedures
+  - triggers
+  - indexes - unque/duplicate, primary keys, foreign keys
   - constraints
   - users
+  - sessions (dynamic info)
   - tablespaces
+  - handle database objects used by a particular DBMS, such as, sequences for 
Oracle
 - may or may not use a different schema browser
 
+Stored Procedures, Functions, and other stored procedural objects
+-----------------------------------------------------------------
+
+with meta data added to list all stored procedures, then do these:
+- for a stored procedure screen, all execute functions are execute as-is.
+- for oracle:
+       - allow (all or individual) invalid objects to be re-compiled
+       - if saving a stored procedure, and there are errors, show errors in 
grid.  If
+         user double-clicks on a row in the grid, go to that line and position
+
 SQL Execution Engine
 --------------------
 
-- refactor the SQL execution code into its own class
+- refactor the SQL execution code into its own assembly.  Use threads and 
events
+  to handle this
 
 Clipboard (Cut/Copy/Paste)
 --------------------------
@@ -53,5 +75,17 @@
 
 Project Files
 -------------
-- change the source code files from vs.net default style to monostyle
 
+- change the source code files from vs.net default style to mono style
+- refactor the majority of source code in sqlsharpgtk.cs, move this into other 
classes, such as,
+  the output for csv files vs. normal output can be generalized into output 
classes.  and refactor
+  the non-GUI code from the GUI code
+
+Data Grid
+---------
+
+- Make the DataGrid a first-class Data Grid like the one found in 
System.Windows.Forms or
+  System.Web.UI.WebControls, such as, allow the grid to be editable - when a 
value changes in
+  the grid - update the data source.  Add the approviate events for this.
+  See what vlad and duncan did for managed tree model stuff
+

Modified: trunk/sqlsharpgtk/browser/FirebirdMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/FirebirdMetaData.cs       2005-04-11 03:39:30 UTC 
(rev 42773)
+++ trunk/sqlsharpgtk/browser/FirebirdMetaData.cs       2005-04-11 03:52:51 UTC 
(rev 42774)
@@ -3,7 +3,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
@@ -105,6 +105,24 @@
                        return columns;
                }
 
+               public MetaViewCollection GetViews (bool includeSystem) 
+               {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaViewCollection views = new MetaViewCollection ();
+
+                       DataTable table2 = GetSchema ("Views", new string[] 
{null, null, null});
+                       for (int r = 0; r < table2.Rows.Count; r++) {
+                               DataRow row2 = table2.Rows[r];
+                               string viewName = row2["VIEW_NAME"].ToString();
+                               MetaView view = new MetaView (viewName);
+                               views.Add (view);
+                       }
+
+                       return views;
+               }
+
                private DataTable GetSchema (string sCollectionName, string[] 
sRestrictions) 
                {
                        if (schemaMethod == null) 
@@ -141,6 +159,43 @@
                        // invoke GetSchema method
                        return (DataTable) schemaMethod.Invoke (con, oParms);
                }
+
+               public MetaProcedureCollection GetProcedures(string owner) 
+               {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaProcedureCollection procs = new 
MetaProcedureCollection ();
+
+                       DataTable table2 = null;
+                       DataRow row2 = null;
+                       table2 = GetSchema ("Procedures", new string[] {null, 
null, null});
+                       for (int r = 0; r < table2.Rows.Count; r++) {
+                               row2 = table2.Rows[r];
+                               string procName = 
row2["PROCEDURE_NAME"].ToString();
+                               MetaProcedure proc = new MetaProcedure ("", 
procName, "Procedures");
+                               procs.Add (proc);
+                               row2 = null;
+                       }
+                       table2 = null;
+
+                       table2 = GetSchema ("Functions", new string[] {null, 
null, null, null});
+                       for (int r = 0; r < table2.Rows.Count; r++) {
+                               row2 = table2.Rows[r];
+                               string funcName = 
row2["FUNCTION_NAME"].ToString();
+                               MetaProcedure proc = new MetaProcedure ("", 
funcName, "Functions");
+                               procs.Add (proc);
+                               row2 = null;
+                       }
+                       table2 = null;
+
+                       return procs;                           
+               }
+
+               public string GetSource (string objectName, string objectType) 
+               {
+                       return "";
+               }
        }
 }
 

Modified: trunk/sqlsharpgtk/browser/IMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/IMetaData.cs      2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/browser/IMetaData.cs      2005-04-11 03:52:51 UTC (rev 
42774)
@@ -3,7 +3,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
@@ -15,10 +15,10 @@
 {
        public interface IMetaData
        {
-               //MetaTableCollection GetTables();
-               MetaTableCollection GetTables(bool includeSystemTables);
-
-               //MetaTableColumnCollection GetTableColumns(string tableName);
-               MetaTableColumnCollection GetTableColumns(string owner, string 
tableName);
+               MetaTableCollection GetTables (bool includeSystemTables);
+               MetaTableColumnCollection GetTableColumns (string owner, string 
tableName);
+               MetaViewCollection GetViews (bool includeSystem);
+               MetaProcedureCollection GetProcedures(string owner);
+               string GetSource (string objectName, string objectType);
        }
 }

Modified: trunk/sqlsharpgtk/browser/Makefile
===================================================================
--- trunk/sqlsharpgtk/browser/Makefile  2005-04-11 03:39:30 UTC (rev 42773)
+++ trunk/sqlsharpgtk/browser/Makefile  2005-04-11 03:52:51 UTC (rev 42774)
@@ -17,9 +17,14 @@
 MetaTableCollection.cs \
 MetaTableColumn.cs \
 MetaTableColumnCollection.cs \
+MetaView.cs \
+MetaViewCollection.cs \
+MetaProcedure.cs \
+MetaProcedureCollection.cs \
 SchemaBrowser.cs \
 OracleMetaData.cs \
 SqlMetaData.cs \
+SqliteMetaData.cs \
 SybaseMetaData.cs \
 PostgreSqlMetaData.cs \
 FirebirdMetaData.cs \
@@ -33,5 +38,5 @@
        cp Mono.Data.SqlSharp.DatabaseBrowser.dll ../sqlsharpgtk
 
 clean:
-       rm -f *.dll *.exe *.pdb
+       rm -f *.dll *.exe *.pdb *.mdb
 

Modified: trunk/sqlsharpgtk/browser/MySqlMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/MySqlMetaData.cs  2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/browser/MySqlMetaData.cs  2005-04-11 03:52:51 UTC (rev 
42774)
@@ -3,7 +3,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
@@ -33,12 +33,6 @@
 
                        MetaTableCollection tables = new MetaTableCollection ();
 
-                       string where;
-                       if(includeSystemTables == true)
-                               where = "'U','S'";
-                       else
-                               where = "'U'";
-
                        string sql = "SHOW TABLES";
 
                        IDbCommand cmd = con.CreateCommand();
@@ -56,14 +50,17 @@
                        return tables;
                }
 
+               public MetaViewCollection GetViews (bool includeSystem) 
+               {
+                       throw new NotImplementedException ();
+               }
+
                private int GetInt(IDataReader reader, int field) 
                {
                        if(reader.IsDBNull(field) == true)
                                return 0;
                        
                        object v = reader[field].ToString();
-                       
-                       //Console.WriteLine("-------------------field: " + 
field + "     v: " + v);
                        string ds = v.ToString();
                        int iss = Int32.Parse(ds);
                        return iss;
@@ -108,5 +105,16 @@
                        
                        return columns;
                }
+
+
+               public MetaProcedureCollection GetProcedures(string owner) 
+               {
+                       throw new NotImplementedException ();
+               }
+
+               public string GetSource (string objectName, string objectType) 
+               {
+                       return "";
+               }
        }
 }

Modified: trunk/sqlsharpgtk/browser/OracleMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/OracleMetaData.cs 2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/browser/OracleMetaData.cs 2005-04-11 03:52:51 UTC (rev 
42774)
@@ -3,13 +3,14 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
 
 using System;
 using System.Data;
+using System.Text;
 
 namespace Mono.Data.SqlSharp.DatabaseBrowser
 {
@@ -41,7 +42,8 @@
 
                        string sql = "SELECT OWNER, TABLE_NAME, TABLESPACE_NAME 
" +
                                                 "FROM ALL_TABLES " +
-                                                where;
+                                                where + 
+                                                " ORDER BY 1, 2";
 
                        IDbCommand cmd = con.CreateCommand();
                        cmd.CommandText = sql;
@@ -59,9 +61,42 @@
                        return tables;
                }
 
-               private int GetInt(IDataReader reader, int field) 
+               public MetaViewCollection GetViews (bool includeSystem) 
                {
-                       if(reader.IsDBNull(field) == true)
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaViewCollection views = new MetaViewCollection ();
+
+                       string where = "";
+                       if (includeSystem == true)
+                               where = "";
+                       else
+                               where = "WHERE OWNER NOT IN 
('SYS','SYSTEM','MDSYS','CTXSYS','WMSYS','WKSYS')";
+
+                       string sql = "SELECT OWNER, VIEW_NAME " +
+                               "FROM ALL_VIEWS " +
+                               where +
+                               " ORDER BY 1, 2";
+
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+
+                       IDataReader reader = cmd.ExecuteReader ();
+                       while (reader.Read ()) {
+                               MetaView view = new MetaView (reader.GetString 
(0),
+                                       reader.GetString (1));
+                               views.Add (view);
+                       }
+                       reader.Close ();
+                       reader = null;
+                       
+                       return views;
+               }
+
+               private int GetInt (IDataReader reader, int field) 
+               {
+                       if (reader.IsDBNull(field) == true)
                                return 0;
                        
                        object v = reader[field].ToString();
@@ -109,5 +144,127 @@
                        
                        return columns;
                }
+
+               public MetaProcedureCollection GetProcedures(string owner) 
+               {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaProcedureCollection procs = new 
MetaProcedureCollection ();
+
+                       string sql =
+                               "SELECT OWNER, OBJECT_NAME, " +
+                               " 
DECODE(OBJECT_TYPE,'PROCEDURE','Procedures','FUNCTION','Functions','PACKAGE','Packages')
 AS OBJ_TYPE " +
+                               "FROM ALL_OBJECTS " +
+                               "WHERE OBJECT_TYPE IN 
('PROCEDURE','FUNCTION','PACKAGE') " +
+                               "ORDER BY 3, 1, 2";
+
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+
+                       IDataReader reader = cmd.ExecuteReader ();
+                       while (reader.Read ()) {
+                               string procOwner = reader.GetValue(0).ToString 
();
+                               string procName = reader.GetValue(1).ToString 
();
+                               string procType = reader.GetValue(2).ToString 
();
+
+                               MetaProcedure proc = new MetaProcedure 
(procOwner, procName, procType);
+                               procs.Add (proc);
+                       }
+                       reader.Close ();
+                       reader = null;
+
+                       return procs;           
+               }
+
+               public string GetSource (string objectName, string objectType) 
+               {
+                       string owner = "";
+                       string name = "";
+
+                       GetOwnerAndName (objectName, out owner, out name);
+       
+                       string procType = "";
+                       switch (objectType) {
+                       case "Procedures":
+                               procType = " = 'PROCEDURE'";
+                               break;
+                       case "Functions":
+                               procType = " = 'FUNCTION'";
+                               break;
+                       case "Packages":
+                               procType = " IN ('PACKAGE','PACKAGE BODY')";
+                               break;
+                       }
+                       
+                       string sql = String.Format (
+                               "SELECT TYPE, TEXT " +
+                               "FROM ALL_SOURCE " +
+                               "WHERE OWNER = '{0}' " +
+                               "AND NAME = '{1}' " +
+                               "AND TYPE {2} " +
+                               "ORDER BY TYPE, LINE", owner, name, procType);
+                       
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+                       IDataReader reader = cmd.ExecuteReader ();
+
+                       StringBuilder sb = new StringBuilder ();
+
+                       while (reader.Read ()) {
+                               string text = reader.GetString (1);
+                               sb.Append (text);
+                       }
+
+                       reader.Close ();
+                       reader = null;
+
+                       return sb.ToString ();
+               }
+
+               // takes a object name like "owner.name" and parses it into 
"owner" and "name" strings
+               private void GetOwnerAndName (string objectName, out string 
owner, out string name) 
+               {
+                       int idx = objectName.IndexOf (".");
+                       owner = objectName.Substring (0, idx);
+                       name = objectName.Substring (idx + 1);
+               }
+
+               // TODO: use this to get the errors after compiling a
+               //  stored procedure, function, or package
+               //  maybe even creating a DbError and DbErrorCollection class
+               public IDataReader GetErrors (string objectName, string 
objectType) 
+               {
+                       string owner = "";
+                       string name = "";
+
+                       GetOwnerAndName (objectName, out owner, out name);
+                       
+                       string procType = "";
+                       switch (objectType) {
+                       case "Procedures":
+                               procType = " = 'PROCEDURE'";
+                               break;
+                       case "Functions":
+                               procType = " = 'FUNCTION'";
+                               break;
+                       case "Packages":
+                               procType = " IN ('PACKAGE','PACKAGE BODY')";
+                               break;
+                       }
+                       
+                       string sql = String.Format (
+                               "SELECT LINE, POSITION, POSITION, TEXT, 
ATTRIBUTE " +
+                               "FROM ALL_ERRORS " +
+                               "WHERE OWNER = '{0}' " +
+                               "AND NAME = '{1}' " +
+                               "AND TYPE {2} " +
+                               "ORDER BY SEQUENCE", owner, name, procType);
+                       
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+                       IDataReader reader = cmd.ExecuteReader ();
+                       return reader;
+               }
        }
 }

Modified: trunk/sqlsharpgtk/browser/PostgreSqlMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/PostgreSqlMetaData.cs     2005-04-11 03:39:30 UTC 
(rev 42773)
+++ trunk/sqlsharpgtk/browser/PostgreSqlMetaData.cs     2005-04-11 03:52:51 UTC 
(rev 42774)
@@ -3,7 +3,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
@@ -33,19 +33,21 @@
 
                        MetaTableCollection tables = new MetaTableCollection ();
 
-                       string sql = "select tablename " +
-                                               "from pg_tables t ";
+                       string sql = 
+                               "select tablename " +
+                               "from pg_tables t ";
 
                        if (includeSystemTables == false)
                                sql = sql + "where tablename not like 'pg_%' " +
-                                                       "and tablename not like 
'sql_%'";
+                                       "and tablename not like 'sql_%' ";
 
+                       sql = sql + " ORDER BY 1";
+
                        IDbCommand cmd = con.CreateCommand();
                        cmd.CommandText = sql;
 
                        IDataReader reader = cmd.ExecuteReader();
-                       while(reader.Read())
-                       {
+                       while(reader.Read()) {
                                MetaTable table = new 
MetaTable(reader.GetString(0));
                                tables.Add(table);
                        }
@@ -55,14 +57,17 @@
                        return tables;
                }
 
+               public MetaViewCollection GetViews (bool includeSystem) 
+               {
+                       throw new NotImplementedException ();
+               }
+
                private int GetInt(IDataReader reader, int field) 
                {
                        if(reader.IsDBNull(field) == true)
                                return 0;
                        
                        object v = reader[field].ToString();
-                       
-                       //Console.WriteLine("-------------------field: " + 
field + "     v: " + v);
                        string ds = v.ToString();
                        int iss = Int32.Parse(ds);
                        return iss;
@@ -75,22 +80,22 @@
 
                        MetaTableColumnCollection columns = new 
MetaTableColumnCollection (owner, tableName);
 
-                       string sql = "select c.relname as table_name, a.attname 
as column_name, " +
-                                        " t.typname as date_type, a.attlen, 
a.atttypmod, a.attnotnull, a.attnum " +
-                                                "from pg_class c, pg_attribute 
a, pg_type t " +
-                                                "where c.relname = '" + 
tableName + "'" + 
-                                                "and c.oid = a.attrelid " +
-                                                "and a.attname not in 
('tableoid','cmax','xmax','cmin','xmin','oid','ctid') " +
-                                                "and t.oid = a.atttypid " +
-                                                "and a.attnum > 0 " +
-                                                "order by a.attnum";
+                       string sql = 
+                               "select c.relname as table_name, a.attname as 
column_name, " +
+                               " t.typname as date_type, a.attlen, 
a.atttypmod, a.attnotnull, a.attnum " +
+                               "from pg_class c, pg_attribute a, pg_type t " +
+                               "where c.relname = '" + tableName + "'" + 
+                               "and c.oid = a.attrelid " +
+                               "and a.attname not in 
('tableoid','cmax','xmax','cmin','xmin','oid','ctid') " +
+                               "and t.oid = a.atttypid " +
+                               "and a.attnum > 0 " +
+                               "order by a.attnum";
 
                        IDbCommand cmd = con.CreateCommand();
                        cmd.CommandText = sql;
 
                        IDataReader reader = cmd.ExecuteReader();
-                       while(reader.Read())
-                       {                       
+                       while(reader.Read()) {                  
                                string sColumnName = reader.GetString(1);
                                string sDataType = reader.GetString(2);
                                int nLen = reader.GetInt32(3);
@@ -143,5 +148,16 @@
                        
                        return columns;
                }
+
+
+               public MetaProcedureCollection GetProcedures(string owner) 
+               {
+                       throw new NotImplementedException ();
+               }
+
+               public string GetSource (string objectName, string objectType) 
+               {
+                       return "";
+               }
        }
 }

Modified: trunk/sqlsharpgtk/browser/SchemaBrowser.cs
===================================================================
--- trunk/sqlsharpgtk/browser/SchemaBrowser.cs  2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/browser/SchemaBrowser.cs  2005-04-11 03:52:51 UTC (rev 
42774)
@@ -3,7 +3,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
@@ -23,54 +23,89 @@
 
                public Schema(string factory, IDbConnection con)
                {
-                       switch(factory)
-                       {
-                               // TODO: load from XML config file instead 
hard-coding
-                               case "System.Data.OracleClient":
-                                       metaData = new OracleMetaData(con);
-                                       break;
-                               case "System.Data.SqlClient":
-                                       metaData = new SqlMetaData(con);
-                                       break;
-                               case "ByteFX.Data.MySqlClient":
-                                       metaData = new MySqlMetaData(con);
-                                       break;
-                               case "Npgsql":
-                                       metaData = new PostgreSqlMetaData(con);
-                                       break;
-                               case "FirebirdSql.Data.Firebird":
-                                       metaData = new FirebirdMetaData(con);
-                                       break;
-                               case "Mono.Data.SybaseClient":
-                                       metaData = new SybaseMetaData(con);
-                                       break;
-                               default:
-                                       break;
+                       switch(factory) {
+                       // TODO: load from XML config file instead hard-coding
+                       case "System.Data.OracleClient":
+                               metaData = new OracleMetaData(con);
+                               break;
+                       case "System.Data.SqlClient":
+                               metaData = new SqlMetaData(con);
+                               break;
+                       case "ByteFX.Data.MySqlClient":
+                       case "MySql.Data":
+                               metaData = new MySqlMetaData(con);
+                               break;
+                       case "Npgsql":
+                               metaData = new PostgreSqlMetaData(con);
+                               break;
+                       case "FirebirdSql.Data.Firebird":
+                               metaData = new FirebirdMetaData(con);
+                               break;
+                       case "Mono.Data.SybaseClient":
+                               metaData = new SybaseMetaData(con);
+                               break;
+                       case "Mono.Data.SqliteClient":
+                               metaData = new SqliteMetaData(con);
+                               break;
+                       default:
+                               break;
                        }
                }
 
-               public IMetaData MetaData 
-               {
-                       get 
-                       {
+               public IMetaData MetaData {
+                       get {
                                return metaData;
                        }
 
-                       set 
-                       {
+                       set {
                                metaData = value;
                        }
                }
 
-               public MetaTableCollection GetTables() 
+               public MetaTableCollection GetTables(bool includeSystem) 
                {
-                       return metaData.GetTables(false);
+                       try {
+                               return metaData.GetTables(false);
+                       } catch (NotImplementedException n) {
+                               return new MetaTableCollection ();
+                       }
                }
 
                public MetaTableColumnCollection GetTableColumns(string owner, 
string tableName) 
                {
-                       return metaData.GetTableColumns(owner, tableName);
+                       try {
+                               return metaData.GetTableColumns(owner, 
tableName);
+                       } catch (NotImplementedException n) { 
+                               return new MetaTableColumnCollection ();
+                       }
                }
+
+               public MetaViewCollection GetViews(bool includeSystem) 
+               {
+                       try {
+                               return metaData.GetViews (true);
+                       } catch (NotImplementedException n) {
+                               return new MetaViewCollection ();
+                       }
+               }
+
+               public MetaProcedureCollection GetProcedures(string owner)  
+               {
+                       try {
+                               return metaData.GetProcedures (owner);
+                       } catch (NotImplementedException n) {
+                               return new MetaProcedureCollection ();
+                       }
+               }
+
+               public string GetSource (string objectName, string objectType) 
+               {
+                       try {
+                               return metaData.GetSource (objectName, 
objectType);
+                       } catch (NotImplementedException n) {
+                               return "";
+                       }
+               }
        }
 }
 

Modified: trunk/sqlsharpgtk/browser/SqlMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/SqlMetaData.cs    2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/browser/SqlMetaData.cs    2005-04-11 03:52:51 UTC (rev 
42774)
@@ -3,13 +3,14 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the LGPL 
license.
 //
 
 using System;
 using System.Data;
+using System.Text;
 
 namespace Mono.Data.SqlSharp.DatabaseBrowser
 {
@@ -44,7 +45,8 @@
                                " so.crdate as created_date, so.xtype as 
table_type " +
                                "FROM dbo.sysobjects so, dbo.sysusers su " +
                                "WHERE xtype IN (" + where + ") " +
-                               "AND su.uid = so.uid";
+                               "AND su.uid = so.uid " +
+                               "ORDER BY 1, 2";
 
                        IDbCommand cmd = con.CreateCommand();
                        cmd.CommandText = sql;
@@ -62,19 +64,83 @@
                        return tables;
                }
 
+               public MetaViewCollection GetViews (bool includeSystem) 
+               {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaViewCollection views = new MetaViewCollection ();
+
+                       string where = "'V'";
+
+                       string sql = 
+                               "SELECT su.name AS owner, so.name as 
table_name, so.id as table_id, " +
+                               " so.crdate as created_date, so.xtype as 
table_type " +
+                               "FROM dbo.sysobjects so, dbo.sysusers su " +
+                               "WHERE xtype IN (" + where + ") " +
+                               "AND su.uid = so.uid " +
+                               "ORDER BY 1, 2";
+
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+
+                       IDataReader reader = cmd.ExecuteReader ();
+                       while (reader.Read ()) {
+                               MetaView view = new MetaView (reader.GetString 
(0),
+                                       reader.GetString (1));
+                               views.Add (view);
+                       }
+                       reader.Close ();
+                       reader = null;
+
+                       return views;
+               }
+
                private int GetInt(IDataReader reader, int field) 
                {
                        if(reader.IsDBNull(field) == true)
                                return 0;
                        
                        object v = reader[field].ToString();
-                       
-                       //Console.WriteLine("-------------------field: " + 
field + "     v: " + v);
                        string ds = v.ToString();
                        int iss = Int32.Parse(ds);
                        return iss;
                }
 
+               public MetaProcedureCollection GetProcedures(string owner) 
+               {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaProcedureCollection procs = new 
MetaProcedureCollection ();
+
+                       string sql =
+                               "SELECT su.name AS proc_owner, so.name as 
proc_name, " +
+                               "   CASE so.xtype " +
+                               "      WHEN 'P' THEN 'Stored Procedures' " +
+                               "      WHEN 'X' THEN 'Extended Procedures' " +
+                               "      WHEN 'FN' THEN 'Functions' " +
+                               "   END AS proc_type_desc " +
+                               "FROM dbo.sysobjects so, dbo.sysusers su " +
+                               "WHERE xtype in ('P', 'X', 'FN') " +
+                               "AND su.uid = so.uid " +
+                               "ORDER BY 3, 1, 2";
+
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+
+                       IDataReader reader = cmd.ExecuteReader ();
+                       while (reader.Read ()) {
+                               MetaProcedure proc = new MetaProcedure 
(reader.GetString (0),
+                                       reader.GetString (1), reader.GetString 
(2));
+                               procs.Add (proc);
+                       }
+                       reader.Close ();
+                       reader = null;
+
+                       return procs;           
+               }
+
                public MetaTableColumnCollection GetTableColumns(string owner, 
string tableName)
                {
                        if(con.State != ConnectionState.Open)
@@ -90,8 +156,9 @@
                                "from dbo.syscolumns sc, dbo.sysobjects so, " +
                                "     dbo.systypes st, dbo.sysusers su " +
                                "where sc.id = so.id " +
+                               "and so.xtype in ('U','S') " +
                                "and so.name = '" + tableName + "' " + 
-                               "and sc.usertype = st.usertype " +
+                               "and sc.xtype = st.xtype " +
                                "and su.uid = so.uid " +
                                "order by sc.colid";
 
@@ -101,14 +168,6 @@
                        IDataReader reader = cmd.ExecuteReader();
                        while(reader.Read())
                        {
-                               /*
-                               for(int i = 0; i < reader.FieldCount; i++) 
-                               {
-                                       Console.WriteLine("Name: " + 
reader.GetName(i) + "  Type: " + reader.GetValue(i).GetType().ToString() + "  
Value: " + reader.GetValue(i).ToString());
-                               }
-                               Console.Out.Flush();
-                               */
-
                                MetaTableColumn column = new MetaTableColumn(
                                        reader.GetString(0),
                                        reader.GetString(1),
@@ -126,5 +185,27 @@
                        
                        return columns;
                }
+
+               // get the SQL of the stored procedure
+               public string GetSource (string objectName, string objectType) 
+               {
+                       string sql = String.Format ("EXEC 
[master].[dbo].[sp_helptext] '{0}', null", objectName);
+                       
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+                       IDataReader reader = cmd.ExecuteReader ();
+
+                       StringBuilder sb = new StringBuilder ();
+
+                       while (reader.Read ()) {
+                               string text = reader.GetString (0);
+                               sb.Append (text);
+                       }
+
+                       reader.Close ();
+                       reader = null;
+
+                       return sb.ToString ();
+               }
        }
 }

Modified: trunk/sqlsharpgtk/browser/SybaseMetaData.cs
===================================================================
--- trunk/sqlsharpgtk/browser/SybaseMetaData.cs 2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/browser/SybaseMetaData.cs 2005-04-11 03:52:51 UTC (rev 
42774)
@@ -44,7 +44,8 @@
                                " so.crdate as created_date, so.type as 
table_type " +
                                "FROM dbo.sysobjects so, dbo.sysusers su " +
                                "WHERE type IN (" + where + ") " +
-                               "AND su.uid = so.uid";
+                               "AND su.uid = so.uid " +
+                               "ORDER BY 1, 2";
 
                        IDbCommand cmd = con.CreateCommand();
                        cmd.CommandText = sql;
@@ -62,6 +63,37 @@
                        return tables;
                }
 
+               public MetaViewCollection GetViews (bool includeSystem) {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaViewCollection views = new MetaViewCollection ();
+
+                       string where = "'V'";
+
+                       string sql = 
+                               "SELECT su.name AS owner, so.name as 
table_name, so.id as table_id, " +
+                               " so.crdate as created_date, so.xtype as 
table_type " +
+                               "FROM dbo.sysobjects so, dbo.sysusers su " +
+                               "WHERE xtype IN (" + where + ") " +
+                               "AND su.uid = so.uid " +
+                               "ORDER BY 1, 2";
+
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+
+                       IDataReader reader = cmd.ExecuteReader ();
+                       while (reader.Read ()) {
+                               MetaView view = new MetaView (reader.GetString 
(0),
+                                       reader.GetString (1));
+                               views.Add (view);
+                       }
+                       reader.Close ();
+                       reader = null;
+
+                       return views;
+               }
+
                private int GetInt(IDataReader reader, int field) 
                {
                        if(reader.IsDBNull(field) == true)
@@ -84,13 +116,14 @@
                        string sql = 
                                "select su.name as owner, so.name as 
table_name, sc.name as column_name,  " +
                                " st.name as date_type, sc.length as 
column_length,  " +
-                               " sc.prec as data_preceision, sc.scale as 
data_scale, " +
-                               " 1 as isnullable, sc.colid as column_id " +
+                               " sc.xprec as data_preceision, sc.xscale as 
data_scale, " +
+                               " sc.isnullable, sc.colid as column_id " +
                                "from dbo.syscolumns sc, dbo.sysobjects so, " +
                                "     dbo.systypes st, dbo.sysusers su " +
                                "where sc.id = so.id " +
+                               "and so.xtype in ('U','S') " +
                                "and so.name = '" + tableName + "' " + 
-                               "and sc.usertype = st.usertype " +
+                               "and sc.xtype = st.xtype " +
                                "and su.uid = so.uid " +
                                "order by sc.colid";
 
@@ -117,5 +150,45 @@
                        
                        return columns;
                }
+
+
+               public MetaProcedureCollection GetProcedures(string owner) 
+               {
+                       if (con.State != ConnectionState.Open)
+                               con.Open();
+
+                       MetaProcedureCollection procs = new 
MetaProcedureCollection ();
+
+                       string sql =
+                               "SELECT su.name AS proc_owner, so.name as 
proc_name, " +
+                               "   CASE so.xtype " +
+                               "      WHEN 'P' THEN 'Stored Procedures' " +
+                               "      WHEN 'X' THEN 'Extended Procedures' " +
+                               "      WHEN 'FN' THEN 'Functions' " +
+                               "   END AS proc_type_desc " +
+                               "FROM dbo.sysobjects so, dbo.sysusers su " +
+                               "WHERE xtype in ('P', 'X', 'FN') " +
+                               "AND su.uid = so.uid " +
+                               "ORDER BY 3, 1, 2";
+
+                       IDbCommand cmd = con.CreateCommand ();
+                       cmd.CommandText = sql;
+
+                       IDataReader reader = cmd.ExecuteReader ();
+                       while (reader.Read ()) {
+                               MetaProcedure proc = new MetaProcedure 
(reader.GetString (0),
+                                       reader.GetString (1), reader.GetString 
(2));
+                               procs.Add (proc);
+                       }
+                       reader.Close ();
+                       reader = null;
+
+                       return procs;           
+               }
+
+               public string GetSource (string objectName, string objectType) 
+               {
+                       return "";
+               }
        }
 }

Modified: trunk/sqlsharpgtk/sqlsharpgtk/AboutDialog.cs
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/AboutDialog.cs        2005-04-11 03:39:30 UTC 
(rev 42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/AboutDialog.cs        2005-04-11 03:52:51 UTC 
(rev 42774)
@@ -3,7 +3,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2004 by Daniel Morgan
+// (C)Copyright 2004-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the GPL license.
 //
@@ -26,7 +26,7 @@
 
        public class AboutDialog 
        {       
-               public string VERSION = "0.0.2";
+               public string VERSION = "0.0.3";
 
                Dialog dialog;
 
@@ -45,12 +45,12 @@
                        dialog.VBox.BorderWidth = 5;
                        dialog.HasSeparator = false;
                
-                       Table table = new Table (3, 1, false);
+                       Table table = new Table (4, 1, false);
                        table.ColumnSpacing = 4;
                        table.RowSpacing = 4;
                        Label label = null;
                        
-                       label = new Label ("About Mono SQL Query for GTK#");
+                       label = new Label ("About Mono SQL# For GTK#");
                        table.Attach (label, 0, 1, 0, 1);
 
                        label = new Label ("sqlsharpgtk");
@@ -59,6 +59,9 @@
                        label = new Label (VERSION);
                        table.Attach (label, 0, 1, 2, 3);
 
+                       label = new Label ("(C) Copyright 2002-2005 Daniel 
Morgan");
+                       table.Attach (label, 0, 1, 3, 4);
+
                        table.Show();
 
                        dialog.VBox.PackStart (table, false, false, 10);

Modified: trunk/sqlsharpgtk/sqlsharpgtk/DataGrid.cs
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/DataGrid.cs   2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/DataGrid.cs   2005-04-11 03:52:51 UTC (rev 
42774)
@@ -1,9 +1,6 @@
 //
-// DataGrid - attempt at creating a DataGrid for GTK#
-//            using a GTK# TreeView.  The goal is to have similar
-//            functionality to a System.Windows.Forms.DataGrid
-//            or System.Web.UI.WebControls.DataGrid.  This includes
-//            data binding support.
+// DataGrid - a DataGrid for GTK# which 
+//            uses the TreeView with a ListStore tree model
 //    
 // Based on the sample/TreeViewDemo.cs
 //
@@ -11,7 +8,7 @@
 //         Daniel Morgan <[EMAIL PROTECTED]>
 //
 // (c) 2002 Kristian Rietveld
-// (c) 2002-2004 Daniel Morgan
+// (c) 2002-2005 Daniel Morgan
 //
 
 namespace Mono.Data.SqlSharp.GtkSharp
@@ -357,8 +354,7 @@
                public void SetColumnValue (TreeIter iter, int column, byte[] 
value) 
                {
                        string svalue = SqlSharpGtk.GetHexString (value);
-                       GLib.Value cell = new GLib.Value (svalue);
-                       store.SetValue (iter, column, cell);    
+                       SetColumnValue (iter, column, svalue);
                }
 
                private void AutoCreateTreeViewColumns () 

Modified: trunk/sqlsharpgtk/sqlsharpgtk/LoginDialog.cs
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/LoginDialog.cs        2005-04-11 03:39:30 UTC 
(rev 42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/LoginDialog.cs        2005-04-11 03:52:51 UTC 
(rev 42774)
@@ -59,6 +59,8 @@
                string useridName = "";
                string passwordName = "";
 
+               string selectedSetting = "";
+
                public LoginDialog (SqlSharpGtk sqlSharpGtk) 
                { 
                        sqlSharp = sqlSharpGtk;
@@ -459,12 +461,15 @@
 
                void OnSelectionChanged (object o, EventArgs args) 
                {
+                       selectedSetting = "";
+
                        TreeIter iter;
                        TreeModel model;
                        TreeSelection selection = grid.View.Selection;
 
                        if (selection.GetSelected (out model, out iter))
                        {
+                               selectedSetting = (string) model.GetValue 
(iter, COL_Setting);
                                string conString = (string) model.GetValue 
(iter, COL_ConnectionString);
                                ParseConnectionStringIntoFields (conString);
                        }
@@ -482,7 +487,7 @@
                        try {
 
                                SetStatusBarText ("Connecting...");
-                               sqlSharp.OpenDataSource 
(providers[providerSelected], connection_entry.Text);
+                               sqlSharp.OpenDataSource 
(providers[providerSelected], connection_entry.Text, selectedSetting);
                                SetStatusBarText ("Connected.");
                                
                        } catch (Exception e) {

Modified: trunk/sqlsharpgtk/sqlsharpgtk/Makefile
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/Makefile      2005-04-11 03:39:30 UTC (rev 
42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/Makefile      2005-04-11 03:52:51 UTC (rev 
42774)
@@ -3,7 +3,7 @@
 #
 # Author:
 #    Daniel Morgan <[EMAIL PROTECTED]>
-# (c)copyright 2002-2004 Daniel Morgan 
+# (c)copyright 2002-2005 Daniel Morgan 
 #
 
 PROJECT = sqlsharpgtk.exe

Modified: trunk/sqlsharpgtk/sqlsharpgtk/SqlEditorSharp.cs
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/SqlEditorSharp.cs     2005-04-11 03:39:30 UTC 
(rev 42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/SqlEditorSharp.cs     2005-04-11 03:52:51 UTC 
(rev 42774)
@@ -5,7 +5,7 @@
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //     Rodrigo Moya <[EMAIL PROTECTED]>
 //
-// (c)copyright 2002-2004 Daniel Morgan
+// (c)copyright 2002-2005 Daniel Morgan
 // (c)copyright 2002 Rodrigo Moya
 //
 // SqlEditorSharp falls under the GPL license and is included
@@ -309,45 +309,8 @@
                                }
                                iter = finish_iter;
                                text = sqlTextBuffer.GetText (begin_iter, 
finish_iter, false);  
-/*
- * FIXME: for this to work.  GetSqlStatement has to rewrote to be line-based
-                               Console.WriteLine("text: " + text.Trim ());
-                               Console.WriteLine("text.Length: " + text.Trim 
().Length.ToString ());
 
-                               if (text.Trim ().Length == 0) {
-                                       Console.WriteLine("***");
-                                       insert_iter = 
sqlTextBuffer.GetIterAtMark (insert_mark);
-                                       begin_iter = 
sqlTextBuffer.GetIterAtOffset (0);
-                                       finish_iter = 
sqlTextBuffer.GetIterAtOffset (char_count);
-
-                                       if (insert_iter.BackwardSearch (";",
-                                               TextSearchFlags.TextOnly, 
-                                               out match_start1,
-                                               out match_end1,
-                                               start_iter) == true) {
-                                               Console.WriteLine("Backward 
search found ;");
-
-                                               finish_iter = match_end1;
-                                               finish_iter.BackwardChars (1);
-                                               TextIter back_iter = 
finish_iter;
-
-                                               if (back_iter.BackwardSearch 
(";",
-                                                       
TextSearchFlags.TextOnly, 
-                                                       out match_start1,
-                                                       out match_end1,
-                                                       start_iter) == true) {
-
-                                                       begin_iter = 
match_start1;
-                                                       begin_iter.ForwardChars 
(1);
-
-                                                       
Console.WriteLine("Backward search found ;");
-                                               }
-                                               iter = finish_iter;
-                                               text = sqlTextBuffer.GetText 
(begin_iter, finish_iter, false);
-                                               Console.WriteLine("***text: " + 
text);
-                                       }
-                               }
-*/
+                               // FIXME: for this to work.  GetSqlStatement 
has to rewritten to be line-based
                                if (text.Length > 0) {
                                        // search does not work if what you are 
searching for is 
                                        // at the end of the buffer,
@@ -374,7 +337,6 @@
                                }
                        }
 
-                       Console.WriteLine("return text: " + text);
                        return text;
                }
 

Modified: trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.cs
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.cs        2005-04-11 03:39:30 UTC 
(rev 42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.cs        2005-04-11 03:52:51 UTC 
(rev 42774)
@@ -4,7 +4,7 @@
 // Author:
 //     Daniel Morgan <[EMAIL PROTECTED]>
 //
-// (C)Copyright 2002-2004 by Daniel Morgan
+// (C)Copyright 2002-2005 by Daniel Morgan
 //
 // To be included with Mono as a SQL query tool licensed under the GPL license.
 //
@@ -92,7 +92,7 @@
 
                private Gtk.Window win;
 
-               public static readonly string ApplicationName = "Mono SQL 
Query";
+               public static readonly string ApplicationName = "Mono SQL# For 
GTK#";
                
                public static readonly string NotConnected = "{Not Connected}";
 
@@ -144,16 +144,14 @@
                        // Panels
 
                        tree = new DataTree (); // meta data tree view (left 
pane)
-                       tree.View.ButtonReleaseEvent +=
-                               new Gtk.ButtonReleaseEventHandler 
(OnDataTreeButtonRelease);
+                       tree.View.ButtonReleaseEvent += new 
Gtk.ButtonReleaseEventHandler (OnDataTreeButtonRelease);
 
                        // SQL Editor amd Results (right pane)
                        outputResults = OutputResults.DataGrid;
                        sourceFileNotebook = new Notebook();
                        sourceFileNotebook.Scrollable = true;
                        NewEditorTab();
-                       sourceFileNotebook.SwitchPage += new 
-                               Gtk.SwitchPageHandler(OnEditorTabSwitched);
+                       sourceFileNotebook.SwitchPage += new 
Gtk.SwitchPageHandler(OnEditorTabSwitched);
 
                        HPaned hpaned = new HPaned ();
                        vbox.PackStart (hpaned, true, true, 0);
@@ -193,25 +191,31 @@
 
                                        TreePath tpath = model.GetPath(iter);
                                        int nColumns = model.NColumns;
-                                       Console.WriteLine("Column Count: " + 
nColumns);
+                                       
+                                       StringBuilder sb = new StringBuilder ();
 
                                        for (int c = 0; c < nColumns; c++) {
                                                string val = (string) 
model.GetValue (iter, c);
-                                               Console.WriteLine("Value " + 
c.ToString() + ": " + val);
+                                               if (c > 0)
+                                                       sb.Append (',');
+                                               sb.Append ('\"');
+                                               sb.Append (val);
+                                               sb.Append ('\"');
                                        }
-                                       
+                                       selectedObject = sb.ToString ();
+
                                        // popup a menu over the tree view
                                        Menu menu = new Menu ();
                                        MenuItem item;
 
-                                       item = new MenuItem ("TODO Menu Item 
1");
-                                       item.Activated += new EventHandler 
(OnGridPopupMenu_Item1);
+                                       item = new MenuItem ("Save As...");
+                                       item.Activated += new EventHandler 
(OnGridPopupMenu_SaveAs);
                                        item.Sensitive = sensitive;
                                        item.Show();
                                        menu.Append (item);
 
-                                       item = new MenuItem ("TODO Menu Item 
2");
-                                       item.Activated += new EventHandler 
(OnGridPopupMenu_Item2);
+                                       item = new MenuItem ("Copy");
+                                       item.Activated += new EventHandler 
(OnGridPopupMenu_Copy);
                                        item.Sensitive = sensitive;
                                        item.Show();
                                        menu.Append (item);
@@ -221,16 +225,21 @@
                        }
                }
 
-               void OnGridPopupMenu_Item1 (object o, EventArgs args) 
+               void OnGridPopupMenu_SaveAs (object o, EventArgs args) 
                {
-                       Console.WriteLine("Data Grid - Item 1 Clicked");
+                       Console.WriteLine("TODO: create dialog to allow you 
save as to a xml file, csv file, etc");
                }
 
-               void OnGridPopupMenu_Item2 (object o, EventArgs args) 
+               void OnGridPopupMenu_Copy (object o, EventArgs args) 
                {
-                       Console.WriteLine("Data Grid - Item 2 Clicked");
+                       SetClipboardText (selectedObject);
                }
 
+               public void SetClipboardText (string text) 
+               {
+                       
Clipboard.GetForDisplay(Display.OpenDefaultLibgtkOnly(),Gdk.Atom.Intern("CLIPBOARD",true)).SetText(selectedObject);
+               }
+
                void OnDataTreeButtonRelease (object o, ButtonReleaseEventArgs 
args) 
                {
                        EventButton but = args.Event;
@@ -244,7 +253,9 @@
                                        selectedDepth = 0;
                                        selectedType = "";
                                        selectedObject = "";
-                                       bool sensitive = false;
+                                       bool sensitiveQuery = false;
+                                       bool sensitiveRefresh = false;
+                                       bool sensitiveView = false;
 
                                        TreePath tpath = model.GetPath(iter);
 
@@ -257,16 +268,39 @@
                                                TreePath ppath = 
model.GetPath(parent);
 
                                                string pval = (string) 
model.GetValue (parent, 0);
+                                               string dataSourceName = "";
                                                switch(pval) {
                                                case "Tables":
                                                        model.IterParent(out 
dataSourceIter, parent);
-                                                       string dataSourceName = 
(string) model.GetValue (dataSourceIter, 0);
+                                                       dataSourceName = 
(string) model.GetValue (dataSourceIter, 0);
                                                        selectedDataSource = 
dataSourceName;
                                                        selectedDepth = 4;
                                                        selectedType = "Tables";
                                                        selectedObject = val;
-                                                       sensitive = true;
+                                                       sensitiveQuery = true;
                                                        break;
+                                               case "Views":
+                                                       model.IterParent(out 
dataSourceIter, parent);
+                                                       dataSourceName = 
(string) model.GetValue (dataSourceIter, 0);
+                                                       selectedDataSource = 
dataSourceName;
+                                                       selectedDepth = 4;
+                                                       selectedType = "Views";
+                                                       selectedObject = val;
+                                                       sensitiveQuery = true;
+                                                       break;
+                                               case "Procedures":
+                                               case "Functions":
+                                               case "Packages":
+                                               case "Stored Procedures":
+                                               case "External Procedures":
+                                                       model.IterParent(out 
dataSourceIter, parent);
+                                                       dataSourceName = 
(string) model.GetValue (dataSourceIter, 0);
+                                                       selectedDataSource = 
dataSourceName;
+                                                       selectedDepth = 4;
+                                                       selectedType = pval;
+                                                       selectedObject = val;
+                                                       sensitiveView = true;
+                                                       break;
                                                }
                                        }
 
@@ -276,16 +310,22 @@
 
                                        item = new MenuItem ("Query");
                                        item.Activated += new EventHandler 
(OnTreePopupMenu_Query);
-                                       item.Sensitive = sensitive;
+                                       item.Sensitive = sensitiveQuery;
                                        item.Show();
                                        menu.Append (item);
 
                                        item = new MenuItem ("Refresh");
                                        item.Activated += new EventHandler 
(OnTreePopupMenu_Refresh);
-                                       item.Sensitive = sensitive;
+                                       item.Sensitive = sensitiveRefresh;
                                        item.Show();
                                        menu.Append (item);
 
+                                       item = new MenuItem ("View");
+                                       item.Activated += new EventHandler 
(OnTreePopupMenu_View);
+                                       item.Sensitive = sensitiveView;
+                                       item.Show();
+                                       menu.Append (item);
+
                                        menu.Popup (null, null, null, 
IntPtr.Zero, 3, Gtk.Global.CurrentEventTime); 
                                }
                        }
@@ -296,14 +336,21 @@
                        if(selectedDepth == 4) {
                                switch(selectedType) {
                                case "Tables":
-                                       // Query data from a database table
+                               case "Views":
+                                       // Query data from a database table or 
view
                                        string sql = "SELECT * FROM " + 
selectedObject;
 
                                        EditorTab etab = NewEditorTab ();
                                        TextBuffer buf = etab.editor.Buffer;
                                        buf.Insert (buf.EndIter, sql);
                                        buf.Modified = false;
-                                       string basefile = "Table - " + 
selectedObject;
+                                       string basefile = "";
+                                       
+                                       if (selectedType.Equals("Tables"))
+                                               basefile = "Table - " + 
selectedObject;
+                                       else
+                                               basefile = "View - " + 
selectedObject;
+
                                        etab.label.Text = basefile;
                                        etab.basefilename = basefile;           
                                
                                        UpdateTitleBar(etab);
@@ -323,6 +370,39 @@
                        Console.WriteLine("TODO: Refresh clicked!");
                }
 
+               void OnTreePopupMenu_View (object o, EventArgs args) 
+               {
+                       if(selectedDepth == 4) {
+                               switch(selectedType) {
+                               case "Procedures":
+                               case "Fuctions":
+                               case "Packages":
+                               case "Stored Procedures":
+                               case "External Procedures":
+                                       Schema browser = new Schema 
(provider.Name, conn);
+                                       string sql = browser.GetSource 
(selectedObject, selectedType);                          
+                                       
+                                       EditorTab etab = NewEditorTab ();
+                                       TextBuffer buf = etab.editor.Buffer;
+                                       buf.Insert (buf.EndIter, sql);
+                                       buf.Modified = false;
+                                       string basefile = "";
+                                       
+                                       basefile = selectedType + " - " + 
selectedObject;
+
+                                       etab.label.Text = basefile;
+                                       etab.basefilename = basefile;           
                                
+                                       UpdateTitleBar(etab);
+                                       sourceFileNotebook.CurrentPage = -1;
+                                       combo.Entry.Text = selectedDataSource;
+                                       
+                                       AppendText("");
+
+                                       break;
+                               }
+                       }
+               }
+
                public EditorTab NewEditorTab () 
                {
                        EditorTab tab = new EditorTab();                
@@ -443,6 +523,9 @@
                                case Gdk.Key.F6:
                                        ExecuteSQL (ExecuteOutputType.Normal, 
"", BatchExecuteMode.Script);
                                        break;
+                               case Gdk.Key.F7:
+                                       ExecuteSQL (ExecuteOutputType.Normal, 
"", BatchExecuteMode.AsIs);
+                                       break;
                                }
                        }
                }
@@ -1134,6 +1217,8 @@
 
                public void OnToolbar_ExecuteCommand () 
                {
+                       DoEvents ();
+                       SetFocusToEditor ();
                        ExecuteSQL (ExecuteOutputType.Normal, "", 
BatchExecuteMode.Command);
                }
 
@@ -1166,7 +1251,18 @@
                                        AppendText("");
                                }
                                else {
-                                       if (exeMode == 
BatchExecuteMode.Command) {
+                                       if (exeMode == BatchExecuteMode.AsIs) {
+                                               // get entire text from buffer
+                                               start_iter = 
tab.editor.Buffer.StartIter;
+                                               end_iter = 
tab.editor.Buffer.EndIter;
+                                               sql = buf.GetText(start_iter, 
end_iter, false);
+                                               if (Execute (outputType, 
filename, sql) == false) {
+                                                       AppendText("");
+                                                       return false;
+                                               }
+                                               AppendText("");
+                                       }
+                                       else if (exeMode == 
BatchExecuteMode.Command) {
                                                // get command at cursor
                                                end_iter = 
tab.editor.Buffer.EndIter;
                                                sql = 
tab.editor.GetSqlStatementAtCursor(out end_iter);
@@ -1288,6 +1384,7 @@
                        IDataReader reader = null;
 
                        SetStatusBarText ("Executing...");
+                       DoEvents ();
                        
                        if (outputType == ExecuteOutputType.Normal ||
                                outputType == ExecuteOutputType.CsvFile) {
@@ -1396,7 +1493,7 @@
                        string connectionString = 
ConfigurationSettings.AppSettings[setting];
                        ConnectionString cstring = new ConnectionString 
(connectionString);
                        string providerName = cstring.Parameters["FACTORY"];
-                       OpenDataSource 
(ProviderFactory.Providers[providerName], cstring.GetConnectionString ());
+                       OpenDataSource 
(ProviderFactory.Providers[providerName], cstring.GetConnectionString (), 
setting);
                }
 
                public void OutputDataToCsvFile(IDataReader rdr, DataTable dt, 
string file) 
@@ -1827,12 +1924,13 @@
                {                       
                        string bvalue = "";
                        
-                       if (bytes.Length > 0) {
-                               StringBuilder sb = new StringBuilder ();
-                               sb.Append ("0x");
-                               for (int z = 0; z < bytes.Length; z++)
-                                       sb.Append (bytes [z].ToString ("x"));
+                       StringBuilder sb2 = new StringBuilder();
+                       for (int z = 0; z < bytes.Length; z++) {
+                               byte byt = bytes[z];
+                               sb2.Append (byt.ToString("x"));
                        }
+                       if (sb2.Length > 0)
+                               bvalue = "0x" + sb2.ToString ();
        
                        return bvalue;
                }
@@ -1865,7 +1963,7 @@
                                                "  Fields: " + fields;
                                }
                                else {
-                                       status = "Rows Modified: " + 
rowsAffected;
+                                       status = "Rows Affected: " + 
rowsAffected;
                                }
                        }
                        AppendText ("Status: " + status);
@@ -1879,7 +1977,7 @@
                        return dataTable;
                }
 
-               public bool OpenDataSource (Provider theProvider, string 
theConnectionString) 
+               public bool OpenDataSource (Provider theProvider, string 
theConnectionString, string connectionName) 
                {
                        provider = theProvider;
                        connectionString = theConnectionString;
@@ -1933,46 +2031,99 @@
                        }
 
                        // database connected - do other things
-                       SetStatusBarText ("Connected.");
+                       //SetStatusBarText ("Connected.");
                        lastConnection++;
-                       string dataSourceName = lastConnection.ToString () + 
":" + provider.Name;
+                       string dataSourceName = "";
+                       if (connectionName.Equals(""))
+                               dataSourceName = lastConnection.ToString () + 
":" + provider.Name;
+                       else
+                               dataSourceName = lastConnection.ToString () + 
":" + connectionName;
 
-                       dataSource = new DataSourceConnection (dataSourceName, 
"", provider, conString, conn);
+                       dataSource = new DataSourceConnection (dataSourceName, 
connectionName, provider, conString, conn);
                        dataSources.Add (dataSource);
                        combo.PopdownStrings = dataSources.Names;
                        combo.Entry.Text = dataSourceName;
 
                        TreeIter iterDataSource = tree.Store.AppendValues 
(tree.RootIter, dataSourceName);
+                       
+                       // TODO: only load meta data when the user expands a 
tree node
+                       //       or Refreshes
                        PopulateTables (iterDataSource, provider, conn);
+                       PopulateViews (iterDataSource, provider, conn);
+                       PopulateProcedures (iterDataSource, provider, conn);
+                       
+                       SetStatusBarText ("Connected.");
 
                        SetFocusToEditor ();
 
                        return true;
                }
 
-               public void PopulateTables(TreeIter parentIter, Provider 
provider, IDbConnection con) 
+               public void PopulateTables (TreeIter parentIter, Provider 
provider, IDbConnection con) 
                {
                        TreeIter tablesIter = tree.Store.AppendValues 
(parentIter, "Tables");
                        
-                       Schema browser = new Schema(provider.Name, con);
+                       Schema browser = new Schema (provider.Name, con);
                        
                        if (browser.MetaData != null) {
                                SetStatusBarText ("Getting Meta Data...");
                                while (Application.EventsPending ()) 
                                        Application.RunIteration ();
 
-                               MetaTableCollection tables = 
browser.MetaData.GetTables(false);         
+                               MetaTableCollection tables = browser.GetTables 
(false);         
                                TreeIter iter;
                                TreeIter columnsIter;
                                foreach(MetaTable table in tables) {
-                                       iter = tree.Store.AppendValues 
(tablesIter, table.ToString());
+                                       iter = tree.Store.AppendValues 
(tablesIter, table.ToString ());
                                        columnsIter = tree.Store.AppendValues 
(iter, "Columns");
                                        PopulateTableColumns(columnsIter, 
table, browser);
                                }
-                               SetStatusBarText ("Connected.");
+                               //SetStatusBarText ("Connected.");
                        }
                }
 
+               public void PopulateViews (TreeIter parentIter, Provider 
provider, IDbConnection con) 
+               {
+                       TreeIter viewsIter = tree.Store.AppendValues 
(parentIter, "Views");
+                       
+                       Schema browser = new Schema (provider.Name, con);
+                       
+                       if (browser.MetaData != null) {
+                               SetStatusBarText ("Getting Meta Data...");
+                               while (Application.EventsPending ()) 
+                                       Application.RunIteration ();
+
+                               MetaViewCollection views = browser.GetViews 
(true);
+                               foreach (MetaView view in views)
+                                       tree.Store.AppendValues (viewsIter, 
view.ToString());
+                               //SetStatusBarText ("Connected.");
+                       }
+               }
+
+               public void PopulateProcedures (TreeIter parentIter, Provider 
provider, IDbConnection con) 
+               {
+                       TreeIter procsIter = parentIter;
+                       
+                       Schema browser = new Schema (provider.Name, con);
+                       
+                       if (browser.MetaData != null) {
+                               SetStatusBarText ("Getting Meta Data...");
+                               while (Application.EventsPending ()) 
+                                       Application.RunIteration ();
+
+                               MetaProcedureCollection procs = 
browser.GetProcedures ("");
+                               string procType = "";
+                               foreach (MetaProcedure proc in procs) {
+                                       if 
(!procType.Equals(proc.ProcedureType)) {
+                                               procType = proc.ProcedureType;
+                                               procsIter = 
tree.Store.AppendValues (parentIter, procType);
+                                       }
+                                       tree.Store.AppendValues (procsIter, 
proc.ToString());
+                               }
+                               //SetStatusBarText ("Connected.");
+                       }
+               }
+
                public void PopulateTableColumns (TreeIter parentIter, 
MetaTable table, Schema browser) 
                {
                        MetaTableColumnCollection columns = 
browser.GetTableColumns(table.Owner, table.Name);

Modified: trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.exe.config.in
===================================================================
--- trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.exe.config.in     2005-04-11 
03:39:30 UTC (rev 42773)
+++ trunk/sqlsharpgtk/sqlsharpgtk/sqlsharpgtk.exe.config.in     2005-04-11 
03:52:51 UTC (rev 42774)
@@ -11,7 +11,8 @@
                <add key="PgConnStr" 
value="factory=Npgsql;Server=localhost;Database=monotest;User 
ID=monotest;Password=monotest" />
                <add key="MyConnStr" 
value="factory=ByteFX.Data.MySqlClient;Database=test" />
                <add key="FireConnStr" 
value="factory=FirebirdSql.Data.Firebird;Database=E:\FIREBIRD\EXAMPLES\EMPLOYEE.FDB;User=SYSDBA;Password=masterkey;Dialect=3;Server=localhost"
 />
-               <add key="SqliteConnStr" 
value="factory=Mono.Data.SqliteClient;URI=file:sqlitetest.db" />
+               <add key="Sqlite2ConnStr" 
value="factory=Mono.Data.SqliteClient;URI=file:sqlitetest2.db" />
+               <add key="Sqlite3ConnStr" 
value="factory=Mono.Data.SqliteClient;URI=file:sqlitetest3.db,Version=3" />
        </appSettings>
        <mono.data>
                <providers>

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to