[pgsqlclient-checkins] pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema PgFunctionPrivilegesSchema.cs,1.10,1.11 PgTablePrivilegesSchema.cs,1.9,1.10 PgViewPrivilegesSchema.cs,1.9,1.10

[Carlos G. Á. <car...@us...>]

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

Modified Files:
	PgFunctionPrivilegesSchema.cs PgTablePrivilegesSchema.cs 
	PgViewPrivilegesSchema.cs 
Log Message:
2005-04-14 Carlos Guzman Alvarez  <car...@te...>

	* Fixed Tables, Views anbd Functions Privileges Schemas.


Index: PgTablePrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTablePrivilegesSchema.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PgTablePrivilegesSchema.cs	8 Apr 2005 14:28:26 -0000	1.9
--- PgTablePrivilegesSchema.cs	14 Apr 2005 13:20:13 -0000	1.10
***************
*** 74,79 ****
  		public override DataTable GetSchema(PgConnection connection, string[] restrictions)
  		{
! 			DataTable tablesSchema	= this.GetSchema(connection, restrictions);
! 			DataTable privileges	= this.getPrivilegesDataTable();
  
  			privileges.BeginLoadData();
--- 74,79 ----
  		public override DataTable GetSchema(PgConnection connection, string[] restrictions)
  		{
! 			DataTable	tablesSchema= base.GetSchema(connection, restrictions);
! 			DataTable	privileges	= this.GetPrivilegesDataTable();
  
  			privileges.BeginLoadData();
***************
*** 105,109 ****
  		}
  
! 		private DataTable getPrivilegesDataTable()
  		{
  			DataTable privileges = new DataTable("Table_Privileges");
--- 105,109 ----
  		}
  
! 		private DataTable GetPrivilegesDataTable()
  		{
  			DataTable privileges = new DataTable("Table_Privileges");

Index: PgFunctionPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgFunctionPrivilegesSchema.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PgFunctionPrivilegesSchema.cs	8 Apr 2005 14:28:26 -0000	1.10
--- PgFunctionPrivilegesSchema.cs	14 Apr 2005 13:20:13 -0000	1.11
***************
*** 83,96 ****
  		public override DataTable GetSchema(PgConnection connection, string[] restrictions)
  		{
! 			DataTable tablesSchema	= this.GetSchema(connection, restrictions);
! 			DataTable privileges	= this.GetPrivilegesDataTable();
  
  			privileges.BeginLoadData();
  
! 			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++)
--- 83,96 ----
  		public override DataTable GetSchema(PgConnection connection, string[] restrictions)
  		{
! 			DataTable	functionsSchema	= base.GetSchema(connection, restrictions);
! 			DataTable	privileges		= this.GetPrivilegesDataTable();
  
  			privileges.BeginLoadData();
  
! 			foreach (DataRow row in functionsSchema.Rows)
  			{
  				if (row["PRIVILEGES"] != System.DBNull.Value)
  				{
! 					PgPrivilege[] priv = this.DecodePrivileges((string[])row["PRIVILEGES"]);
  
  					for (int i = 0; i < priv.Length; i++)
***************
*** 102,106 ****
  						newRow["USER_NAME"]			= priv[i].User;
  
! 						FillPrivileges(newRow, priv[i].Privileges);
  
  						privileges.Rows.Add(newRow);
--- 102,106 ----
  						newRow["USER_NAME"]			= priv[i].User;
  
! 						this.FillPrivileges(newRow, priv[i].Privileges);
  
  						privileges.Rows.Add(newRow);
***************
*** 124,128 ****
  			privileges.Columns.Add("USER_NAME"		, Type.GetType("System.String"));
  
! 			AddPrivilegesColumns(privileges);
  
  			privileges.EndInit();
--- 124,128 ----
  			privileges.Columns.Add("USER_NAME"		, Type.GetType("System.String"));
  
! 			this.AddPrivilegesColumns(privileges);
  
  			privileges.EndInit();

Index: PgViewPrivilegesSchema.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgViewPrivilegesSchema.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PgViewPrivilegesSchema.cs	8 Apr 2005 14:28:26 -0000	1.9
--- PgViewPrivilegesSchema.cs	14 Apr 2005 13:20:13 -0000	1.10
***************
*** 74,87 ****
  		public override DataTable GetSchema(PgConnection connection, string[] restrictions)
  		{
! 			DataTable tablesSchema	= this.GetSchema(connection, restrictions);
! 			DataTable privileges	= this.GetPrivilegesDataTable();
  
  			privileges.BeginLoadData();
  
! 			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++)
--- 74,87 ----
  		public override DataTable GetSchema(PgConnection connection, string[] restrictions)
  		{
! 			DataTable	viewsSchema	= base.GetSchema(connection, restrictions);
! 			DataTable	privileges	= this.GetPrivilegesDataTable();
  
  			privileges.BeginLoadData();
  
! 			foreach (DataRow row in viewsSchema.Rows)
  			{
  				if (row["PRIVILEGES"] != System.DBNull.Value)
  				{
! 					PgPrivilege[] priv = this.DecodePrivileges((string[])row["PRIVILEGES"]);
  
  					for (int i = 0; i < priv.Length; i++)
***************
*** 93,97 ****
  						newRow["USER_NAME"]		= priv[i].User;
  
! 						FillPrivileges(newRow, priv[i].Privileges);
  
  						privileges.Rows.Add(newRow);
--- 93,97 ----
  						newRow["USER_NAME"]		= priv[i].User;
  
! 						this.FillPrivileges(newRow, priv[i].Privileges);
  
  						privileges.Rows.Add(newRow);
***************
*** 115,119 ****
  			privileges.Columns.Add("USER_NAME", Type.GetType("System.String"));
  
! 			AddPrivilegesColumns(privileges);
  
  			privileges.EndInit();
--- 115,119 ----
  			privileges.Columns.Add("USER_NAME", Type.GetType("System.String"));
  
! 			this.AddPrivilegesColumns(privileges);
  
  			privileges.EndInit();