[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema PgFunctionPrivilegesSchema.cs,1.2,1.3 PgTablePrivilegesSchema.cs,1.2,1.3 PgTriggersSchema.cs,1.2,1.3 PgViewPrivilegesSchema.cs,1.2,1.3

[<car...@us...>]

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

Modified Files:
	PgFunctionPrivilegesSchema.cs PgTablePrivilegesSchema.cs 
	PgTriggersSchema.cs PgViewPrivilegesSchema.cs 
Log Message:
* Added some improvements to TLS connections.

* Fixed some problems in Database Schema support.


Index: PgFunctionPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgFunctionPrivilegesSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgFunctionPrivilegesSchema.cs	2 Aug 2003 21:11:37 -0000	1.2
--- PgFunctionPrivilegesSchema.cs	15 Sep 2003 21:34:06 -0000	1.3
***************
*** 90,106 ****
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);
! 
! 				for (int i = 0; i < priv.Length; i++)
  				{
! 					DataRow newRow = privileges.NewRow();
  
! 					newRow["FUNCTION_SCHEMA"]	= row["FUNCTION_SCHEMA"];
! 					newRow["FUNCTION_NAME"]		= row["FUNCTION_NAME"];
! 					newRow["USER_NAME"]			= priv[i].User;
  
! 					FillPrivileges(newRow, priv[i].Privileges);
  
! 					privileges.Rows.Add(newRow);
  				}
  			}
--- 90,109 ----
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				if (row["PRIVILEGES"] != System.DBNull.Value)
  				{
! 					PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);
  
! 					for (int i = 0; i < priv.Length; i++)
! 					{
! 						DataRow newRow = privileges.NewRow();
  
! 						newRow["FUNCTION_SCHEMA"]	= row["FUNCTION_SCHEMA"];
! 						newRow["FUNCTION_NAME"]		= row["FUNCTION_NAME"];
! 						newRow["USER_NAME"]			= priv[i].User;
  
! 						FillPrivileges(newRow, priv[i].Privileges);
! 
! 						privileges.Rows.Add(newRow);
! 					}
  				}
  			}

Index: PgTablePrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTablePrivilegesSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgTablePrivilegesSchema.cs	2 Aug 2003 21:11:37 -0000	1.2
--- PgTablePrivilegesSchema.cs	15 Sep 2003 21:34:06 -0000	1.3
***************
*** 81,97 ****
  			foreach (DataRow row in tablesSchema.Rows)
  			{
!                 PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);
! 
! 				for (int i = 0; i < priv.Length; i++)
  				{
! 					DataRow newRow = privileges.NewRow();
  
! 					newRow["TABLE_SCHEMA"]		= row["TABLE_SCHEMA"];
! 					newRow["TABLE_NAME"]		= row["TABLE_NAME"];
! 					newRow["USER_NAME"]			= priv[i].User;
  
! 					FillPrivileges(newRow, priv[i].Privileges);
  
! 					privileges.Rows.Add(newRow);
  				}
  			}
--- 81,100 ----
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				if (row["PRIVILEGES"] != System.DBNull.Value)
  				{
! 					PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);
  
! 					for (int i = 0; i < priv.Length; i++)
! 					{
! 						DataRow newRow = privileges.NewRow();
  
! 						newRow["TABLE_SCHEMA"]		= row["TABLE_SCHEMA"];
! 						newRow["TABLE_NAME"]		= row["TABLE_NAME"];
! 						newRow["USER_NAME"]			= priv[i].User;
  
! 						FillPrivileges(newRow, priv[i].Privileges);
! 
! 						privileges.Rows.Add(newRow);
! 					}
  				}
  			}

Index: PgTriggersSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTriggersSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgTriggersSchema.cs	2 Aug 2003 21:11:37 -0000	1.2
--- PgTriggersSchema.cs	15 Sep 2003 21:34:06 -0000	1.3
***************
*** 42,62 ****
  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname", "PROCEDURE_SCHEMA", null);
! 			AddRestrictionColumn("pg_proc.proname", "PROCEDURE_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("pg_proc.proretset", "RETURNS_SET");			
  		}
  
  		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");		
  		}
  
--- 42,66 ----
  		public override void AddRestrictionColumns()
  		{
! 			AddRestrictionColumn("pg_namespace.nspname"	, "TRIGGER_SCHEMA", null);
! 			AddRestrictionColumn("pg_proc.proname"		, "TRIGGER_NAME", null);
! 			AddRestrictionColumn("pg_class.relnamespace", "TABLE_SCHEMA", null);
! 			AddRestrictionColumn("pg_class.relname"		, "TABLE_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("pg_proc.proretset"	, "RETURNS_SET");			
  		}
  
  		public override void AddJoins()
  		{
! 			AddJoin("left join", "pg_class"		, "pg_trigger.tgconstrrelid = pg_class.oid");
! 			AddJoin("left join", "pg_proc"		, "pg_trigger.tgfoid = pg_proc.oid");
! 			AddJoin("left join", "pg_namespace"	, "pg_proc.pronamespace = pg_namespace.oid");
! 			AddJoin("left join", "pg_language"	, "pg_proc.prolang = pg_language.oid");		
  		}
  

Index: PgViewPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgViewPrivilegesSchema.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PgViewPrivilegesSchema.cs	2 Aug 2003 21:11:37 -0000	1.2
--- PgViewPrivilegesSchema.cs	15 Sep 2003 21:34:06 -0000	1.3
***************
*** 81,97 ****
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);
! 
! 				for (int i = 0; i < priv.Length; i++)
  				{
! 					DataRow newRow = privileges.NewRow();
  
! 					newRow["VIEW_SCHEMA"]	= row["VIEW_SCHEMA"];
! 					newRow["VIEW_NAME"]		= row["VIEW_NAME"];
! 					newRow["USER_NAME"]		= priv[i].User;
  
! 					FillPrivileges(newRow, priv[i].Privileges);
  
! 					privileges.Rows.Add(newRow);
  				}
  			}
--- 81,100 ----
  			foreach (DataRow row in tablesSchema.Rows)
  			{
! 				if (row["PRIVILEGES"] != System.DBNull.Value)
  				{
! 					PgPrivilege[] priv = DecodePrivileges((string[])row["PRIVILEGES"]);
  
! 					for (int i = 0; i < priv.Length; i++)
! 					{
! 						DataRow newRow = privileges.NewRow();
  
! 						newRow["VIEW_SCHEMA"]	= row["VIEW_SCHEMA"];
! 						newRow["VIEW_NAME"]		= row["VIEW_NAME"];
! 						newRow["USER_NAME"]		= priv[i].User;
  
! 						FillPrivileges(newRow, priv[i].Privileges);
! 
! 						privileges.Rows.Add(newRow);
! 					}
  				}
  			}