pgsqlclient-checkins

[Carlos Guzm?n ?l. <car...@us...>]

Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27448

Modified Files:
	PgAggregatesSchema.cs PgCastsSchema.cs PgCheckConstraints.cs 
	PgCheckConstraintsByTable.cs PgColumnsSchema.cs 
	PgDatabaseSchema.cs PgDbSchemaFactory.cs PgDomainsSchema.cs 
	PgForeignKeysSchema.cs PgFunctionPrivilegesSchema.cs 
	PgFunctionsSchema.cs PgGroupsSchema.cs PgIndexesSchema.cs 
	PgPrimaryKeysSchema.cs PgProviderTypesSchema.cs 
	PgSchemataSchema.cs PgSqlLanguagesSchema.cs 
	PgTableConstraintsSchema.cs PgTablePrivilegesSchema.cs 
	PgTablesSchema.cs PgTableStatisticsSchema.cs 
	PgTriggersSchema.cs PgUsersSchema.cs PgViewPrivilegesSchema.cs 
	PgViewsSchema.cs 
Added Files:
	PgDbSchema.cs 
Removed Files:
	IDbSchema.cs PgAbstractDbSchema.cs 
Log Message:
Changes on Db Schema stuff


Index: PgCastsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgCastsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgCastsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgCastsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCastsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCastsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgDbSchemaFactory.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgDbSchemaFactory.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgDbSchemaFactory.cs	9 Feb 2004 14:19:48 -0000	1.2
--- PgDbSchemaFactory.cs	6 Apr 2004 14:17:33 -0000	1.3
***************
*** 23,29 ****
  	internal class PgDbSchemaFactory
  	{
! 		public static IDbSchema GetSchema(PgDbSchemaType schema)
  		{
! 			IDbSchema returnSchema = null;
  
  			switch(schema)
--- 23,29 ----
  	internal class PgDbSchemaFactory
  	{
! 		public static PgDbSchema GetSchema(PgDbSchemaType schema)
  		{
! 			PgDbSchema returnSchema = null;
  
  			switch(schema)

Index: PgTriggersSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTriggersSchema.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PgTriggersSchema.cs	9 Feb 2004 14:19:48 -0000	1.6
--- PgTriggersSchema.cs	6 Apr 2004 14:17:33 -0000	1.7
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTriggersSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTriggersSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgPrimaryKeysSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgPrimaryKeysSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgPrimaryKeysSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgPrimaryKeysSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgPrimaryKeysSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgPrimaryKeysSchema : PgDbSchema
  	{
  		#region Constructors

--- NEW FILE: PgDbSchema.cs ---
/* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
 * Copyright (c) 2003-2004 Carlos Guzman Alvarez
 * 
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

using System;
using System.Data;
using System.Text;
using System.Text.RegularExpressions;
using System.Collections;

namespace PostgreSql.Data.PgSqlClient.DbSchema
{
	#region Structures

	internal struct PgColumn
	{
		public string ColumnName;
		public string ColumnAlias;
		public string WhereColumnName;
	}

	internal struct PgTableJoin
	{
		public string JoinType;
		public string RightTable;
		public string Expression;
	}

	internal struct PgPrivilege
	{
		public string			User;
		public MatchCollection	Privileges;
	}

	#endregion

	internal abstract class PgDbSchema
	{
		#region Fields

		private ArrayList	restrictionColumns;
		private ArrayList	dataColumns;
		private ArrayList	tables;
		private ArrayList	joins;
		private ArrayList	orderByColumns;
		private ArrayList	whereFilters;

		private string		tableName;
		
		#endregion

		#region Properties

		public ArrayList RestrictionColumns
		{
			get { return restrictionColumns; }
		}

		#endregion

		#region Constructors

		public PgDbSchema()
		{
			this.restrictionColumns	= new ArrayList();
			this.dataColumns		= new ArrayList();
			this.tables				= new ArrayList();
			this.joins				= new ArrayList();
			this.orderByColumns		= new ArrayList();
			this.whereFilters		= new ArrayList();

			this.AddTables();
			this.AddRestrictionColumns();
			this.AddDataColumns();
			this.AddJoins();
			this.AddOrderByColumns();
			this.AddWhereFilters();
		}

		public PgDbSchema(string tableName) : this()
		{
			this.tableName = tableName;
		}

		#endregion

		#region Abstract Methods

		public abstract void AddTables();
		public abstract void AddRestrictionColumns();
		public abstract void AddDataColumns();
		public abstract void AddJoins();
		public abstract void AddOrderByColumns();
		public abstract void AddWhereFilters();
		public abstract object[] ParseRestrictions(object[] restrictions);

		#endregion

		#region Add Methods

		public void AddTable(string tableName)
		{
			tables.Add(tableName);
		}

		public void AddRestrictionColumn(string columnName, string columnAlias, string whereColumnName)
		{
			PgColumn column = new PgColumn();

			column.ColumnName	= columnName;
			column.ColumnAlias	= columnAlias;
			if (whereColumnName != null)
			{
				column.WhereColumnName = whereColumnName;
			}
			else
			{
				column.WhereColumnName = columnName;
			}


			restrictionColumns.Add(column);
		}

		public void AddDataColumn(string columnName, string columnAlias)
		{
			PgColumn column = new PgColumn();

			column.ColumnName	= columnName;
			column.ColumnAlias	= columnAlias;

			dataColumns.Add(column);
		}

		public void AddJoin(string joinType, string rightTable, string expression)
		{
			PgTableJoin join = new PgTableJoin();

			join.JoinType	= joinType;
			join.RightTable	= rightTable;
			join.Expression	= expression;			

			joins.Add(join);
		}

		public void AddOrderBy(string column)
		{
			orderByColumns.Add(column);
		}

		public void AddWhereFilter(string filter)
		{
			whereFilters.Add(filter);
		}

		#endregion

		#region Methods

		public virtual DataTable GetDbSchemaTable(PgConnection connection, object[] restrictions)
		{
			restrictions = ParseRestrictions(restrictions);

			DataSet			dataSet = null;
			PgDataAdapter	adapter = null;
			PgCommand		command = new PgCommand();
			
			try
			{
				command.Connection	= connection;
				command.CommandText = GetCommandText(restrictions);
				if (connection.ActiveTransaction != null &&
					!connection.ActiveTransaction.IsUpdated)
				{
					command.Transaction = connection.ActiveTransaction;
				}

				adapter = new PgDataAdapter(command);
				dataSet = new DataSet(tableName);

				adapter.Fill(dataSet, tableName);
			}
			catch (PgException pgex)
			{
				throw pgex;
			}
			catch (Exception ex)
			{
				throw new PgException(ex.Message);
			}
			finally
			{
				command.Dispose();
				adapter.Dispose();
			}

			return dataSet.Tables[tableName];
		}

		public string GetCommandText(object[] restrictions)
		{
			StringBuilder sql = new StringBuilder();

			// Add restriction columns
			sql.Append("SELECT ");
			foreach (PgColumn column in restrictionColumns)
			{
				sql.AppendFormat("{0} AS {1}", column.ColumnName, column.ColumnAlias);					
				if ((restrictionColumns.IndexOf(column) + 1) < restrictionColumns.Count)
				{
					sql.Append(", ");
				}
			}

			// Add DataColumns
			if (restrictionColumns.Count > 0 && dataColumns.Count > 0)
			{
				sql.Append(", ");
			}
			foreach (PgColumn column in dataColumns)
			{
				sql.AppendFormat("{0} AS {1}", column.ColumnName, column.ColumnAlias);					
				if ((dataColumns.IndexOf(column) + 1) < dataColumns.Count)
				{
					sql.Append(", ");
				}
			}

			// Add tables
			sql.Append(" FROM ");
			foreach (string table in tables)
			{
				sql.Append(table);
				if ((tables.IndexOf(table) + 1) < tables.Count)
				{
					sql.Append(", ");
				}
			}

			if (joins.Count != 0)
			{
				foreach (PgTableJoin join in joins)
				{
					sql.AppendFormat(" {0} {1} ON {2}", 
						join.JoinType,
						join.RightTable,
						join.Expression);
				}
			}

			// Add restrictions
			StringBuilder whereFilter = new StringBuilder();

			if (restrictions != null && restrictions.Length > 0)
			{
				for (int i = 0; i < restrictions.Length; i++)
				{
					if (restrictions[i] != null)
					{
						if (whereFilter.Length > 0)
						{
							whereFilter.Append(" AND ");
						}
						whereFilter.AppendFormat("{0} = '{1}'", 
							((PgColumn)restrictionColumns[i]).WhereColumnName, 
							restrictions[i]);
					}
				}
			}

			if (whereFilters != null && whereFilters.Count > 0)
			{
				foreach (string condition in whereFilters)
				{
					if (whereFilter.Length > 0)
					{
						whereFilter.Append(" AND ");
					}
					whereFilter.Append(condition);
				}
			}

			if (whereFilter.Length > 0)
			{
				sql.AppendFormat(" WHERE {0}", whereFilter);
			}

			// Add Order By
			if (orderByColumns.Count > 0)
			{
				sql.Append(" ORDER BY ");

				foreach (string columnName in orderByColumns)
				{
					sql.Append(columnName);
					
					if ((orderByColumns.IndexOf(columnName) + 1) < orderByColumns.Count)
					{
						sql.Append(", ");
					}
				}				
			}

			return sql.ToString();
		}

		#endregion

		#region Protected Methods

		protected void AddPrivilegesColumns(DataTable table)
		{
			table.Columns.Add("INSERT", Type.GetType("System.Boolean"));
			table.Columns["INSERT"].DefaultValue = false;

			table.Columns.Add("INSERT_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["INSERT_WITH_GRANT"].DefaultValue = false;

			table.Columns.Add("SELECT", Type.GetType("System.Boolean"));
			table.Columns["SELECT"].DefaultValue = false;

			table.Columns.Add("SELECT_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["SELECT_WITH_GRANT"].DefaultValue = false;

			table.Columns.Add("UPDATE", Type.GetType("System.Boolean"));
			table.Columns["UPDATE"].DefaultValue = false;

			table.Columns.Add("UPDATE_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["UPDATE_WITH_GRANT"].DefaultValue = false;

			table.Columns.Add("DELETE", Type.GetType("System.Boolean"));
			table.Columns["DELETE"].DefaultValue = false;

			table.Columns.Add("DELETE_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["DELETE_WITH_GRANT"].DefaultValue = false;

			table.Columns.Add("RULE", Type.GetType("System.Boolean"));
			table.Columns["RULE"].DefaultValue = false;

			table.Columns.Add("RULE_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["RULE_WITH_GRANT"].DefaultValue = false;

			table.Columns.Add("REFERENCES", Type.GetType("System.Boolean"));
			table.Columns["REFERENCES"].DefaultValue = false;

			table.Columns.Add("REFERENCES_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["REFERENCES_WITH_GRANT"].DefaultValue = false;

			table.Columns.Add("TRIGGER", Type.GetType("System.Boolean"));
			table.Columns["TRIGGER"].DefaultValue = false;

			table.Columns.Add("TRIGGER_WITH_GRANT", Type.GetType("System.Boolean"));
			table.Columns["TRIGGER_WITH_GRANT"].DefaultValue = false;
		}

		protected PgPrivilege[] DecodePrivileges(string[] acl)
		{
			Regex			search = new Regex(@"((a|r|w|d|R|x|t)\*?)");
			PgPrivilege[]	priv = new PgPrivilege[acl.Length];

			for (int i = 0; i < acl.Length; i++)
			{				
				priv[i].User = acl[i].Split('=')[0];
				if (priv[i].User.Length == 0)
				{
					priv[i].User = "PUBLIC";
				}
				string aclitem	= acl[i].Split('=')[1];
				aclitem = aclitem.Split('/')[0];

				priv[i].Privileges = search.Matches(aclitem);
			}

			return priv;
		}

		protected void FillPrivileges(DataRow row, MatchCollection privileges)
		{
			foreach (Match privilege in privileges)
			{
				switch (privilege.Value)
				{
					case "a":
					case "a*":
						row["INSERT"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["INSERT_WITH_GRANT"] = true;
						}
						break;
						
					case "r":
					case "r*":
						row["SELECT"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["SELECT_WITH_GRANT"] = true;
						}
						break;

					case "w":
					case "w*":
						row["UPDATE"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["UPDATE_WITH_GRANT"] = true;
						}
						break;

					case "d":
					case "d*":
						row["DELETE"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["DELETE_WITH_GRANT"] = false;
						}
						break;

					case "R":
					case "R*":
						row["RULE"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["RULE_WITH_GRANT"] = true;
						}
						break;

					case "x":
					case "x*":
						row["REFERENCES"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["REFERENCES_WITH_GRANT"] = true;
						}
						break;

					case "t":
					case "t*":
						row["TRIGGER"] = true;
						if (privilege.Value.IndexOf("*") != -1)
						{
							row["TRIGGER_WITH_GRANT"] = true;
						}
						break;
				}
			}
		}

		#endregion
	}
}

Index: PgProviderTypesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgProviderTypesSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgProviderTypesSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgProviderTypesSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgProviderTypesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgProviderTypesSchema : PgDbSchema
  	{
  		#region Constructors

--- PgAbstractDbSchema.cs DELETED ---

Index: PgDatabaseSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgDatabaseSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgDatabaseSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgDatabaseSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDatabaseSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDatabaseSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgIndexesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgIndexesSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgIndexesSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgIndexesSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgIndexesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgIndexesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgSchemataSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgSchemataSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgSchemataSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgSchemataSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgSchemataSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgSchemataSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgTablePrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTablePrivilegesSchema.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PgTablePrivilegesSchema.cs	9 Feb 2004 14:19:48 -0000	1.6
--- PgTablePrivilegesSchema.cs	6 Apr 2004 14:17:33 -0000	1.7
***************
*** 24,28 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTablePrivilegesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 24,28 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTablePrivilegesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgFunctionPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgFunctionPrivilegesSchema.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PgFunctionPrivilegesSchema.cs	9 Feb 2004 14:19:48 -0000	1.6
--- PgFunctionPrivilegesSchema.cs	6 Apr 2004 14:17:33 -0000	1.7
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgFunctionPrivilegesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgFunctionPrivilegesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgSqlLanguagesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgSqlLanguagesSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgSqlLanguagesSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgSqlLanguagesSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgSqlLanguagesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgSqlLanguagesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgTableConstraintsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTableConstraintsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgTableConstraintsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgTableConstraintsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTableConstraintsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTableConstraintsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgUsersSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgUsersSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgUsersSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgUsersSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgUsersSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgUsersSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgForeignKeysSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgForeignKeysSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgForeignKeysSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgForeignKeysSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgForeignKeysSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgForeignKeysSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgTablesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTablesSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgTablesSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgTablesSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTablesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTablesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgCheckConstraintsByTable.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgCheckConstraintsByTable.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgCheckConstraintsByTable.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgCheckConstraintsByTable.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCheckConstraintsByTableSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCheckConstraintsByTableSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgFunctionsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgFunctionsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgFunctionsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgFunctionsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgFunctionsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgFunctionsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgViewsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgViewsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgViewsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgViewsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgViewsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgViewsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgTableStatisticsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTableStatisticsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgTableStatisticsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgTableStatisticsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 24,28 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTableStatisticsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 24,28 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgTableStatisticsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgCheckConstraints.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgCheckConstraints.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgCheckConstraints.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgCheckConstraints.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCheckConstraintsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCheckConstraintsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgColumnsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgColumnsSchema.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PgColumnsSchema.cs	9 Feb 2004 14:19:48 -0000	1.7
--- PgColumnsSchema.cs	6 Apr 2004 14:17:33 -0000	1.8
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgColumnsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgColumnsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgGroupsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgGroupsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgGroupsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgGroupsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgGroupsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgGroupsSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgAggregatesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgAggregatesSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgAggregatesSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgAggregatesSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgAggregatesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgAggregatesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgViewPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgViewPrivilegesSchema.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PgViewPrivilegesSchema.cs	9 Feb 2004 14:19:48 -0000	1.6
--- PgViewPrivilegesSchema.cs	6 Apr 2004 14:17:33 -0000	1.7
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgViewPrivilegesSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgViewPrivilegesSchema : PgDbSchema
  	{
  		#region Constructors

Index: PgDomainsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgDomainsSchema.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PgDomainsSchema.cs	9 Feb 2004 14:19:48 -0000	1.5
--- PgDomainsSchema.cs	6 Apr 2004 14:17:33 -0000	1.6
***************
*** 23,27 ****
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDomainsSchema : PgAbstractDbSchema
  	{
  		#region Constructors
--- 23,27 ----
  namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDomainsSchema : PgDbSchema
  	{
  		#region Constructors

--- IDbSchema.cs DELETED ---