[pgsqlclient-checkins] pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema IDbSchema.cs,1.2,1.3

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema
In directory sc8-pr-cvs1:/tmp/cvs-serv1271

Modified Files:
	IDbSchema.cs PGAbstractDbSchema.cs 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 
Log Message:
* Changed casing of all classes from PGXXX to PgXXX to 
follow MS guidelines.

Index: IDbSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/IDbSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IDbSchema.cs	19 Jul 2003 10:12:10 -0000	1.2
--- IDbSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 20,26 ****
  using System.Data;
  using System.Collections;
! using PostgreSql.Data.PGSqlClient;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
  	internal interface IDbSchema
--- 20,26 ----
  using System.Data;
  using System.Collections;
! using PostgreSql.Data.PgSqlClient;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
  	internal interface IDbSchema
***************
*** 38,42 ****
  		void AddWhereFilter(string filter);

! 		DataTable GetDbSchemaTable(PGConnection connection, object[] restrictions);
  		string GetCommandText(object[] restrictions);
  	}
--- 38,42 ----
  		void AddWhereFilter(string filter);

! 		DataTable GetDbSchemaTable(PgConnection connection, object[] restrictions);
  		string GetCommandText(object[] restrictions);
  	}

Index: PGAbstractDbSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGAbstractDbSchema.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PGAbstractDbSchema.cs	12 Jul 2003 08:11:22 -0000	1.1.1.1
--- PGAbstractDbSchema.cs	2 Aug 2003 19:13:29 -0000	1.2
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 23,31 ****
  using System.Collections;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
  	#region STRUCTS

! 	internal struct PGColumn
  	{
  		public string ColumnName;
--- 23,31 ----
  using System.Collections;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
  	#region STRUCTS

! 	internal struct PgColumn
  	{
  		public string ColumnName;
***************
*** 34,38 ****
  	}

! 	internal struct PGTableJoin
  	{
  		public string JoinType;
--- 34,38 ----
  	}

! 	internal struct PgTableJoin
  	{
  		public string JoinType;
***************
*** 41,45 ****
  	}

! 	internal struct PGPrivilege
  	{
  		public string			User;
--- 41,45 ----
  	}

! 	internal struct PgPrivilege
  	{
  		public string			User;
***************
*** 49,53 ****
  	#endregion

! 	internal abstract class PGAbstractDbSchema : IDbSchema
  	{
  		#region FIELDS
--- 49,53 ----
  	#endregion

! 	internal abstract class PgAbstractDbSchema : IDbSchema
  	{
  		#region FIELDS
***************
*** 75,79 ****
  		#region CONSTRUCTORS

! 		public PGAbstractDbSchema()
  		{
  			restrictionColumns	= new ArrayList();
--- 75,79 ----
  		#region CONSTRUCTORS

! 		public PgAbstractDbSchema()
  		{
  			restrictionColumns	= new ArrayList();
***************
*** 92,96 ****
  		}

! 		public PGAbstractDbSchema(string tableName) : this()
  		{
  			this.tableName = tableName;
--- 92,96 ----
  		}

! 		public PgAbstractDbSchema(string tableName) : this()
  		{
  			this.tableName = tableName;
***************
*** 120,124 ****
  		public void AddRestrictionColumn(string columnName, string columnAlias, string whereColumnName)
  		{
! 			PGColumn column = new PGColumn();

  			column.ColumnName	= columnName;
--- 120,124 ----
  		public void AddRestrictionColumn(string columnName, string columnAlias, string whereColumnName)
  		{
! 			PgColumn column = new PgColumn();

  			column.ColumnName	= columnName;
***************
*** 139,143 ****
  		public void AddDataColumn(string columnName, string columnAlias)
  		{
! 			PGColumn column = new PGColumn();

  			column.ColumnName	= columnName;
--- 139,143 ----
  		public void AddDataColumn(string columnName, string columnAlias)
  		{
! 			PgColumn column = new PgColumn();

  			column.ColumnName	= columnName;
***************
*** 149,153 ****
  		public void AddJoin(string joinType, string rightTable, string expression)
  		{
! 			PGTableJoin join = new PGTableJoin();

  			join.JoinType	= joinType;
--- 149,153 ----
  		public void AddJoin(string joinType, string rightTable, string expression)
  		{
! 			PgTableJoin join = new PgTableJoin();

  			join.JoinType	= joinType;
***************
*** 172,185 ****
  		#region METHODS

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

! 			PGCommand command = new PGCommand();

  			command.Connection	= connection;
  			command.CommandText = GetCommandText(restrictions);

! 			PGDataAdapter	adapter = new PGDataAdapter(command);
  			DataSet			dataSet = new DataSet(tableName);

--- 172,185 ----
  		#region METHODS

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

! 			PgCommand command = new PgCommand();

  			command.Connection	= connection;
  			command.CommandText = GetCommandText(restrictions);

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

***************
*** 198,202 ****
  			// Add restriction columns
  			sql.Append("SELECT ");
! 			foreach (PGColumn column in restrictionColumns)
  			{
  				sql.AppendFormat("{0} AS {1}", column.ColumnName, column.ColumnAlias);					
--- 198,202 ----
  			// Add restriction columns
  			sql.Append("SELECT ");
! 			foreach (PgColumn column in restrictionColumns)
  			{
  				sql.AppendFormat("{0} AS {1}", column.ColumnName, column.ColumnAlias);					
***************
*** 212,216 ****
  				sql.Append(", ");
  			}
! 			foreach (PGColumn column in dataColumns)
  			{
  				sql.AppendFormat("{0} AS {1}", column.ColumnName, column.ColumnAlias);					
--- 212,216 ----
  				sql.Append(", ");
  			}
! 			foreach (PgColumn column in dataColumns)
  			{
  				sql.AppendFormat("{0} AS {1}", column.ColumnName, column.ColumnAlias);					
***************
*** 234,238 ****
  			if (joins.Count != 0)
  			{
! 				foreach (PGTableJoin join in joins)
  				{
  					sql.AppendFormat(" {0} {1} ON {2}", 
--- 234,238 ----
  			if (joins.Count != 0)
  			{
! 				foreach (PgTableJoin join in joins)
  				{
  					sql.AppendFormat(" {0} {1} ON {2}", 
***************
*** 257,261 ****
  						}
  						whereFilter.AppendFormat("{0} = '{1}'", 
! 							((PGColumn)restrictionColumns[i]).WhereColumnName, 
  							restrictions[i]);
  					}
--- 257,261 ----
  						}
  						whereFilter.AppendFormat("{0} = '{1}'", 
! 							((PgColumn)restrictionColumns[i]).WhereColumnName, 
  							restrictions[i]);
  					}
***************
*** 348,355 ****
  		}

! 		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++)
--- 348,355 ----
  		}

! 		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++)

Index: PGAggregatesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGAggregatesSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGAggregatesSchema.cs	21 Jul 2003 19:54:22 -0000	1.2
--- PGAggregatesSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGAggregatesSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGAggregatesSchema() : base("Aggregates")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgAggregatesSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgAggregatesSchema() : base("Aggregates")
  		{
  		}
***************
*** 37,64 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_aggregate");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_aggregate.aggfnoid", "AGGREGATE_FUNCTION", null);
  		}

  		public override void AddDataColumns()
  		{						
! 			AddDataColumn("pg_aggregate.aggtransfn"	, "TRANSITION_FUNCTION");
! 			AddDataColumn("pg_aggregate.aggfinalfn"	, "FINAL_FUNCTION");
! 			AddDataColumn("pg_aggregate.agginitval"	, "INITIAL_VALUE");			
! 			AddDataColumn("pg_type.typname"			, "BASE_TYPE");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_type", "pg_aggregate.aggtranstype = pg_type.oid");			
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_aggregate.aggfnoid");
  		}

--- 37,64 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_aggregate");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_aggregate.aggfnoid", "AGGREGATE_FUNCTION", null);
  		}

  		public override void AddDataColumns()
  		{						
! 			AddDataColumn("Pg_aggregate.aggtransfn"	, "TRANSITION_FUNCTION");
! 			AddDataColumn("Pg_aggregate.aggfinalfn"	, "FINAL_FUNCTION");
! 			AddDataColumn("Pg_aggregate.agginitval"	, "INITIAL_VALUE");			
! 			AddDataColumn("Pg_type.typname"			, "BASE_TYPE");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_type", "Pg_aggregate.aggtranstype = Pg_type.oid");			
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_aggregate.aggfnoid");
  		}

Index: PGCastsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGCastsSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGCastsSchema.cs	21 Jul 2003 19:54:22 -0000	1.2
--- PGCastsSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGCastsSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGCastsSchema() : base("Casts")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCastsSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgCastsSchema() : base("Casts")
  		{
  		}
***************
*** 37,41 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_cast");
  		}

--- 37,41 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_cast");
  		}

***************
*** 46,67 ****
  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_typesrc.typname"	, "SOURCE_TYPE");
! 			AddDataColumn("pg_typetgt.typname"	, "TARGET_TYPE");
! 			AddDataColumn("pg_namespace.nspname", "FUNCTION_SCHEMA");
! 			AddDataColumn("pg_proc.proname"		, "FUNCTION_NAME");
! 			AddDataColumn(getContextExpression("pg_cast.castcontext"), "CAST_CONTEXT");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_type as pg_typesrc", "pg_cast.castsource = pg_typesrc.oid");
! 			AddJoin("left join", "pg_type as pg_typetgt", "pg_cast.casttarget = pg_typetgt.oid");
! 			AddJoin("left join", "pg_proc"				, "pg_cast.castfunc = pg_proc.oid");			
! 			AddJoin("left join", "pg_namespace"			, "pg_proc.pronamespace = pg_namespace.oid");			
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_proc.proname");
  		}

--- 46,67 ----
  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_typesrc.typname"	, "SOURCE_TYPE");
! 			AddDataColumn("Pg_typetgt.typname"	, "TARGET_TYPE");
! 			AddDataColumn("Pg_namespace.nspname", "FUNCTION_SCHEMA");
! 			AddDataColumn("Pg_proc.proname"		, "FUNCTION_NAME");
! 			AddDataColumn(getContextExpression("Pg_cast.castcontext"), "CAST_CONTEXT");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_type as Pg_typesrc", "Pg_cast.castsource = Pg_typesrc.oid");
! 			AddJoin("left join", "Pg_type as Pg_typetgt", "Pg_cast.casttarget = Pg_typetgt.oid");
! 			AddJoin("left join", "Pg_proc"				, "Pg_cast.castfunc = Pg_proc.oid");			
! 			AddJoin("left join", "Pg_namespace"			, "Pg_proc.pronamespace = Pg_namespace.oid");			
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_proc.proname");
  		}

Index: PGCheckConstraints.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGCheckConstraints.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PGCheckConstraints.cs	22 Jul 2003 17:20:10 -0000	1.3
--- PGCheckConstraints.cs	2 Aug 2003 19:13:29 -0000	1.4
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGCheckConstraintsSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGCheckConstraintsSchema() : base("CheckConstraints")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCheckConstraintsSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgCheckConstraintsSchema() : base("CheckConstraints")
  		{
  		}
***************
*** 37,70 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname", "CONSTRAINT_SCHEMA", null);
! 			AddRestrictionColumn("pg_constraint.conname", "CONSTRAINT_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_get_constraintdef(pg_constraint.oid)", "CHECK_CLAUSULE");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");						
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_namespace"		, "pg_constraint.connamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_description"	, "pg_constraint.oid = pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_constraint.conname");
  		}

  		public override void AddWhereFilters()
  		{
! 			AddWhereFilter("pg_constraint.contype = 'c'");
  		}

--- 37,70 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname", "CONSTRAINT_SCHEMA", null);
! 			AddRestrictionColumn("Pg_constraint.conname", "CONSTRAINT_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_get_constraintdef(Pg_constraint.oid)", "CHECK_CLAUSULE");
! 			AddDataColumn("Pg_description.description", "DESCRIPTION");						
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_namespace"		, "Pg_constraint.connamespace = Pg_namespace.oid");
! 			AddJoin("left join", "Pg_description"	, "Pg_constraint.oid = Pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_constraint.conname");
  		}

  		public override void AddWhereFilters()
  		{
! 			AddWhereFilter("Pg_constraint.contype = 'c'");
  		}

Index: PGCheckConstraintsByTable.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGCheckConstraintsByTable.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PGCheckConstraintsByTable.cs	22 Jul 2003 17:21:31 -0000	1.1
--- PGCheckConstraintsByTable.cs	2 Aug 2003 19:13:29 -0000	1.2
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGCheckConstraintsByTableSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGCheckConstraintsByTableSchema() : base("CheckConstraintsByTable")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgCheckConstraintsByTableSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgCheckConstraintsByTableSchema() : base("CheckConstraintsByTable")
  		{
  		}
***************
*** 37,76 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "CONSTRAINT_SCHEMA"	, null);
! 			AddRestrictionColumn("pg_constraint.conname", "CONSTRAINT_NAME"		, null);
  			AddRestrictionColumn("tbn.nspname"			, "TABLE_SCHEMA"		, null);
! 			AddRestrictionColumn("pg_class.relname"		, "TABLE_NAME"			, null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_get_constraintdef(pg_constraint.oid)", "CHECK_CLAUSULE");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");						
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_class"			, "pg_class.oid = pg_constraint.conrelid");
! 			AddJoin("left join", "pg_namespace tbn"	, "pg_class.relnamespace = tbn.oid");
! 			AddJoin("left join", "pg_namespace"		, "pg_constraint.connamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_description"	, "pg_constraint.oid = pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_class.relname");
! 			AddOrderBy("pg_constraint.conname");			
  		}

  		public override void AddWhereFilters()
  		{
! 			AddWhereFilter("pg_constraint.contype = 'c'");
! 			AddWhereFilter("pg_class.relkind = 'r'");
  		}

--- 37,76 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "CONSTRAINT_SCHEMA"	, null);
! 			AddRestrictionColumn("Pg_constraint.conname", "CONSTRAINT_NAME"		, null);
  			AddRestrictionColumn("tbn.nspname"			, "TABLE_SCHEMA"		, null);
! 			AddRestrictionColumn("Pg_class.relname"		, "TABLE_NAME"			, null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_get_constraintdef(Pg_constraint.oid)", "CHECK_CLAUSULE");
! 			AddDataColumn("Pg_description.description", "DESCRIPTION");						
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_class"			, "Pg_class.oid = Pg_constraint.conrelid");
! 			AddJoin("left join", "Pg_namespace tbn"	, "Pg_class.relnamespace = tbn.oid");
! 			AddJoin("left join", "Pg_namespace"		, "Pg_constraint.connamespace = Pg_namespace.oid");
! 			AddJoin("left join", "Pg_description"	, "Pg_constraint.oid = Pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_class.relname");
! 			AddOrderBy("Pg_constraint.conname");			
  		}

  		public override void AddWhereFilters()
  		{
! 			AddWhereFilter("Pg_constraint.contype = 'c'");
! 			AddWhereFilter("Pg_class.relkind = 'r'");
  		}

Index: PGColumnsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGColumnsSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGColumnsSchema.cs	21 Jul 2003 19:54:22 -0000	1.2
--- PGColumnsSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGColumnsSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGColumnsSchema() : base("Columns")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgColumnsSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgColumnsSchema() : base("Columns")
  		{
  		}
***************
*** 37,76 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_attribute");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "TABLE_SCHEMA", null);
! 			AddRestrictionColumn("pg_class.relname"		, "TABLE_NAME", null);
! 			AddRestrictionColumn("pg_attribute.attname"	, "COLUMN_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_attribute.atttypid"	, "DATA_TYPE");
! 			AddDataColumn("pg_attribute.attlen"		, "COLUMN_SIZE");
! 			AddDataColumn("pg_attribute.attndims"	, "COLUMN_DIMENSIONS");
! 			AddDataColumn("pg_attribute.attnum"		, "ORDINAL_POSITION");
! 			AddDataColumn("pg_attribute.atthasdef"	, "HAS_DEFAULT");
! 			AddDataColumn("pg_attrdef.adsrc"		, "COLUMN_DEFAULT");
! 			AddDataColumn("pg_attribute.attnotnull"	, "IS_NOT_NULL");
! 			AddDataColumn(getStorageExpression("pg_attribute.attstorage"), "STORAGE");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_class"		, "pg_attribute.attrelid = pg_class.oid");
! 			AddJoin("left join", "pg_namespace"	, "pg_class.relnamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_attrdef"	, "pg_class.oid = pg_attrdef.adrelid AND pg_attribute.attnum = pg_attrdef.adnum");
! 			AddJoin("left join", "pg_description", "pg_attribute.attrelid = pg_description.objoid AND pg_attribute.attnum = pg_description.objsubid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_class.relname");
! 			AddOrderBy("pg_attribute.attnum");
  		}

--- 37,76 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_attribute");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "TABLE_SCHEMA", null);
! 			AddRestrictionColumn("Pg_class.relname"		, "TABLE_NAME", null);
! 			AddRestrictionColumn("Pg_attribute.attname"	, "COLUMN_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_attribute.atttypid"	, "DATA_TYPE");
! 			AddDataColumn("Pg_attribute.attlen"		, "COLUMN_SIZE");
! 			AddDataColumn("Pg_attribute.attndims"	, "COLUMN_DIMENSIONS");
! 			AddDataColumn("Pg_attribute.attnum"		, "ORDINAL_POSITION");
! 			AddDataColumn("Pg_attribute.atthasdef"	, "HAS_DEFAULT");
! 			AddDataColumn("Pg_attrdef.adsrc"		, "COLUMN_DEFAULT");
! 			AddDataColumn("Pg_attribute.attnotnull"	, "IS_NOT_NULL");
! 			AddDataColumn(getStorageExpression("Pg_attribute.attstorage"), "STORAGE");
! 			AddDataColumn("Pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_class"		, "Pg_attribute.attrelid = Pg_class.oid");
! 			AddJoin("left join", "Pg_namespace"	, "Pg_class.relnamespace = Pg_namespace.oid");
! 			AddJoin("left join", "Pg_attrdef"	, "Pg_class.oid = Pg_attrdef.adrelid AND Pg_attribute.attnum = Pg_attrdef.adnum");
! 			AddJoin("left join", "Pg_description", "Pg_attribute.attrelid = Pg_description.objoid AND Pg_attribute.attnum = Pg_description.objsubid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_class.relname");
! 			AddOrderBy("Pg_attribute.attnum");
  		}

***************
*** 78,84 ****
  		{
  			// Do not get dropped columns
! 			AddWhereFilter("pg_attribute.attisdropped = false");
  			// Get only columns with a number > 0
! 			AddWhereFilter("pg_attribute.attnum > 0");
  		}

--- 78,84 ----
  		{
  			// Do not get dropped columns
! 			AddWhereFilter("Pg_attribute.attisdropped = false");
  			// Get only columns with a number > 0
! 			AddWhereFilter("Pg_attribute.attnum > 0");
  		}

Index: PGDatabaseSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGDatabaseSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGDatabaseSchema.cs	21 Jul 2003 19:54:22 -0000	1.2
--- PGDatabaseSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGDatabaseSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGDatabaseSchema() : base("Database")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDatabaseSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgDatabaseSchema() : base("Database")
  		{
  		}
***************
*** 37,53 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_database");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_database.datname", "DATABASE_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_database.datistemplate"	, "IS_TEMPLATE");
! 			AddDataColumn("pg_database.datallowconn"	, "ALLOW_CONNECTION");
! 			AddDataColumn("pg_database.datconfig"		, "DATABASE_CONFIG");
  		}

--- 37,53 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_database");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_database.datname", "DATABASE_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_database.datistemplate"	, "IS_TEMPLATE");
! 			AddDataColumn("Pg_database.datallowconn"	, "ALLOW_CONNECTION");
! 			AddDataColumn("Pg_database.datconfig"		, "DATABASE_CONFIG");
  		}

Index: PGDbSchemaFactory.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/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	22 Jul 2003 17:20:10 -0000	1.2
--- PGDbSchemaFactory.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 19,27 ****
  using System;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGDbSchemaFactory
  	{
! 		public static IDbSchema GetSchema(PGDbSchemaType schema)
  		{
  			IDbSchema returnSchema = null;
--- 19,27 ----
  using System;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDbSchemaFactory
  	{
! 		public static IDbSchema GetSchema(PgDbSchemaType schema)
  		{
  			IDbSchema returnSchema = null;
***************
*** 29,137 ****
  			switch(schema)
  			{
! 				case PGDbSchemaType.Aggregates: 
! 					returnSchema = new PGAggregatesSchema();
  					break;

! 				case PGDbSchemaType.Casts: 
! 					returnSchema = new PGCastsSchema();
  					break;

! 				case PGDbSchemaType.Check_Constraints:
! 					returnSchema = new PGCheckConstraintsSchema();
  					break;

! 				case PGDbSchemaType.Check_Constraints_By_Table:
! 					returnSchema = new PGCheckConstraintsByTableSchema();
  					break;

! 				case PGDbSchemaType.Columns:
! 					returnSchema = new PGColumnsSchema();
  					break;

! 				case PGDbSchemaType.Database:
! 					returnSchema = new PGDatabaseSchema();
  					break;

! 				case PGDbSchemaType.Domains:
! 					returnSchema = new PGDomainsSchema();
  					break;

! 				case PGDbSchemaType.Foreign_Keys:
! 					returnSchema = new PGForeignKeysSchema();
  					break;

! 				case PGDbSchemaType.Groups:
! 					returnSchema = new PGGroupsSchema();
  					break;

! 				case PGDbSchemaType.Indexes:
! 					returnSchema = new PGIndexesSchema();
  					break;

! 				case PGDbSchemaType.Primary_Keys: 
! 					returnSchema = new PGPrimaryKeysSchema();
  					break;

! 				case PGDbSchemaType.Function_Privileges:
! 					returnSchema = new PGFunctionPrivilegesSchema();
  					break;

! 				case PGDbSchemaType.Functions:
! 					returnSchema = new PGFunctionsSchema();
  					break;

! 				case PGDbSchemaType.Provider_Types:
! 					returnSchema = new PGProviderTypesSchema();
  					break;

! 				case PGDbSchemaType.Schemata: 	
! 					returnSchema = new PGSchemataSchema();
  					break;

! 				case PGDbSchemaType.Sql_Languages: 
! 					returnSchema = new PGSqlLanguagesSchema();
  					break;

! 				case PGDbSchemaType.Statistics: 
  					break;

! 				case PGDbSchemaType.Tables: 
! 					returnSchema = new PGTablesSchema();
  					break;

! 				case PGDbSchemaType.Table_Constraint:
! 					returnSchema = new PGTableConstraintsSchema();
  					break;

! 				case PGDbSchemaType.Tables_Info: 
  					break;

! 				case PGDbSchemaType.Table_Privileges:
! 					returnSchema = new PGTablePrivilegesSchema();					
  					break;

! 				case PGDbSchemaType.Table_Statistics:
  					break;

! 				case PGDbSchemaType.Triggers: 
! 					returnSchema = new PGTriggersSchema();
  					break;

! 				case PGDbSchemaType.Trigger_Parameters:
  					break;

! 				case PGDbSchemaType.Trigger_Privileges: 
  					break;

! 				case PGDbSchemaType.Users:
! 					returnSchema = new PGUsersSchema();
  					break;

! 				case PGDbSchemaType.Views:
! 					returnSchema = new PGViewsSchema();
  					break;

! 				case PGDbSchemaType.View_Privileges:
! 					returnSchema = new PGViewPrivilegesSchema();
  					break;
  			}
--- 29,137 ----
  			switch(schema)
  			{
! 				case PgDbSchemaType.Aggregates: 
! 					returnSchema = new PgAggregatesSchema();
  					break;

! 				case PgDbSchemaType.Casts: 
! 					returnSchema = new PgCastsSchema();
  					break;

! 				case PgDbSchemaType.Check_Constraints:
! 					returnSchema = new PgCheckConstraintsSchema();
  					break;

! 				case PgDbSchemaType.Check_Constraints_By_Table:
! 					returnSchema = new PgCheckConstraintsByTableSchema();
  					break;

! 				case PgDbSchemaType.Columns:
! 					returnSchema = new PgColumnsSchema();
  					break;

! 				case PgDbSchemaType.Database:
! 					returnSchema = new PgDatabaseSchema();
  					break;

! 				case PgDbSchemaType.Domains:
! 					returnSchema = new PgDomainsSchema();
  					break;

! 				case PgDbSchemaType.Foreign_Keys:
! 					returnSchema = new PgForeignKeysSchema();
  					break;

! 				case PgDbSchemaType.Groups:
! 					returnSchema = new PgGroupsSchema();
  					break;

! 				case PgDbSchemaType.Indexes:
! 					returnSchema = new PgIndexesSchema();
  					break;

! 				case PgDbSchemaType.Primary_Keys: 
! 					returnSchema = new PgPrimaryKeysSchema();
  					break;

! 				case PgDbSchemaType.Function_Privileges:
! 					returnSchema = new PgFunctionPrivilegesSchema();
  					break;

! 				case PgDbSchemaType.Functions:
! 					returnSchema = new PgFunctionsSchema();
  					break;

! 				case PgDbSchemaType.Provider_Types:
! 					returnSchema = new PgProviderTypesSchema();
  					break;

! 				case PgDbSchemaType.Schemata: 	
! 					returnSchema = new PgSchemataSchema();
  					break;

! 				case PgDbSchemaType.Sql_Languages: 
! 					returnSchema = new PgSqlLanguagesSchema();
  					break;

! 				case PgDbSchemaType.Statistics: 
  					break;

! 				case PgDbSchemaType.Tables: 
! 					returnSchema = new PgTablesSchema();
  					break;

! 				case PgDbSchemaType.Table_Constraint:
! 					returnSchema = new PgTableConstraintsSchema();
  					break;

! 				case PgDbSchemaType.Tables_Info: 
  					break;

! 				case PgDbSchemaType.Table_Privileges:
! 					returnSchema = new PgTablePrivilegesSchema();					
  					break;

! 				case PgDbSchemaType.Table_Statistics:
  					break;

! 				case PgDbSchemaType.Triggers: 
! 					returnSchema = new PgTriggersSchema();
  					break;

! 				case PgDbSchemaType.Trigger_Parameters:
  					break;

! 				case PgDbSchemaType.Trigger_Privileges: 
  					break;

! 				case PgDbSchemaType.Users:
! 					returnSchema = new PgUsersSchema();
  					break;

! 				case PgDbSchemaType.Views:
! 					returnSchema = new PgViewsSchema();
  					break;

! 				case PgDbSchemaType.View_Privileges:
! 					returnSchema = new PgViewPrivilegesSchema();
  					break;
  			}

Index: PGDomainsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGDomainsSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGDomainsSchema.cs	21 Jul 2003 19:53:35 -0000	1.2
--- PGDomainsSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGDomainsSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGDomainsSchema() : base("Domains")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgDomainsSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgDomainsSchema() : base("Domains")
  		{
  		}
***************
*** 37,76 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_type");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "DOMAIN_SCHEMA", null);
! 			AddRestrictionColumn("pg_type.typname"		, "DOMAIN_NAME", null);
! 			AddRestrictionColumn("pg_type.oid"			, "DATA_TYPE", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_type.typlen"		, "COLUMN_SIZE");
! 			AddDataColumn("pg_type.typnotnull"	, "IS_NOT_NULL");
! 			AddDataColumn("pg_type.typndims"	, "ARRAY_DIMENSIONS");
! 			AddDataColumn("pg_type.typelem"		, "ELEMENT_TYPE");
! 			AddDataColumn("pg_type.typbasetype"	, "BASE_TYPE");
! 			AddDataColumn("pg_type.typtypmod"	, "BASE_TYPE_MODIFIER");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_namespace"		, "pg_type.typnamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_description"	, "pg_type.oid = pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_type.typname");
  		}

  		public override void AddWhereFilters()
  		{
! 			AddWhereFilter("pg_type.typtype = 'd'");
  		}

--- 37,76 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_type");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "DOMAIN_SCHEMA", null);
! 			AddRestrictionColumn("Pg_type.typname"		, "DOMAIN_NAME", null);
! 			AddRestrictionColumn("Pg_type.oid"			, "DATA_TYPE", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_type.typlen"		, "COLUMN_SIZE");
! 			AddDataColumn("Pg_type.typnotnull"	, "IS_NOT_NULL");
! 			AddDataColumn("Pg_type.typndims"	, "ARRAY_DIMENSIONS");
! 			AddDataColumn("Pg_type.typelem"		, "ELEMENT_TYPE");
! 			AddDataColumn("Pg_type.typbasetype"	, "BASE_TYPE");
! 			AddDataColumn("Pg_type.typtypmod"	, "BASE_TYPE_MODIFIER");
! 			AddDataColumn("Pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_namespace"		, "Pg_type.typnamespace = Pg_namespace.oid");
! 			AddJoin("left join", "Pg_description"	, "Pg_type.oid = Pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_type.typname");
  		}

  		public override void AddWhereFilters()
  		{
! 			AddWhereFilter("Pg_type.typtype = 'd'");
  		}

Index: PGForeignKeysSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGForeignKeysSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGForeignKeysSchema.cs	21 Jul 2003 19:53:35 -0000	1.2
--- PGForeignKeysSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGForeignKeysSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGForeignKeysSchema() : base("ForeignKeys")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgForeignKeysSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgForeignKeysSchema() : base("ForeignKeys")
  		{
  		}
***************
*** 37,48 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "PK_TABLE_SCHEMA", null);
  			AddRestrictionColumn("pk_table.relname"		, "PK_TABLE_NAME", null);
! 			AddRestrictionColumn("pg_namespace.nspname"	, "FK_TABLE_SCHEMA", null);
  			AddRestrictionColumn("fk_table.relname"		, "FK_TABLE_NAME", null);			
  		}
--- 37,48 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "PK_TABLE_SCHEMA", null);
  			AddRestrictionColumn("pk_table.relname"		, "PK_TABLE_NAME", null);
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "FK_TABLE_SCHEMA", null);
  			AddRestrictionColumn("fk_table.relname"		, "FK_TABLE_NAME", null);			
  		}
***************
*** 50,76 ****
  		public override void AddDataColumns()
  		{			
! 			AddDataColumn("pg_constraint.conkey"	, "PK_COLUMNS");
! 			AddDataColumn("pg_constraint.confkey"	, "FK_COLUMNS");
! 			AddDataColumn(getRuleExpression("pg_constraint.confupdtype"), "UPDATE_RULE");
! 			AddDataColumn(getRuleExpression("pg_constraint.confdeltype"), "DELETE_RULE");			
! 			AddDataColumn("pg_constraint.conname"	, "FK_NAME");
! 			AddDataColumn("pg_constraint.condeferrable"	, "DEFERRABILITY");
! 			AddDataColumn("pg_constraint.condeferred"	, "IS_DEFERRED");
! 			AddDataColumn("pg_description.description"	, "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join"	, "pg_namespace", "pg_constraint.connamespace = pg_namespace.oid");
! 			AddJoin("left join"	, "pg_class as pk_table", "pg_constraint.conrelid = pk_table.oid");
! 			AddJoin("right join", "pg_class as fk_table", "pg_constraint.confrelid = fk_table.oid");
! 			AddJoin("left join"	, "pg_description", "pg_constraint.oid = pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
  			AddOrderBy("pk_table.relname");
! 			AddOrderBy("pg_constraint.conname");
  		}

--- 50,76 ----
  		public override void AddDataColumns()
  		{			
! 			AddDataColumn("Pg_constraint.conkey"	, "PK_COLUMNS");
! 			AddDataColumn("Pg_constraint.confkey"	, "FK_COLUMNS");
! 			AddDataColumn(getRuleExpression("Pg_constraint.confupdtype"), "UPDATE_RULE");
! 			AddDataColumn(getRuleExpression("Pg_constraint.confdeltype"), "DELETE_RULE");			
! 			AddDataColumn("Pg_constraint.conname"	, "FK_NAME");
! 			AddDataColumn("Pg_constraint.condeferrable"	, "DEFERRABILITY");
! 			AddDataColumn("Pg_constraint.condeferred"	, "IS_DEFERRED");
! 			AddDataColumn("Pg_description.description"	, "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join"	, "Pg_namespace", "Pg_constraint.connamespace = Pg_namespace.oid");
! 			AddJoin("left join"	, "Pg_class as pk_table", "Pg_constraint.conrelid = pk_table.oid");
! 			AddJoin("right join", "Pg_class as fk_table", "Pg_constraint.confrelid = fk_table.oid");
! 			AddJoin("left join"	, "Pg_description", "Pg_constraint.oid = Pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
  			AddOrderBy("pk_table.relname");
! 			AddOrderBy("Pg_constraint.conname");
  		}

***************
*** 78,82 ****
  		{
  			// Get Only Primary Key information
! 			AddWhereFilter("pg_constraint.contype = 'f'");
  		}

--- 78,82 ----
  		{
  			// Get Only Primary Key information
! 			AddWhereFilter("Pg_constraint.contype = 'f'");
  		}

Index: PGFunctionPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGFunctionPrivilegesSchema.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PGFunctionPrivilegesSchema.cs	22 Jul 2003 17:21:00 -0000	1.1
--- PGFunctionPrivilegesSchema.cs	2 Aug 2003 19:13:29 -0000	1.2
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGFunctionPrivilegesSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGFunctionPrivilegesSchema() : base("Function_Privileges")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgFunctionPrivilegesSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgFunctionPrivilegesSchema() : base("Function_Privileges")
  		{
  		}
***************
*** 37,63 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_proc");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "FUNCTION_SCHEMA", null);
! 			AddRestrictionColumn("pg_proc.proname"		, "FUNCTION_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_proc.proacl", "PRIVILEGES");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_namespace"	, "pg_proc.pronamespace = pg_namespace.oid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_proc.proname");
  		}

--- 37,63 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_proc");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "FUNCTION_SCHEMA", null);
! 			AddRestrictionColumn("Pg_proc.proname"		, "FUNCTION_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_proc.proacl", "PRIVILEGES");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_namespace"	, "Pg_proc.pronamespace = Pg_namespace.oid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_proc.proname");
  		}

***************
*** 81,85 ****
  		#region OVERRIDEN_METHODS

! 		public override DataTable GetDbSchemaTable(PGConnection connection, object[] restrictions)
  		{
  			DataTable tablesSchema = base.GetDbSchemaTable(connection, restrictions);
--- 81,85 ----
  		#region OVERRIDEN_METHODS

! 		public override DataTable GetDbSchemaTable(PgConnection connection, object[] restrictions)
  		{
  			DataTable tablesSchema = base.GetDbSchemaTable(connection, restrictions);
***************
*** 90,94 ****
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				PGPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);

  				for (int i = 0; i < priv.Length; i++)
--- 90,94 ----
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);

  				for (int i = 0; i < priv.Length; i++)

Index: PGFunctionsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGFunctionsSchema.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PGFunctionsSchema.cs	22 Jul 2003 17:20:10 -0000	1.3
--- PGFunctionsSchema.cs	2 Aug 2003 19:13:29 -0000	1.4
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGFunctionsSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGFunctionsSchema() : base("Functions")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgFunctionsSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgFunctionsSchema() : base("Functions")
  		{
  		}
***************
*** 37,75 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_proc");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "FUNCTION_SCHEMA", null);
! 			AddRestrictionColumn("pg_proc.proname"		, "FUNCTION_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_language.lanname"	, "PROCEDURE_LANGUAGE");
! 			AddDataColumn("pg_proc.proisagg"	, "IS_AGGREGATE");
! 			AddDataColumn("pg_proc.prosecdef"	, "IS_SECURITY_DEFINER");
! 			AddDataColumn("pg_proc.proisstrict"	, "IS_STRICT");
! 			AddDataColumn(getVolatileExpression("pg_proc.provolatile")	, "VOLATILE");
! 			AddDataColumn("pg_proc.proretset"	, "RETURNS_SET");
! 			AddDataColumn("pg_proc.prorettype"	, "RETURN_TYPE");
! 			AddDataColumn("pg_proc.pronargs"	, "ARGUMENT_NUMBER");
! 			AddDataColumn("pg_proc.proargtypes"	, "ARGUMENTS");
! 			AddDataColumn("pg_proc.prosrc"		, "SOURCE");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_namespace"	, "pg_proc.pronamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_language"	, "pg_proc.prolang = pg_language.oid");		
! 			AddJoin("left join", "pg_description", "pg_proc.oid = pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_proc.proname");
  		}

--- 37,75 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_proc");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "FUNCTION_SCHEMA", null);
! 			AddRestrictionColumn("Pg_proc.proname"		, "FUNCTION_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pg_language.lanname"	, "PROCEDURE_LANGUAGE");
! 			AddDataColumn("Pg_proc.proisagg"	, "IS_AGGREGATE");
! 			AddDataColumn("Pg_proc.prosecdef"	, "IS_SECURITY_DEFINER");
! 			AddDataColumn("Pg_proc.proisstrict"	, "IS_STRICT");
! 			AddDataColumn(getVolatileExpression("Pg_proc.provolatile")	, "VOLATILE");
! 			AddDataColumn("Pg_proc.proretset"	, "RETURNS_SET");
! 			AddDataColumn("Pg_proc.prorettype"	, "RETURN_TYPE");
! 			AddDataColumn("Pg_proc.pronargs"	, "ARGUMENT_NUMBER");
! 			AddDataColumn("Pg_proc.proargtypes"	, "ARGUMENTS");
! 			AddDataColumn("Pg_proc.prosrc"		, "SOURCE");
! 			AddDataColumn("Pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "Pg_namespace"	, "Pg_proc.pronamespace = Pg_namespace.oid");
! 			AddJoin("left join", "Pg_language"	, "Pg_proc.prolang = Pg_language.oid");		
! 			AddJoin("left join", "Pg_description", "Pg_proc.oid = Pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_proc.proname");
  		}

Index: PGGroupsSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGGroupsSchema.cs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PGGroupsSchema.cs	12 Jul 2003 08:11:22 -0000	1.1.1.1
--- PGGroupsSchema.cs	2 Aug 2003 19:13:29 -0000	1.2
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGGroupsSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGGroupsSchema() : base("Groups")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgGroupsSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgGroupsSchema() : base("Groups")
  		{
  		}
***************
*** 37,51 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_group");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_group.groname", "GROUP_NAME", null);			
  		}

  		public override void AddDataColumns()
  		{
! 			AddRestrictionColumn("pg_group.grolist", "GROUP_USERS", null);
  		}

--- 37,51 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_group");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_group.groname", "GROUP_NAME", null);			
  		}

  		public override void AddDataColumns()
  		{
! 			AddRestrictionColumn("Pg_group.grolist", "GROUP_USERS", null);
  		}

***************
*** 56,60 ****
  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_group.groname");
  		}

--- 56,60 ----
  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_group.groname");
  		}

Index: PGIndexesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGIndexesSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGIndexesSchema.cs	21 Jul 2003 19:53:35 -0000	1.2
--- PGIndexesSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGIndexesSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGIndexesSchema() : base("Indexes")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgIndexesSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgIndexesSchema() : base("Indexes")
  		{
  		}
***************
*** 37,79 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_index");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "TABLE_SCHEMA", null);
! 			AddRestrictionColumn("pg_class.relname"		, "TABLE_NAME", null);
! 			AddRestrictionColumn("pg_classidx.relname"	, "INDEX_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pgnamespidx.nspname"		, "INDEX_SCHEMA");
! 			AddDataColumn("pg_am.amname"			, "TYPE");
! 			AddDataColumn("pg_index.indkey"			, "INDEX_KEY");
! 			AddDataColumn("pg_index.indisclustered"	, "CLUSTERED");
! 			AddDataColumn("pg_index.indisunique"	, "UNIQUE");
! 			AddDataColumn("pg_index.indisprimary"	, "PRIMARY");
! 			AddDataColumn("pg_am.amindexnulls"		, "ALLOW_NULLS");
! 			AddDataColumn("pg_am.amcanmulticol"		, "MULTICOLUMN");
! 			AddDataColumn("pg_am.amconcurrent"		, "CONCURRENT");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{			
! 			AddJoin("left join", "pg_class", "pg_index.indrelid = pg_class.oid");			
! 			AddJoin("left join", "pg_class as pg_classidx", "pg_index.indexrelid = pg_classidx.oid");
! 			AddJoin("left join", "pg_namespace", "pg_classidx.relnamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_namespace as pgnamespidx", "pg_classidx.relnamespace = pgnamespidx.oid");
! 			AddJoin("left join", "pg_am", "pg_classidx.relam = pg_am.oid");
! 			AddJoin("left join", "pg_description", "pg_index.indexrelid = pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("pg_namespace.nspname");
! 			AddOrderBy("pg_class.relname");
! 			AddOrderBy("pg_classidx.relname");
  		}

--- 37,79 ----
  		public override void AddTables()
  		{
! 			AddTable("Pg_index");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("Pg_namespace.nspname"	, "TABLE_SCHEMA", null);
! 			AddRestrictionColumn("Pg_class.relname"		, "TABLE_NAME", null);
! 			AddRestrictionColumn("Pg_classidx.relname"	, "INDEX_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("Pgnamespidx.nspname"		, "INDEX_SCHEMA");
! 			AddDataColumn("Pg_am.amname"			, "TYPE");
! 			AddDataColumn("Pg_index.indkey"			, "INDEX_KEY");
! 			AddDataColumn("Pg_index.indisclustered"	, "CLUSTERED");
! 			AddDataColumn("Pg_index.indisunique"	, "UNIQUE");
! 			AddDataColumn("Pg_index.indisprimary"	, "PRIMARY");
! 			AddDataColumn("Pg_am.amindexnulls"		, "ALLOW_NULLS");
! 			AddDataColumn("Pg_am.amcanmulticol"		, "MULTICOLUMN");
! 			AddDataColumn("Pg_am.amconcurrent"		, "CONCURRENT");
! 			AddDataColumn("Pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{			
! 			AddJoin("left join", "Pg_class", "Pg_index.indrelid = Pg_class.oid");			
! 			AddJoin("left join", "Pg_class as Pg_classidx", "Pg_index.indexrelid = Pg_classidx.oid");
! 			AddJoin("left join", "Pg_namespace", "Pg_classidx.relnamespace = Pg_namespace.oid");
! 			AddJoin("left join", "Pg_namespace as Pgnamespidx", "Pg_classidx.relnamespace = Pgnamespidx.oid");
! 			AddJoin("left join", "Pg_am", "Pg_classidx.relam = Pg_am.oid");
! 			AddJoin("left join", "Pg_description", "Pg_index.indexrelid = Pg_description.objoid");
  		}

  		public override void AddOrderByColumns()
  		{
! 			AddOrderBy("Pg_namespace.nspname");
! 			AddOrderBy("Pg_class.relname");
! 			AddOrderBy("Pg_classidx.relname");
  		}

Index: PGPrimaryKeysSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema/PGPrimaryKeysSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PGPrimaryKeysSchema.cs	21 Jul 2003 19:53:35 -0000	1.2
--- PGPrimaryKeysSchema.cs	2 Aug 2003 19:13:29 -0000	1.3
***************
*** 1,3 ****
! /* PGSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
--- 1,3 ----
! /* PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+
   * Copyright (C) 2003  Carlos Guzmán Álvarez
   * 
***************
*** 21,31 ****
  using System.Text;

! namespace PostgreSql.Data.PGSqlClient.DbSchema
  {
! 	internal class PGPrimaryKeysSchema : PGAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PGPrimaryKeysSchema() : base("PrimaryKeys")
  		{
  		}
--- 21,31 ----
  using System.Text;

! namespace PostgreSql.Data.PgSqlClient.DbSchema
  {
! 	internal class PgPrimaryKeysSchema : PgAbstractDbSchema
  	{
  		#region CONSTRUCTORS

! 		public PgPrimaryKeysSchema() : base("PrimaryKeys")
  		{
  		}
***************
*** 37,68 ****
  		public override void AddTables()
  		{
! 			AddTable("pg_constraint");
  		}

  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "TABLE_SCHEMA", null);
! 			AddRestrictionColumn("pg_class.relname"		, "TABLE_NAME", null);
  		}

  		public override void AddDataColumns()
  		{
! 			AddDataColumn("pg_constraint.conname"	, "PK_NAME");
! 			AddDataColumn("pg_constraint.conkey"	, "PK_COLUMNS");
! 			AddDataColumn("pg_description.description", "DESCRIPTION");
  		}

  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_class", "pg_constraint.conrelid = pg_class.oid");
! 			AddJoin("left join", "pg_namespace", "pg_constraint.connamespace = pg_namespace.oid");
! 			AddJoin("left join...

[truncated message content]