pgsqlclient-checkins Mailing List for PostgreSqlClient (Page 50)
Status: Inactive
Brought to you by:
carlosga_fb
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(120) |
Aug
(95) |
Sep
(95) |
Oct
(213) |
Nov
(114) |
Dec
(64) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(6) |
Feb
(134) |
Mar
(88) |
Apr
(28) |
May
(22) |
Jun
(15) |
Jul
(23) |
Aug
(2) |
Sep
(15) |
Oct
(2) |
Nov
(6) |
Dec
|
2005 |
Jan
(8) |
Feb
(6) |
Mar
|
Apr
(42) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
|
Mar
(84) |
Apr
(46) |
May
(40) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <car...@us...> - 2003-08-02 23:43:53
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv7030 Modified Files: PgDataReader.cs Log Message: Removed test code for autoincrement columns, and check it using the new schema column. Index: PgDataReader.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgDataReader.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PgDataReader.cs 2 Aug 2003 21:13:35 -0000 1.2 --- PgDataReader.cs 2 Aug 2003 23:43:50 -0000 1.3 *************** *** 248,253 **** schemaRow["IsRowVersion"] = false; schemaRow["IsUnique"] = false; ! if ((bool)columnInfo[8] && ! columnInfo[9].ToString().StartsWith("nextval(")) { schemaRow["IsReadOnly"] = true; --- 248,252 ---- schemaRow["IsRowVersion"] = false; schemaRow["IsUnique"] = false; ! if ((bool)columnInfo[10]) { schemaRow["IsReadOnly"] = true; |
From: <car...@us...> - 2003-08-02 21:16:51
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10 In directory sc8-pr-cvs1:/tmp/cvs-serv20229 Modified Files: changelog.txt Log Message: Updated changelog.txt Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/changelog.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** changelog.txt 2 Aug 2003 21:14:21 -0000 1.2 --- changelog.txt 2 Aug 2003 21:16:49 -0000 1.3 *************** *** 10,17 **** * New directory structure in the CVS for match class names and file names. ! * source/PgCommand.cs: ! - Fixed error closing the DataReader when the subyacent command is disposed, ! added test code for serial fields. --- 10,18 ---- * New directory structure in the CVS for match class names and file names. ! * source/PgDataReader.cs: ! - Fixed error closing the DataReader when the subyacent command is disposed (#782096) ! ! - Added test code for serial fields. |
From: <car...@us...> - 2003-08-02 21:14:25
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10 In directory sc8-pr-cvs1:/tmp/cvs-serv19926 Modified Files: changelog.txt Log Message: Updated changelog.txt Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/changelog.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** changelog.txt 2 Aug 2003 19:42:37 -0000 1.1.1.1 --- changelog.txt 2 Aug 2003 21:14:21 -0000 1.2 *************** *** 10,13 **** --- 10,18 ---- * New directory structure in the CVS for match class names and file names. + * source/PgCommand.cs: + + - Fixed error closing the DataReader when the subyacent command is disposed, + added test code for serial fields. + 2003-07-01 Carlos Guzmán Álvarez <car...@te...> |
From: <car...@us...> - 2003-08-02 21:13:38
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv19822 Modified Files: PgDataReader.cs Log Message: Fixed error closing the DataReader when the subyacent command is disposed, added test code for serial fields Index: PgDataReader.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgDataReader.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgDataReader.cs 2 Aug 2003 19:43:00 -0000 1.1.1.1 --- PgDataReader.cs 2 Aug 2003 21:13:35 -0000 1.2 *************** *** 136,157 **** updateRecordsAffected(); ! if (command != null) { ! if (!command.IsDisposed) { ! command.Connection.DataReader = null; ! if (command.Statement != null) { ! // Set values of output parameters ! command.InternalSetOutputParameters(); ! ! // Close statement ! command.InternalClose(); ! ! if ((command.CommandBehavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) ! { ! command.Connection.Close(); ! } } } --- 136,154 ---- updateRecordsAffected(); ! if (command != null && !command.IsDisposed) { ! command.Connection.DataReader = null; ! ! if (command.Statement != null) { ! // Set values of output parameters ! command.InternalSetOutputParameters(); ! // Close statement ! command.InternalClose(); ! ! if ((command.CommandBehavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) { ! command.Connection.Close(); } } *************** *** 248,256 **** schemaRow["DataType"] = getFieldType(i); schemaRow["ProviderType"] = getProviderType(i); ! schemaRow["IsLong"] = isLong(i); ! schemaRow["IsReadOnly"] = isReadOnly(i); schemaRow["IsRowVersion"] = false; schemaRow["IsUnique"] = false; ! schemaRow["IsAutoIncrement"] = isAutoIncrement(i); schemaRow["IsAliased"] = isAliased(i); schemaRow["IsExpression"] = isExpression(i); --- 245,262 ---- schemaRow["DataType"] = getFieldType(i); schemaRow["ProviderType"] = getProviderType(i); ! schemaRow["IsLong"] = isLong(i); schemaRow["IsRowVersion"] = false; schemaRow["IsUnique"] = false; ! if ((bool)columnInfo[8] && ! columnInfo[9].ToString().StartsWith("nextval(")) ! { ! schemaRow["IsReadOnly"] = true; ! schemaRow["IsAutoIncrement"] = true; ! } ! else ! { ! schemaRow["IsReadOnly"] = false; ! schemaRow["IsAutoIncrement"] = false; ! } schemaRow["IsAliased"] = isAliased(i); schemaRow["IsExpression"] = isExpression(i); *************** *** 288,293 **** IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(PgDbSchemaType.Columns); ! dbSchema.AddWhereFilter("Pg_attribute.attnum = " + field.OidNumber); ! dbSchema.AddWhereFilter("Pg_attribute.attrelid = " + field.OidTable); PgCommand schemaCmd = new PgCommand(dbSchema.GetCommandText(null), command.Connection); --- 294,299 ---- IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(PgDbSchemaType.Columns); ! dbSchema.AddWhereFilter("pg_attribute.attnum = " + field.OidNumber); ! dbSchema.AddWhereFilter("pg_attribute.attrelid = " + field.OidTable); PgCommand schemaCmd = new PgCommand(dbSchema.GetCommandText(null), command.Connection); *************** *** 312,316 **** IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(PgDbSchemaType.Primary_Keys); ! dbSchema.AddWhereFilter("Pg_class.oid = " + field.OidTable); PgCommand schemaCmd = new PgCommand(dbSchema.GetCommandText(null), command.Connection); --- 318,322 ---- IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(PgDbSchemaType.Primary_Keys); ! dbSchema.AddWhereFilter("pg_class.oid = " + field.OidTable); PgCommand schemaCmd = new PgCommand(dbSchema.GetCommandText(null), command.Connection); *************** *** 687,709 **** } - private bool isReadOnly(int i) - { - PgType type = command.Statement.RowDescriptor.Fields[i].DataType; - - return type.IsSerial ? true : false; - } - - private bool isAutoIncrement(int i) - { - if (i < 0 || i >= FieldCount) - { - throw new IndexOutOfRangeException("Could not find specified column in results."); - } - - PgType type = command.Statement.RowDescriptor.Fields[i].DataType; - - return type.IsSerial ? true : false; - } - private bool isDBNull(int i) { --- 693,696 ---- *************** *** 767,774 **** private void updateRecordsAffected() { ! if (command.Statement.RecordsAffected != -1) { ! recordsAffected = recordsAffected == -1 ? 0 : recordsAffected; ! recordsAffected += command.Statement.RecordsAffected; } } --- 754,764 ---- private void updateRecordsAffected() { ! if (command != null && !command.IsDisposed) { ! if (command.Statement.RecordsAffected != -1) ! { ! recordsAffected = recordsAffected == -1 ? 0 : recordsAffected; ! recordsAffected += command.Statement.RecordsAffected; ! } } } |
From: <car...@us...> - 2003-08-02 21:12:18
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient In directory sc8-pr-cvs1:/tmp/cvs-serv19711 Modified Files: PgDbClient.cs PgType.cs PgTypeCollection.cs Log Message: Removed serial type Index: PgDbClient.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgDbClient.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgDbClient.cs 2 Aug 2003 19:43:02 -0000 1.1.1.1 --- PgDbClient.cs 2 Aug 2003 21:12:16 -0000 1.2 *************** *** 553,591 **** types = new PgTypeCollection(); ! types.Add(-2 , "serial8" , DbType.Int64 , Type.GetType("System.Int64") , 0, 1, 8, false, true); ! types.Add(-1 , "serial" , DbType.Int32 , Type.GetType("System.Int32") , 0, 1, 4, false, true); ! types.Add(16 , "bool" , DbType.Boolean , Type.GetType("System.Boolean") , 0, 1, 1, false, false); ! types.Add(17 , "bytea" , DbType.Binary , Type.GetType("System.Array") , 0, 1, 0, false, false); ! types.Add(18 , "char" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(19 , "name" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(20 , "int8" , DbType.Int64 , Type.GetType("System.Int64") , 0, 1, 8, false, false); ! types.Add(21 , "int2" , DbType.Int16 , Type.GetType("System.Int16") , 0, 1, 2, false, false); ! types.Add(22 , "int2vector", DbType.Object , Type.GetType("System.Array") , 21, 1, 2, true, false); ! types.Add(23 , "int4" , DbType.Int32 , Type.GetType("System.Int32") , 0, 1, 4, false, false); ! types.Add(24 , "regproc" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(25 , "text" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(26 , "oid" , DbType.Int32 , Type.GetType("System.Int32") , 0, 1, 4, false, false); ! types.Add(30 , "oidvector", DbType.Object , Type.GetType("System.Array") , 26, 1, 4, true, false); ! types.Add(700 , "float4" , DbType.Single , Type.GetType("System.Single") , 0, 1, 4, false, false); ! types.Add(701 , "float8" , DbType.Double , Type.GetType("System.Double") , 0, 1, 8, false, false); ! types.Add(705 , "unknown" , DbType.Object , Type.GetType("System.Object") , 0, 0, 0, false, false); ! types.Add(790 , "money" , DbType.Currency , Type.GetType("System.Decimal") , 0, 1, 4, false, false); ! types.Add(829 , "macaddr" , DbType.String , Type.GetType("System.String") , 0, 0, 6, false, false); ! types.Add(869 , "inet" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(1005 , "_int2" , DbType.Object , Type.GetType("System.Array") , 21, 1, 0, false, false); ! types.Add(1007 , "_int4" , DbType.Object , Type.GetType("System.Array") , 23, 1, 0, false, false); ! types.Add(1009 , "_text" , DbType.Object , Type.GetType("System.Array") , 25, 1, 0, false, false); ! types.Add(1021 , "_float4" , DbType.Object , Type.GetType("System.Array") , 700, 1, 4, false, false); ! types.Add(1033 , "aclitem" , DbType.String , Type.GetType("System.String") , 0, 0, 12, false, false); ! types.Add(1034 , "_aclitem", DbType.Object , Type.GetType("System.Array") , 1033, 0, 0, false, false); ! types.Add(1042 , "bpchar" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(1043 , "varchar" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false, false); ! types.Add(1082 , "date" , DbType.Date , Type.GetType("System.DateTime") , 0, 1, 4, false, false); ! types.Add(1083 , "time" , DbType.Time , Type.GetType("System.DateTime") , 0, 1, 8, false, false); ! types.Add(1114 , "timestamp", DbType.DateTime , Type.GetType("System.DateTime") , 0, 1, 8, false, false); ! types.Add(1560 , "bit" , DbType.Byte , Type.GetType("System.Byte") , 0, 0, 1, false, false); ! types.Add(1562 , "varbit" , DbType.Byte , Type.GetType("System.Byte") , 0, 1, 0, false, false); ! types.Add(1700 , "numeric" , DbType.Decimal , Type.GetType("System.Decimal") , 0, 0, 8, false, false); ! types.Add(2277 , "anyarray", DbType.Object , Type.GetType("System.Array") , 0, 1, 8, false, false); } --- 553,589 ---- types = new PgTypeCollection(); ! types.Add(16 , "bool" , DbType.Boolean , Type.GetType("System.Boolean") , 0, 1, 1, false); ! types.Add(17 , "bytea" , DbType.Binary , Type.GetType("System.Array") , 0, 1, 0, false); ! types.Add(18 , "char" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(19 , "name" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(20 , "int8" , DbType.Int64 , Type.GetType("System.Int64") , 0, 1, 8, false); ! types.Add(21 , "int2" , DbType.Int16 , Type.GetType("System.Int16") , 0, 1, 2, false); ! types.Add(22 , "int2vector", DbType.Object , Type.GetType("System.Array") , 21, 1, 2, true); ! types.Add(23 , "int4" , DbType.Int32 , Type.GetType("System.Int32") , 0, 1, 4, false); ! types.Add(24 , "regproc" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(25 , "text" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(26 , "oid" , DbType.Int32 , Type.GetType("System.Int32") , 0, 1, 4, false); ! types.Add(30 , "oidvector", DbType.Object , Type.GetType("System.Array") , 26, 1, 4, true); ! types.Add(700 , "float4" , DbType.Single , Type.GetType("System.Single") , 0, 1, 4, false); ! types.Add(701 , "float8" , DbType.Double , Type.GetType("System.Double") , 0, 1, 8, false); ! types.Add(705 , "unknown" , DbType.Object , Type.GetType("System.Object") , 0, 0, 0, false); ! types.Add(790 , "money" , DbType.Currency , Type.GetType("System.Decimal") , 0, 1, 4, false); ! types.Add(829 , "macaddr" , DbType.String , Type.GetType("System.String") , 0, 0, 6, false); ! types.Add(869 , "inet" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(1005 , "_int2" , DbType.Object , Type.GetType("System.Array") , 21, 1, 0, false); ! types.Add(1007 , "_int4" , DbType.Object , Type.GetType("System.Array") , 23, 1, 0, false); ! types.Add(1009 , "_text" , DbType.Object , Type.GetType("System.Array") , 25, 1, 0, false); ! types.Add(1021 , "_float4" , DbType.Object , Type.GetType("System.Array") , 700, 1, 4, false); ! types.Add(1033 , "aclitem" , DbType.String , Type.GetType("System.String") , 0, 0, 12, false); ! types.Add(1034 , "_aclitem", DbType.Object , Type.GetType("System.Array") , 1033, 0, 0, false); ! types.Add(1042 , "bpchar" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(1043 , "varchar" , DbType.String , Type.GetType("System.String") , 0, 0, 0, false); ! types.Add(1082 , "date" , DbType.Date , Type.GetType("System.DateTime") , 0, 1, 4, false); ! types.Add(1083 , "time" , DbType.Time , Type.GetType("System.DateTime") , 0, 1, 8, false); ! types.Add(1114 , "timestamp", DbType.DateTime , Type.GetType("System.DateTime") , 0, 1, 8, false); ! types.Add(1560 , "bit" , DbType.Byte , Type.GetType("System.Byte") , 0, 0, 1, false); ! types.Add(1562 , "varbit" , DbType.Byte , Type.GetType("System.Byte") , 0, 1, 0, false); ! types.Add(1700 , "numeric" , DbType.Decimal , Type.GetType("System.Decimal") , 0, 0, 8, false); ! types.Add(2277 , "anyarray", DbType.Object , Type.GetType("System.Array") , 0, 1, 8, false); } Index: PgType.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgType.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgType.cs 2 Aug 2003 19:43:03 -0000 1.1.1.1 --- PgType.cs 2 Aug 2003 21:12:16 -0000 1.2 *************** *** 35,39 **** private int size; private bool isVector; - private bool isSerial; private PgDbType providerType; --- 35,38 ---- *************** *** 82,90 **** } - public bool IsSerial - { - get { return isSerial; } - } - public PgDbType ProviderType { --- 81,84 ---- *************** *** 96,106 **** #region CONSTRUCTORS ! /* ! public PgType() ! { ! } ! */ ! ! public PgType(int oid, string name, DbType dbType, Type systemType, int arrayType, short formatCode, int size, bool isVector, bool isSerial) { this.oid = oid; --- 90,94 ---- #region CONSTRUCTORS ! public PgType(int oid, string name, DbType dbType, Type systemType, int arrayType, short formatCode, int size, bool isVector) { this.oid = oid; *************** *** 112,116 **** this.size = size; this.isVector = isVector; - this.isSerial = isSerial; setProviderType(); --- 100,103 ---- Index: PgTypeCollection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgTypeCollection.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgTypeCollection.cs 2 Aug 2003 19:43:03 -0000 1.1.1.1 --- PgTypeCollection.cs 2 Aug 2003 21:12:16 -0000 1.2 *************** *** 109,115 **** } ! public PgType Add(int oid, string name, DbType dbType, Type systemType, int arrayType, short formatCode, int size, bool isVector, bool isSerial) { ! PgType type = new PgType(oid, name, dbType, systemType, arrayType, formatCode, size, isVector, isSerial); base.Add(type); --- 109,115 ---- } ! public PgType Add(int oid, string name, DbType dbType, Type systemType, int arrayType, short formatCode, int size, bool isVector) { ! PgType type = new PgType(oid, name, dbType, systemType, arrayType, formatCode, size, isVector); base.Add(type); |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema In directory sc8-pr-cvs1:/tmp/cvs-serv19578 Modified Files: PgAggregatesSchema.cs PgCastsSchema.cs PgCheckConstraints.cs PgCheckConstraintsByTable.cs PgColumnsSchema.cs PgDatabaseSchema.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: Fixed catalog table names Index: PgAggregatesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgAggregatesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgAggregatesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgAggregatesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgCastsSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgCastsSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgCastsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgCheckConstraints.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgCheckConstraints.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgCheckConstraints.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgCheckConstraintsByTable.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgCheckConstraintsByTable.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgCheckConstraintsByTable.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgColumnsSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgColumnsSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgColumnsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgDatabaseSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgDatabaseSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgDatabaseSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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: PgDomainsSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgDomainsSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgDomainsSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgDomainsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgForeignKeysSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgForeignKeysSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgForeignKeysSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgFunctionPrivilegesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgFunctionPrivilegesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgFunctionPrivilegesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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"); } Index: PgFunctionsSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgFunctionsSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgFunctionsSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgFunctionsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/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 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgGroupsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgIndexesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgIndexesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgIndexesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,48 **** 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); } --- 37,48 ---- 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); } *************** *** 50,79 **** { 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"); } --- 50,79 ---- { 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_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgPrimaryKeysSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgPrimaryKeysSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgPrimaryKeysSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 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", "Pg_description", "Pg_constraint.oid = Pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_class.relname"); ! AddOrderBy("Pg_constraint.conname"); } --- 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", "pg_description", "pg_constraint.oid = pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_namespace.nspname"); ! AddOrderBy("pg_class.relname"); ! AddOrderBy("pg_constraint.conname"); } *************** *** 70,74 **** { // Get Only Primary Key information ! AddWhereFilter("Pg_constraint.contype = 'p'"); } --- 70,74 ---- { // Get Only Primary Key information ! AddWhereFilter("pg_constraint.contype = 'p'"); } Index: PgProviderTypesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgProviderTypesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgProviderTypesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgProviderTypesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,70 **** public override void AddTables() { ! AddTable("Pg_type"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_namespace.nspname", "TYPE_SCHEMA", null); ! AddRestrictionColumn("Pg_type.typname", "TYPE_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_type.typname"); } --- 37,70 ---- public override void AddTables() { ! AddTable("pg_type"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_namespace.nspname", "TYPE_SCHEMA", null); ! AddRestrictionColumn("pg_type.typname", "TYPE_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_type.typname"); } Index: PgSchemataSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgSchemataSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgSchemataSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgSchemataSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,64 **** public override void AddTables() { ! AddTable("Pg_namespace"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_namespace.nspname", "SCHEMA_NAME", null); ! AddRestrictionColumn("Pg_shadow.usename", "SCHEMA_OWNER", null); } public override void AddDataColumns() { ! AddDataColumn("Pg_description.description", "DESCRIPTION"); } public override void AddJoins() { ! AddJoin("left join", "Pg_shadow", "Pg_namespace.nspowner = Pg_shadow.usesysid"); ! AddJoin("left join", "Pg_description", "Pg_namespace.oid = Pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_shadow.usename"); } --- 37,64 ---- public override void AddTables() { ! AddTable("pg_namespace"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_namespace.nspname", "SCHEMA_NAME", null); ! AddRestrictionColumn("pg_shadow.usename", "SCHEMA_OWNER", null); } public override void AddDataColumns() { ! AddDataColumn("pg_description.description", "DESCRIPTION"); } public override void AddJoins() { ! AddJoin("left join", "pg_shadow", "pg_namespace.nspowner = pg_shadow.usesysid"); ! AddJoin("left join", "pg_description", "pg_namespace.oid = pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_namespace.nspname"); ! AddOrderBy("pg_shadow.usename"); } Index: PgSqlLanguagesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgSqlLanguagesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgSqlLanguagesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgSqlLanguagesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,41 **** public override void AddTables() { ! AddTable("Pg_language"); } --- 37,41 ---- public override void AddTables() { ! AddTable("pg_language"); } *************** *** 46,66 **** public override void AddDataColumns() { ! AddDataColumn("Pg_language.lanname", "LANGUAGE_NAME"); ! AddDataColumn("Pg_language.lanispl", "IS_USER_DEFINED"); ! AddDataColumn("Pg_proc.proname", "CALL_FUNCTION"); ! AddDataColumn("Pg_procv.proname", "VALIDATOR"); ! AddDataColumn("Pg_description.description", "DESCRIPTION"); } public override void AddJoins() { ! AddJoin("left join", "Pg_proc", "Pg_language.lanplcallfoid = Pg_proc.oid"); ! AddJoin("left join", "Pg_proc as Pg_procv", "Pg_language.lanvalidator = Pg_procv.oid"); ! AddJoin("left join", "Pg_description", "Pg_language.oid = Pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_language.lanname"); } --- 46,66 ---- public override void AddDataColumns() { ! AddDataColumn("pg_language.lanname", "LANGUAGE_NAME"); ! AddDataColumn("pg_language.lanispl", "IS_USER_DEFINED"); ! AddDataColumn("pg_proc.proname", "CALL_FUNCTION"); ! AddDataColumn("pg_procv.proname", "VALIDATOR"); ! AddDataColumn("pg_description.description", "DESCRIPTION"); } public override void AddJoins() { ! AddJoin("left join", "pg_proc", "pg_language.lanplcallfoid = pg_proc.oid"); ! AddJoin("left join", "pg_proc as pg_procv", "pg_language.lanvalidator = pg_procv.oid"); ! AddJoin("left join", "pg_description", "pg_language.oid = pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_language.lanname"); } Index: PgTableConstraintsSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTableConstraintsSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgTableConstraintsSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgTableConstraintsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,72 **** public override void AddTables() { ! AddTable("Pg_constraint"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_schemacon.nspname", "CONSTRAINT_SCHEMA", null); ! AddRestrictionColumn("Pg_constraint.conname", "CONSTRAINT_NAME", null); ! AddRestrictionColumn("Pg_namespace.nspname", "TABLE_SCHEMA", null); ! AddRestrictionColumn("Pg_class.relname", "TABLE_NAME", null); ! AddRestrictionColumn(getConstraintTypeExpression("Pg_constraint.contype"), "CONSTRAINT_TYPE", "Pg_constraint.contype"); } public override void AddDataColumns() { ! AddDataColumn("Pg_constraint.condeferrable", "IS_DEFERRABLE"); ! AddDataColumn("Pg_constraint.condeferred", "INITIALLY_DEFERRED"); ! 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", "Pg_class.relnamespace = Pg_namespace.oid"); ! AddJoin("left join", "Pg_namespace as Pg_schemacon", "Pg_constraint.connamespace = Pg_schemacon.oid"); ! AddJoin("left join", "Pg_description", "Pg_constraint.oid = Pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_schemacon.nspname"); ! AddOrderBy("Pg_class.relname"); ! AddOrderBy("Pg_constraint.conname"); } --- 37,72 ---- public override void AddTables() { ! AddTable("pg_constraint"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_schemacon.nspname", "CONSTRAINT_SCHEMA", null); ! AddRestrictionColumn("pg_constraint.conname", "CONSTRAINT_NAME", null); ! AddRestrictionColumn("pg_namespace.nspname", "TABLE_SCHEMA", null); ! AddRestrictionColumn("pg_class.relname", "TABLE_NAME", null); ! AddRestrictionColumn(getConstraintTypeExpression("pg_constraint.contype"), "CONSTRAINT_TYPE", "pg_constraint.contype"); } public override void AddDataColumns() { ! AddDataColumn("pg_constraint.condeferrable", "IS_DEFERRABLE"); ! AddDataColumn("pg_constraint.condeferred", "INITIALLY_DEFERRED"); ! 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", "pg_class.relnamespace = pg_namespace.oid"); ! AddJoin("left join", "pg_namespace as pg_schemacon", "pg_constraint.connamespace = pg_schemacon.oid"); ! AddJoin("left join", "pg_description", "pg_constraint.oid = pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_schemacon.nspname"); ! AddOrderBy("pg_class.relname"); ! AddOrderBy("pg_constraint.conname"); } Index: PgTablePrivilegesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTablePrivilegesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgTablePrivilegesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgTablePrivilegesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 38,69 **** public override void AddTables() { ! AddTable("Pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_namespace.nspname" , "TABLE_SCHEMA", null); ! AddRestrictionColumn("Pg_class.relname" , "TABLE_NAME", null); } public override void AddDataColumns() { ! AddDataColumn("Pg_class.relacl", "PRIVILEGES"); } public override void AddJoins() { ! AddJoin("left join", "Pg_namespace", "Pg_class.relnamespace = Pg_namespace.oid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("Pg_class.relkind = 'r'"); } --- 38,69 ---- public override void AddTables() { ! AddTable("pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_namespace.nspname" , "TABLE_SCHEMA", null); ! AddRestrictionColumn("pg_class.relname" , "TABLE_NAME", null); } public override void AddDataColumns() { ! AddDataColumn("pg_class.relacl", "PRIVILEGES"); } public override void AddJoins() { ! AddJoin("left join", "pg_namespace", "pg_class.relnamespace = pg_namespace.oid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_namespace.nspname"); ! AddOrderBy("pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("pg_class.relkind = 'r'"); } Index: PgTablesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTablesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgTablesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgTablesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,78 **** public override void AddTables() { ! AddTable("Pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_namespace.nspname" , "TABLE_SCHEMA", null); ! AddRestrictionColumn("Pg_class.relname" , "TABLE_NAME", null); ! AddRestrictionColumn(getTableTypeExpression("Pg_class.relkind"), "TABLE_TYPE", "Pg_class.relkind"); } public override void AddDataColumns() { ! AddDataColumn("Pg_class.relhasindex" , "HAS_INDEXES"); ! AddDataColumn("Pg_class.relisshared" , "IS_SHARED"); ! AddDataColumn("Pg_class.relchecks" , "CONSTRAINT_COUNT"); ! AddDataColumn("Pg_class.reltriggers" , "TRIGGER_COUNT"); ! AddDataColumn("Pg_class.relhaspkey" , "HAS_PRIMARY"); ! AddDataColumn("Pg_class.relhasrules" , "HAS_RULES"); ! AddDataColumn("Pg_class.relhassubclass" , "HAS_SUBCLASS"); ! AddDataColumn("Pg_description.description", "DESCRIPTION"); } public override void AddJoins() { ! AddJoin("left join", "Pg_namespace" , "Pg_class.relnamespace = Pg_namespace.oid"); ! AddJoin("left join", "Pg_description" , "Pg_class.oid = Pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_class.relkind"); ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("Pg_class.relkind = 'r'"); } --- 37,78 ---- public override void AddTables() { ! AddTable("pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_namespace.nspname" , "TABLE_SCHEMA", null); ! AddRestrictionColumn("pg_class.relname" , "TABLE_NAME", null); ! AddRestrictionColumn(getTableTypeExpression("pg_class.relkind"), "TABLE_TYPE", "pg_class.relkind"); } public override void AddDataColumns() { ! AddDataColumn("pg_class.relhasindex" , "HAS_INDEXES"); ! AddDataColumn("pg_class.relisshared" , "IS_SHARED"); ! AddDataColumn("pg_class.relchecks" , "CONSTRAINT_COUNT"); ! AddDataColumn("pg_class.reltriggers" , "TRIGGER_COUNT"); ! AddDataColumn("pg_class.relhaspkey" , "HAS_PRIMARY"); ! AddDataColumn("pg_class.relhasrules" , "HAS_RULES"); ! AddDataColumn("pg_class.relhassubclass" , "HAS_SUBCLASS"); ! AddDataColumn("pg_description.description", "DESCRIPTION"); } public override void AddJoins() { ! AddJoin("left join", "pg_namespace" , "pg_class.relnamespace = pg_namespace.oid"); ! AddJoin("left join", "pg_description" , "pg_class.oid = pg_description.objoid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_class.relkind"); ! AddOrderBy("pg_namespace.nspname"); ! AddOrderBy("pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("pg_class.relkind = 'r'"); } Index: PgTableStatisticsSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTableStatisticsSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgTableStatisticsSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgTableStatisticsSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 38,74 **** public override void AddTables() { ! AddTable("Pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_namespace.nspname" , "TABLE_SCHEMA", null); ! AddRestrictionColumn("Pg_class.relname" , "TABLE_NAME", null); ! AddRestrictionColumn("Pg_namespace.staattnum", "ORDINAL_POSITION", null); } public override void AddDataColumns() { ! AddDataColumn("Pg_statistic.stanullfrac", "FRACTION"); ! AddDataColumn("Pg_statistic.stawidth" , "WIDTH"); ! AddDataColumn("Pg_statistic.stadistinc" , "DISTINCT"); ! AddDataColumn("Pg_statistic.stakind" , "KIND"); ! AddDataColumn("Pg_statistic.stanumbers" , "NUMERICAL_STATISTICS"); } public override void AddJoins() { ! AddJoin("left join", "Pg_statistic", "Pg_class.oid = Pgstatistic.starelid"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("Pg_class.relkind = 'r'"); } --- 38,74 ---- public override void AddTables() { ! AddTable("pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_namespace.nspname" , "TABLE_SCHEMA", null); ! AddRestrictionColumn("pg_class.relname" , "TABLE_NAME", null); ! AddRestrictionColumn("pg_namespace.staattnum", "ORDINAL_POSITION", null); } public override void AddDataColumns() { ! AddDataColumn("pg_statistic.stanullfrac", "FRACTION"); ! AddDataColumn("pg_statistic.stawidth" , "WIDTH"); ! AddDataColumn("pg_statistic.stadistinc" , "DISTINCT"); ! AddDataColumn("pg_statistic.stakind" , "KIND"); ! AddDataColumn("pg_statistic.stanumbers" , "NUMERICAL_STATISTICS"); } public override void AddJoins() { ! AddJoin("left join", "pg_statistic", "pg_class.oid = Pgstatistic.starelid"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_namespace.nspname"); ! AddOrderBy("pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("pg_class.relkind = 'r'"); } Index: PgTriggersSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgTriggersSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgTriggersSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgTriggersSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,68 **** public override void AddTables() { ! AddTable("Pg_trigger"); } 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"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_proc.proname"); } --- 37,68 ---- public override void AddTables() { ! AddTable("pg_trigger"); } 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"); } public override void AddOrderByColumns() { ! AddOrderBy("pg_namespace.nspname"); ! AddOrderBy("pg_proc.proname"); } Index: PgUsersSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgUsersSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgUsersSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgUsersSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,55 **** public override void AddTables() { ! AddTable("Pg_shadow"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_shadow.usename", "USER_NAME", null); } public override void AddDataColumns() { ! AddDataColumn("Pg_shadow.usecreatedb", "CREATE_DATABASE"); ! AddDataColumn("Pg_shadow.usesuper", "IS_SUPERUSER"); ! AddDataColumn("Pg_shadow.usecatupd", "UPDATE_SYSCATALOGS"); ! AddDataColumn("Pg_shadow.passwd", "PASSWORD"); ! AddDataColumn("Pg_shadow.useconfig", "CONFIGURATION"); } --- 37,55 ---- public override void AddTables() { ! AddTable("pg_shadow"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("pg_shadow.usename", "USER_NAME", null); } public override void AddDataColumns() { ! AddDataColumn("pg_shadow.usecreatedb", "CREATE_DATABASE"); ! AddDataColumn("pg_shadow.usesuper", "IS_SUPERUSER"); ! AddDataColumn("pg_shadow.usecatupd", "UPDATE_SYSCATALOGS"); ! AddDataColumn("pg_shadow.passwd", "PASSWORD"); ! AddDataColumn("pg_shadow.useconfig", "CONFIGURATION"); } *************** *** 60,64 **** public override void AddOrderByColumns() { ! AddOrderBy("Pg_shadow.usename"); } --- 60,64 ---- public override void AddOrderByColumns() { ! AddOrderBy("pg_shadow.usename"); } Index: PgViewPrivilegesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/DbSchema/PgViewPrivilegesSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgViewPrivilegesSchema.cs 2 Aug 2003 19:43:01 -0000 1.1.1.1 --- PgViewPrivilegesSchema.cs 2 Aug 2003 21:11:37 -0000 1.2 *************** *** 37,69 **** public override void AddTables() { ! AddTable("Pg_class"); } public override void AddRestrictionColumns() { ! AddRestrictionColumn("Pg_namespace.nspname", "VIEW_SCHEMA", null); ! AddRestrictionColumn("Pg_class.relname", "VIEW_NAME", null); } public override void AddDataColumns() { ! AddDataColumn("Pg_class.relacl", "PRIVILEGES"); } public override void AddJoins() { ! AddJoin("left join", "Pg_namespace", "Pg_class.relnamespace = Pg_namespace.oid"); ! AddJoin("left join", "Pg_rewrite", "Pg_class.oid = Pg_rewrite.ev_class"); } public override void AddOrderByColumns() { ! AddOrderBy("Pg_namespace.nspname"); ! AddOrderBy("Pg_class.relname"); } public override void AddWhereFilters() { ! AddWhereFilter("Pg_class.relkind = 'v'"); } --- 37,69 ---- pu... [truncated message content] |
From: <car...@us...> - 2003-08-02 19:50:40
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10 In directory sc8-pr-cvs1:/tmp/cvs-serv7704 Modified Files: changes.txt Log Message: Updated CHANGES.TXT Index: changes.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/changes.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** changes.txt 2 Aug 2003 19:42:37 -0000 1.1.1.1 --- changes.txt 2 Aug 2003 19:50:36 -0000 1.2 *************** *** 6,18 **** ----- - - -- -- ---- - - * Added makefile for mono:: in linux. * Improved PostgreSQL 3.0 protocol handling. ! * Added initial implementation of asynchronous notification ( PgConnection.Notification )support ( task #82889 ). * Added initial implementation of PgConnection.InfoMessage event ( task #82902 ). --- 6,20 ---- ----- - - -- -- ---- - * Added makefile for mono:: in linux. * Improved PostgreSQL 3.0 protocol handling. ! * Added initial implementation of asynchronous notification ( PgConnection.Notification ) support ( task #82889 ). * Added initial implementation of PgConnection.InfoMessage event ( task #82902 ). + * Changed casing of all clasess from PgXXX to PgXXX to follow MS' guidelines. + + * New directory structure in the CVS for match class, file and directory names. |
From: <car...@us...> - 2003-08-02 19:23:49
|
Update of /cvsroot/pgsqlclient/pgsqlclient/WindowsSetup In directory sc8-pr-cvs1:/tmp/cvs-serv3842 Modified Files: PGSqlClientSetup.gi2 Log Message: Updated installation script Index: PGSqlClientSetup.gi2 =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/WindowsSetup/PGSqlClientSetup.gi2,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGSqlClientSetup.gi2 29 Jul 2003 17:06:56 -0000 1.2 --- PGSqlClientSetup.gi2 2 Aug 2003 19:23:46 -0000 1.3 *************** *** 100,105 **** </launchconditions--> <variables> ! <var name="AppID" value="PGSqlClient ADO.NET Data Provider 1.0 Alpha 1" /> ! <var name="AppName" value="PGSqlClient ADO.NET Data Provider 1.0 Alpha 1" /> <var name="OutputPath" value="Output" type="normal"/> <var name="Password" type="normal"/> --- 100,105 ---- </launchconditions--> <variables> ! <var name="AppID" value="PGSqlClient ADO.NET Data Provider 1.0 Alpha 2" /> ! <var name="AppName" value="PGSqlClient ADO.NET Data Provider 1.0 Alpha 2" /> <var name="OutputPath" value="Output" type="normal"/> <var name="Password" type="normal"/> *************** *** 108,112 **** <var name="AutoSelectLanguage" value="1" type="normal"/> <var name="Uninstall" value="1" /> ! <var name="ProgramGroup" value="PGSqlClient 1.0 Alpha 1" /> <var name="AppFolder" value="%ProgramsMenu%\%ProgramGroup%" type="normal"/> <var name="InstallPath" value="%ProgramFiles%\PGSqlClient .NET Data Provider 1.0" type="normal"/> --- 108,112 ---- <var name="AutoSelectLanguage" value="1" type="normal"/> <var name="Uninstall" value="1" /> ! <var name="ProgramGroup" value="PGSqlClient 1.0" /> <var name="AppFolder" value="%ProgramsMenu%\%ProgramGroup%" type="normal"/> <var name="InstallPath" value="%ProgramFiles%\PGSqlClient .NET Data Provider 1.0" type="normal"/> |
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/Resources/ToolBox In directory sc8-pr-cvs1:/tmp/cvs-serv1833 Removed Files: PGCommand.bmp PGConnection.bmp PGDataAdapter.bmp Log Message: no message --- PGCommand.bmp DELETED --- --- PGConnection.bmp DELETED --- --- PGDataAdapter.bmp DELETED --- |
From: <car...@us...> - 2003-08-02 19:15:36
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv1576 Modified Files: changelog.txt PGSqlClient.build Log Message: Updated CHANGELOG.TXT Updated NAnt build file Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changelog.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** changelog.txt 1 Aug 2003 17:52:37 -0000 1.38 --- changelog.txt 2 Aug 2003 19:15:33 -0000 1.39 *************** *** 3,6 **** --- 3,12 ---- + 2003-07-02 Carlos Guzmán Álvarez <car...@te...> + + * Changed casing of all clasess from PGXXX to PgXXX to + follow MS' guidelines. + + 2003-07-01 Carlos Guzmán Álvarez <car...@te...> Index: PGSqlClient.build =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PGSqlClient.build,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PGSqlClient.build 31 Jul 2003 10:54:13 -0000 1.6 --- PGSqlClient.build 2 Aug 2003 19:15:33 -0000 1.7 *************** *** 1,7 **** <?xml version="1.0" ?> ! <project name="PGSqlClient" default="build-all" basedir="." xmlnds="http://tempuri.org/nant-vs.xsd"> <!-- Project properties --> ! <property name="project.name" value="PGSqlClient" /> ! <property name="project.FormalName" value="PostgreSql.Data.PGSqlClient" /> <property name="project.version" value="1.0" /> --- 1,7 ---- <?xml version="1.0" ?> ! <project name="PgSqlClient" default="build-all" basedir="." xmlnds="http://tempuri.org/nant-vs.xsd"> <!-- Project properties --> ! <property name="project.name" value="PgSqlClient" /> ! <property name="project.FormalName" value="PostgreSql.Data.PgSqlClient" /> <property name="project.version" value="1.0" /> *************** *** 14,18 **** <property name="build.dir" value="build" /> <property name="src.dir" value="${project.FormalName}\source" /> ! <property name="nunit.test.dir" value="PostgreSql.Data.PGSqlClient.UnitTests"/> <property name="resources.dir" value="${src.dir}\Resources" /> <property name="distribution.dir" value="${build.dir}\distribution" /> --- 14,18 ---- <property name="build.dir" value="build" /> <property name="src.dir" value="${project.FormalName}\source" /> ! <property name="nunit.test.dir" value="PostgreSql.Data.PgSqlClient.UnitTests"/> <property name="resources.dir" value="${src.dir}\Resources" /> <property name="distribution.dir" value="${build.dir}\distribution" /> *************** *** 41,45 **** </target> ! <!-- Displays configuration info, usefull for working out why PGSqlClient doesn't build --> <target name="display-setup" depends="check-nunit-framework"> <!-- .NET Framework 1.0 --> --- 41,45 ---- </target> ! <!-- Displays configuration info, usefull for working out why PgSqlClient doesn't build --> <target name="display-setup" depends="check-nunit-framework"> <!-- .NET Framework 1.0 --> *************** *** 130,138 **** </target> ! <!-- Taget for build PGSqlClient .NET Data Provider Assembly --> <target name="build-pgsqlclient"> <mkdir dir="${build.dir}" failonerror="false" /> ! <!-- compile PostgreSql.Data.PGSqlClient --> <csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}"> <sources> --- 130,138 ---- </target> ! <!-- Taget for build PgSqlClient .NET Data Provider Assembly --> <target name="build-pgsqlclient"> <mkdir dir="${build.dir}" failonerror="false" /> ! <!-- compile PostgreSql.Data.PgSqlClient --> <csc output="${build.dir}\${project.FormalName}.dll" target="library" define="${build.define}"> <sources> *************** *** 145,151 **** <absolute file="System.XML.dll" /> </references> ! <arg value="/resource:${resources.dir}\Toolbox\PGConnection.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGConnection.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PGCommand.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGCommand.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PGDataAdapter.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGDataAdapter.bmp" /> <arg value="/optimize+" /> </csc> --- 145,151 ---- <absolute file="System.XML.dll" /> </references> ! <arg value="/resource:${resources.dir}\Toolbox\PgConnection.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgConnection.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PgCommand.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgCommand.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PgDataAdapter.bmp,PostgreSql.Data.PgSqlClient.Resources.ToolBox.PgDataAdapter.bmp" /> <arg value="/optimize+" /> </csc> *************** *** 159,163 **** </fileset> </copy> ! <!-- compile PostgreSql.Data.PGSqlClient.Tests --> <csc output="${build.dir}\${project.FormalName}.UnitTests.dll" target="library"> <sources> --- 159,163 ---- </fileset> </copy> ! <!-- compile PostgreSql.Data.PgSqlClient.Tests --> <csc output="${build.dir}\${project.FormalName}.UnitTests.dll" target="library"> <sources> |
From: <car...@us...> - 2003-08-02 19:14:17
|
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source In directory sc8-pr-cvs1:/tmp/cvs-serv1434 Modified Files: AssemblyInfo.cs PGBaseTest.cs PGCommandBuilderTest.cs PGCommandTest.cs PGConnectionTest.cs PGDataAdapterTest.cs PGDataReaderTest.cs PGTransactionTest.cs Log Message: * Changed casing of all classes from PGXXX to PgXXX to follow MS guidelines. Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/AssemblyInfo.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AssemblyInfo.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- AssemblyInfo.cs 2 Aug 2003 19:14:14 -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 * *************** *** 24,28 **** [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] ! [assembly: AssemblyProduct("PGSqlClient - ADO.NET Data provider for PostgreSQL 7.4+")] [assembly: AssemblyCopyright("2003 - Carlos Guzmán Álvarez")] [assembly: AssemblyTrademark("")] --- 24,28 ---- [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] ! [assembly: AssemblyProduct("PgSqlClient - ADO.NET Data provider for PostgreSQL 7.4+")] [assembly: AssemblyCopyright("2003 - Carlos Guzmán Álvarez")] [assembly: AssemblyTrademark("")] Index: PGBaseTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGBaseTest.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PGBaseTest.cs 30 Jul 2003 18:39:32 -0000 1.10 --- PGBaseTest.cs 2 Aug 2003 19:14:14 -0000 1.11 *************** *** 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,38 **** using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { ! public class PGBaseTest { ! private PGConnection connection; ! public PGConnection Connection { get { return connection; } } ! public PGBaseTest() { } --- 23,38 ---- using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { ! public class PgBaseTest { ! private PgConnection connection; ! public PgConnection Connection { get { return connection; } } ! public PgBaseTest() { } *************** *** 53,57 **** ConfigurationSettings.AppSettings["Port"]); ! connection = new PGConnection(connString.ToString()); connection.StateChange += new StateChangeEventHandler(stateChange); connection.Open(); --- 53,57 ---- ConfigurationSettings.AppSettings["Port"]); ! connection = new PgConnection(connString.ToString()); connection.StateChange += new StateChangeEventHandler(stateChange); connection.Open(); *************** *** 85,89 **** ConfigurationSettings.AppSettings["Port"]); ! PGConnection connection = new PGConnection(connString.ToString()); connection.Open(); --- 85,89 ---- ConfigurationSettings.AppSettings["Port"]); ! PgConnection connection = new PgConnection(connString.ToString()); connection.Open(); *************** *** 109,113 **** ConfigurationSettings.AppSettings["Port"]); ! PGConnection connection = new PGConnection(connString.ToString()); connection.Open(); --- 109,113 ---- ConfigurationSettings.AppSettings["Port"]); ! PgConnection connection = new PgConnection(connString.ToString()); connection.Open(); *************** *** 118,122 **** ConfigurationSettings.AppSettings["Database"]); ! PGCommand command = new PGCommand(commandText.ToString(), connection); command.ExecuteNonQuery(); --- 118,122 ---- ConfigurationSettings.AppSettings["Database"]); ! PgCommand command = new PgCommand(commandText.ToString(), connection); command.ExecuteNonQuery(); *************** *** 150,154 **** commandText.Append(") WITH OIDS;"); ! PGCommand command = new PGCommand(commandText.ToString(), connection); command.ExecuteNonQuery(); command.Dispose(); --- 150,154 ---- commandText.Append(") WITH OIDS;"); ! PgCommand command = new PgCommand(commandText.ToString(), connection); command.ExecuteNonQuery(); command.Dispose(); *************** *** 168,172 **** commandText.Append("LANGUAGE 'sql' VOLATILE;"); ! PGCommand command = new PGCommand(commandText.ToString(), connection); command.ExecuteNonQuery(); --- 168,172 ---- commandText.Append("LANGUAGE 'sql' VOLATILE;"); ! PgCommand command = new PgCommand(commandText.ToString(), connection); command.ExecuteNonQuery(); *************** *** 189,206 **** string commandText = "insert into public.test_table values(@int4_field, @char_field, @varchar_field, @single_field, @double_field, @date_Field, @time_field, @timestamp_field)"; ! PGTransaction transaction = connection.BeginTransaction(); ! PGCommand command = new PGCommand(commandText, connection, transaction); try { // Add command parameters ! command.Parameters.Add("@int4_field", PGDbType.Int4); ! command.Parameters.Add("@char_field", PGDbType.Char); ! command.Parameters.Add("@varchar_field", PGDbType.VarChar); ! command.Parameters.Add("@single_field", PGDbType.Float); ! command.Parameters.Add("@double_field", PGDbType.Double); ! command.Parameters.Add("@date_field", PGDbType.Date); ! command.Parameters.Add("@time_field", PGDbType.Time); ! command.Parameters.Add("@timestamp_field", PGDbType.TimeStamp); for (int i = 0; i < 100; i++) --- 189,206 ---- string commandText = "insert into public.test_table values(@int4_field, @char_field, @varchar_field, @single_field, @double_field, @date_Field, @time_field, @timestamp_field)"; ! PgTransaction transaction = connection.BeginTransaction(); ! PgCommand command = new PgCommand(commandText, connection, transaction); try { // Add command parameters ! command.Parameters.Add("@int4_field", PgDbType.Int4); ! command.Parameters.Add("@char_field", PgDbType.Char); ! command.Parameters.Add("@varchar_field", PgDbType.VarChar); ! command.Parameters.Add("@single_field", PgDbType.Float); ! command.Parameters.Add("@double_field", PgDbType.Double); ! command.Parameters.Add("@date_field", PgDbType.Date); ! command.Parameters.Add("@time_field", PgDbType.Time); ! command.Parameters.Add("@timestamp_field", PgDbType.TimeStamp); for (int i = 0; i < 100; i++) *************** *** 221,225 **** transaction.Commit(); } ! catch (PGException ex) { transaction.Rollback(); --- 221,225 ---- transaction.Commit(); } ! catch (PgException ex) { transaction.Rollback(); Index: PGCommandBuilderTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGCommandBuilderTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGCommandBuilderTest.cs 30 Jul 2003 18:54:36 -0000 1.2 --- PGCommandBuilderTest.cs 2 Aug 2003 19:14:14 -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,39 **** using System; using System.Data; ! using PostgreSql.Data.PGSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { [TestFixture] ! public class PGCommandBuilderTest : PGBaseTest { [Test] public void GetInsertCommandTest() { ! PGCommand command = new PGCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! PGCommandBuilder builder = new PGCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("\r\nPGCommandBuilder - GetInsertCommand Method Test"); Console.WriteLine(builder.GetInsertCommand().CommandText); --- 19,39 ---- using System; using System.Data; ! using PostgreSql.Data.PgSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { [TestFixture] ! public class PgCommandBuilderTest : PgBaseTest { [Test] public void GetInsertCommandTest() { ! PgCommand command = new PgCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! PgCommandBuilder builder = new PgCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("\r\nPgCommandBuilder - GetInsertCommand Method Test"); Console.WriteLine(builder.GetInsertCommand().CommandText); *************** *** 47,56 **** public void GetUpdateCommandTest() { ! PGCommand command = new PGCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! PGCommandBuilder builder = new PGCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("\r\nPGCommandBuilder - GetUpdateCommand Method Test"); Console.WriteLine(builder.GetUpdateCommand().CommandText); --- 47,56 ---- public void GetUpdateCommandTest() { ! PgCommand command = new PgCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! PgCommandBuilder builder = new PgCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("\r\nPgCommandBuilder - GetUpdateCommand Method Test"); Console.WriteLine(builder.GetUpdateCommand().CommandText); *************** *** 64,73 **** public void GetDeleteCommandTest() { ! PGCommand command = new PGCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! PGCommandBuilder builder = new PGCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("PGCommandBuilder - GetDeleteCommand Method Test"); Console.WriteLine( builder.GetDeleteCommand().CommandText ); --- 64,73 ---- public void GetDeleteCommandTest() { ! PgCommand command = new PgCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! PgCommandBuilder builder = new PgCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("PgCommandBuilder - GetDeleteCommand Method Test"); Console.WriteLine( builder.GetDeleteCommand().CommandText ); *************** *** 81,90 **** public void RefreshSchemaTest() { ! PGCommand command = new PGCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! PGCommandBuilder builder = new PGCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("\r\nPGCommandBuilder - RefreshSchema Method Test - Commands for original SQL statement: "); Console.WriteLine(builder.GetInsertCommand().CommandText); --- 81,90 ---- public void RefreshSchemaTest() { ! PgCommand command = new PgCommand("select * from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! PgCommandBuilder builder = new PgCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("\r\nPgCommandBuilder - RefreshSchema Method Test - Commands for original SQL statement: "); Console.WriteLine(builder.GetInsertCommand().CommandText); *************** *** 97,101 **** Console.WriteLine(); ! Console.WriteLine("\r\nPGCommandBuilder - RefreshSchema Method Test - Commands for new SQL statement: "); Console.WriteLine(builder.GetInsertCommand().CommandText); --- 97,101 ---- Console.WriteLine(); ! Console.WriteLine("\r\nPgCommandBuilder - RefreshSchema Method Test - Commands for new SQL statement: "); Console.WriteLine(builder.GetInsertCommand().CommandText); *************** *** 111,120 **** public void CommandBuilderWithExpressionFieldTest() { ! PGCommand command = new PGCommand("select public.test_table.*, 0 AS EXPR_VALUE from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! PGCommandBuilder builder = new PGCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("PGCommandBuilder - CommandBuilderWithExpressionFieldTest"); Console.WriteLine(builder.GetUpdateCommand().CommandText); --- 111,120 ---- public void CommandBuilderWithExpressionFieldTest() { ! PgCommand command = new PgCommand("select public.test_table.*, 0 AS EXPR_VALUE from public.test_table where int4_field = @int4_field and varchar_field = @varchar_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! PgCommandBuilder builder = new PgCommandBuilder(adapter); Console.WriteLine(); ! Console.WriteLine("PgCommandBuilder - CommandBuilderWithExpressionFieldTest"); Console.WriteLine(builder.GetUpdateCommand().CommandText); *************** *** 128,140 **** public void DeriveParameters() { ! PGCommandBuilder builder = new PGCommandBuilder(); ! PGCommand command = new PGCommand("DeriveCount(10)", Connection); command.CommandType = CommandType.StoredProcedure; ! PGCommandBuilder.DeriveParameters(command); ! Console.WriteLine("\r\nPGCommandBuilder - DeriveParameters static Method Test"); for (int i = 0; i < command.Parameters.Count; i++) --- 128,140 ---- public void DeriveParameters() { ! PgCommandBuilder builder = new PgCommandBuilder(); ! PgCommand command = new PgCommand("DeriveCount(10)", Connection); command.CommandType = CommandType.StoredProcedure; ! PgCommandBuilder.DeriveParameters(command); ! Console.WriteLine("\r\nPgCommandBuilder - DeriveParameters static Method Test"); for (int i = 0; i < command.Parameters.Count; i++) Index: PGCommandTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGCommandTest.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PGCommandTest.cs 28 Jul 2003 18:26:41 -0000 1.8 --- PGCommandTest.cs 2 Aug 2003 19:14:14 -0000 1.9 *************** *** 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,46 **** using System; using System.Data; ! using PostgreSql.Data.PGSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { [TestFixture] ! public class PGCommandTest : PGBaseTest { [Test] public void ExecuteNonQueryTest() { ! Console.WriteLine("\r\nPGCommandTest.ExecuteNonQueryTest"); string commandText = "update public.test_table set char_field = @char_field, varchar_field = @varchar_field where int4_field = @int4_field"; ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand(commandText, Connection, transaction); try { // Add command parameters ! command.Parameters.Add("@char_field", PGDbType.Char); ! command.Parameters.Add("@varchar_field", PGDbType.VarChar); ! command.Parameters.Add("@int4_field", PGDbType.Int4); for (int i = 0; i < 100; i++) --- 19,46 ---- using System; using System.Data; ! using PostgreSql.Data.PgSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { [TestFixture] ! public class PgCommandTest : PgBaseTest { [Test] public void ExecuteNonQueryTest() { ! Console.WriteLine("\r\nPgCommandTest.ExecuteNonQueryTest"); string commandText = "update public.test_table set char_field = @char_field, varchar_field = @varchar_field where int4_field = @int4_field"; ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand(commandText, Connection, transaction); try { // Add command parameters ! command.Parameters.Add("@char_field", PgDbType.Char); ! command.Parameters.Add("@varchar_field", PgDbType.VarChar); ! command.Parameters.Add("@int4_field", PgDbType.Int4); for (int i = 0; i < 100; i++) *************** *** 58,62 **** ExecuteReaderTest(); } ! catch (PGException ex) { transaction.Rollback(); --- 58,62 ---- ExecuteReaderTest(); } ! catch (PgException ex) { transaction.Rollback(); *************** *** 72,79 **** public void ExecuteReaderTest() { ! Console.WriteLine("\r\nPGCommandTest.ExecuteReaderTest"); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table ORDER BY date_field", Connection); ! PGDataReader reader = command.ExecuteReader(); for (int i = 0; i < reader.FieldCount; i++) --- 72,79 ---- public void ExecuteReaderTest() { ! Console.WriteLine("\r\nPgCommandTest.ExecuteReaderTest"); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table ORDER BY date_field", Connection); ! PgDataReader reader = command.ExecuteReader(); for (int i = 0; i < reader.FieldCount; i++) *************** *** 99,103 **** public void ExecuteScalarTest() { ! PGCommand command = Connection.CreateCommand(); command.CommandText = "SELECT char_field FROM public.test_table where int4_field = @int4_field"; --- 99,103 ---- public void ExecuteScalarTest() { ! PgCommand command = Connection.CreateCommand(); command.CommandText = "SELECT char_field FROM public.test_table where int4_field = @int4_field"; *************** *** 115,119 **** public void PrepareTest() { ! PGCommand command = Connection.CreateCommand(); command.CommandText = "SELECT char_field FROM public.test_table where int4_field = @int4_field"; --- 115,119 ---- public void PrepareTest() { ! PgCommand command = Connection.CreateCommand(); command.CommandText = "SELECT char_field FROM public.test_table where int4_field = @int4_field"; *************** *** 127,131 **** public void NamedParametersTest() { ! PGCommand command = Connection.CreateCommand(); command.CommandText = "SELECT char_field FROM public.test_table where int4_field = @int4_field or char_field = @char_field"; --- 127,131 ---- public void NamedParametersTest() { ! PgCommand command = Connection.CreateCommand(); command.CommandText = "SELECT char_field FROM public.test_table where int4_field = @int4_field or char_field = @char_field"; *************** *** 134,138 **** command.Parameters.Add("@char_field", "IRow 20"); ! PGDataReader reader = command.ExecuteReader(); int count = 0; --- 134,138 ---- command.Parameters.Add("@char_field", "IRow 20"); ! PgDataReader reader = command.ExecuteReader(); int count = 0; *************** *** 152,159 **** public void ExecuteStoredProcTest() { ! PGCommand command = new PGCommand("TestCount()", Connection); command.CommandType = CommandType.StoredProcedure; ! command.Parameters.Add("@CountResult", PGDbType.Int8).Direction = ParameterDirection.Output; command.ExecuteNonQuery(); --- 152,159 ---- public void ExecuteStoredProcTest() { ! PgCommand command = new PgCommand("TestCount()", Connection); command.CommandType = CommandType.StoredProcedure; ! command.Parameters.Add("@CountResult", PgDbType.Int8).Direction = ParameterDirection.Output; command.ExecuteNonQuery(); *************** *** 168,172 **** { // Execute a SELECT command ! PGCommand selectCommand = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = 100", Connection); int recordsAffected = selectCommand.ExecuteNonQuery(); Console.WriteLine("\r\nRecords Affected by SELECT command: {0}", recordsAffected); --- 168,172 ---- { // Execute a SELECT command ! PgCommand selectCommand = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = 100", Connection); int recordsAffected = selectCommand.ExecuteNonQuery(); Console.WriteLine("\r\nRecords Affected by SELECT command: {0}", recordsAffected); *************** *** 176,180 **** // Execute a DELETE command ! PGCommand deleteCommand = new PGCommand("DELETE FROM public.test_table WHERE int4_field = 45", Connection); recordsAffected = deleteCommand.ExecuteNonQuery(); Console.WriteLine("\r\nRecords Affected by DELETE command: {0}", recordsAffected); --- 176,180 ---- // Execute a DELETE command ! PgCommand deleteCommand = new PgCommand("DELETE FROM public.test_table WHERE int4_field = 45", Connection); recordsAffected = deleteCommand.ExecuteNonQuery(); Console.WriteLine("\r\nRecords Affected by DELETE command: {0}", recordsAffected); Index: PGConnectionTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGConnectionTest.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PGConnectionTest.cs 26 Jul 2003 11:42:29 -0000 1.3 --- PGConnectionTest.cs 2 Aug 2003 19:14:14 -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 * *************** *** 19,34 **** using System; using System.Data; ! using PostgreSql.Data.PGSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { [TestFixture] ! public class PGConnectionTest : PGBaseTest { [Test] public void BeginTransactionTest() { ! PGTransaction transaction = Connection.BeginTransaction(); transaction.Rollback(); } --- 19,34 ---- using System; using System.Data; ! using PostgreSql.Data.PgSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { [TestFixture] ! public class PgConnectionTest : PgBaseTest { [Test] public void BeginTransactionTest() { ! PgTransaction transaction = Connection.BeginTransaction(); transaction.Rollback(); } *************** *** 37,41 **** public void BeginTransactionReadCommittedTest() { ! PGTransaction transaction = Connection.BeginTransaction(IsolationLevel.ReadCommitted); transaction.Rollback(); } --- 37,41 ---- public void BeginTransactionReadCommittedTest() { ! PgTransaction transaction = Connection.BeginTransaction(IsolationLevel.ReadCommitted); transaction.Rollback(); } *************** *** 44,48 **** public void BeginTransactionSerializableTest() { ! PGTransaction transaction = Connection.BeginTransaction(IsolationLevel.Serializable); transaction.Rollback(); } --- 44,48 ---- public void BeginTransactionSerializableTest() { ! PgTransaction transaction = Connection.BeginTransaction(IsolationLevel.Serializable); transaction.Rollback(); } *************** *** 81,85 **** public void CreateCommandTest() { ! PGCommand command = Connection.CreateCommand(); } --- 81,85 ---- public void CreateCommandTest() { ! PgCommand command = Connection.CreateCommand(); } *************** *** 87,94 **** public void DbSchemaTest() { ! Connection.GetDbSchemaTable(PGDbSchemaType.Aggregates, null); ! Connection.GetDbSchemaTable(PGDbSchemaType.Casts, null); ! Connection.GetDbSchemaTable(PGDbSchemaType.Check_Constraints, null); ! Connection.GetDbSchemaTable(PGDbSchemaType.Columns, null); } } --- 87,94 ---- public void DbSchemaTest() { ! Connection.GetDbSchemaTable(PgDbSchemaType.Aggregates, null); ! Connection.GetDbSchemaTable(PgDbSchemaType.Casts, null); ! Connection.GetDbSchemaTable(PgDbSchemaType.Check_Constraints, null); ! Connection.GetDbSchemaTable(PgDbSchemaType.Columns, null); } } Index: PGDataAdapterTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGDataAdapterTest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PGDataAdapterTest.cs 27 Jul 2003 21:19:39 -0000 1.6 --- PGDataAdapterTest.cs 2 Aug 2003 19:14:14 -0000 1.7 *************** *** 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,39 **** using System; using System.Data; ! using PostgreSql.Data.PGSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { [TestFixture] ! public class PGDataAdapterTest : PGBaseTest { [Test] public void FillTest() { ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE date_field = @date_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@date_field", PGDbType.Date, 4, "date_field").Value = DateTime.Now; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 19,39 ---- using System; using System.Data; ! using PostgreSql.Data.PgSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { [TestFixture] ! public class PgDataAdapterTest : PgBaseTest { [Test] public void FillTest() { ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE date_field = @date_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@date_field", PgDbType.Date, 4, "date_field").Value = DateTime.Now; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 71,80 **** public void FillMultipleTest() { ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE date_field = @date_field", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@date_field", PGDbType.Date, 4, "date_field").Value = DateTime.Now; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds1 = new DataSet(); --- 71,80 ---- public void FillMultipleTest() { ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE date_field = @date_field", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@date_field", PgDbType.Date, 4, "date_field").Value = DateTime.Now; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds1 = new DataSet(); *************** *** 92,100 **** public void InsertTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table", Connection); ! PGDataAdapter adapter = new PGDataAdapter(command); ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 92,100 ---- public void InsertTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table", Connection); ! PgDataAdapter adapter = new PgDataAdapter(command); ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 126,136 **** public void UpdateCharTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 1; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 126,136 ---- public void UpdateCharTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 1; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 150,160 **** public void UpdateVarCharTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 10; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 150,160 ---- public void UpdateVarCharTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 10; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 174,184 **** public void UpdateInt2Test() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 40; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 174,184 ---- public void UpdateInt2Test() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 40; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 194,199 **** transaction.Commit(); ! command = new PGCommand("SELECT int2_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 40; short val = (short)command.ExecuteScalar(); --- 194,199 ---- transaction.Commit(); ! command = new PgCommand("SELECT int2_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 40; short val = (short)command.ExecuteScalar(); *************** *** 205,215 **** public void UpdateInt8Test() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 20; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 205,215 ---- public void UpdateInt8Test() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 20; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 225,230 **** transaction.Commit(); ! command = new PGCommand("SELECT int8_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 20; long val = (long)command.ExecuteScalar(); --- 225,230 ---- transaction.Commit(); ! command = new PgCommand("SELECT int8_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 20; long val = (long)command.ExecuteScalar(); *************** *** 236,246 **** public void UpdateDoubleTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 50; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 236,246 ---- public void UpdateDoubleTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 50; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 256,261 **** transaction.Commit(); ! command = new PGCommand("SELECT double_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 50; double val = (double)command.ExecuteScalar(); --- 256,261 ---- transaction.Commit(); ! command = new PgCommand("SELECT double_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 50; double val = (double)command.ExecuteScalar(); *************** *** 267,277 **** public void UpdateMoneyField() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 27; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 267,277 ---- public void UpdateMoneyField() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 27; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 287,292 **** transaction.Commit(); ! command = new PGCommand("SELECT money_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 27; float val = (float)command.ExecuteScalar(); --- 287,292 ---- transaction.Commit(); ! command = new PgCommand("SELECT money_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 27; float val = (float)command.ExecuteScalar(); *************** *** 298,308 **** public void UpdateNumericTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 60; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 298,308 ---- public void UpdateNumericTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 60; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 318,323 **** transaction.Commit(); ! command = new PGCommand("SELECT numeric_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 60; decimal val = (decimal)command.ExecuteScalar(); --- 318,323 ---- transaction.Commit(); ! command = new PgCommand("SELECT numeric_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 60; decimal val = (decimal)command.ExecuteScalar(); *************** *** 332,342 **** public void UpdateDateTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 70; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 332,342 ---- public void UpdateDateTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 70; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 354,359 **** transaction.Commit(); ! command = new PGCommand("SELECT date_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 70; DateTime val = (DateTime)command.ExecuteScalar(); --- 354,359 ---- transaction.Commit(); ! command = new PgCommand("SELECT date_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 70; DateTime val = (DateTime)command.ExecuteScalar(); *************** *** 367,377 **** public void UpdateTimeTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 80; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 367,377 ---- public void UpdateTimeTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 80; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 389,394 **** transaction.Commit(); ! command = new PGCommand("SELECT time_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 80; DateTime val = (DateTime)command.ExecuteScalar(); --- 389,394 ---- transaction.Commit(); ! command = new PgCommand("SELECT time_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 80; DateTime val = (DateTime)command.ExecuteScalar(); *************** *** 402,412 **** public void UpdateTimeStampTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 90; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 402,412 ---- public void UpdateTimeStampTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 90; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); *************** *** 424,429 **** transaction.Commit(); ! command = new PGCommand("SELECT timestamp_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 90; DateTime val = (DateTime)command.ExecuteScalar(); --- 424,429 ---- transaction.Commit(); ! command = new PgCommand("SELECT timestamp_field FROM public.test_table WHERE int4_field = @int4_field", Connection); ! command.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 90; DateTime val = (DateTime)command.ExecuteScalar(); *************** *** 440,450 **** public void DeleteTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PGDataAdapter adapter = new PGDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PGDbType.Int4, 4, "int4_field").Value = 35; ! PGCommandBuilder builder = new PGCommandBuilder(adapter); DataSet ds = new DataSet(); --- 440,450 ---- public void DeleteTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table WHERE int4_field = @int4_field", Connection, transaction); ! PgDataAdapter adapter = new PgDataAdapter(command); ! adapter.SelectCommand.Parameters.Add("@int4_field", PgDbType.Int4, 4, "int4_field").Value = 35; ! PgCommandBuilder builder = new PgCommandBuilder(adapter); DataSet ds = new DataSet(); Index: PGDataReaderTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGDataReaderTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGDataReaderTest.cs 15 Jul 2003 19:11:39 -0000 1.2 --- PGDataReaderTest.cs 2 Aug 2003 19:14:14 -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,39 **** using System; using System.Data; ! using PostgreSql.Data.PGSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { [TestFixture] ! public class PGDataReaderTest : PGBaseTest { [Test] public void ReadTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PGDataReader reader = command.ExecuteReader(); while (reader.Read()) { --- 19,39 ---- using System; using System.Data; ! using PostgreSql.Data.PgSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { [TestFixture] ! public class PgDataReaderTest : PgBaseTest { [Test] public void ReadTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PgDataReader reader = command.ExecuteReader(); while (reader.Read()) { *************** *** 54,63 **** public void GetValuesTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PGDataReader reader = command.ExecuteReader(); while (reader.Read()) { --- 54,63 ---- public void GetValuesTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PgDataReader reader = command.ExecuteReader(); while (reader.Read()) { *************** *** 81,90 **** public void IndexerByIndexTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PGDataReader reader = command.ExecuteReader(); while (reader.Read()) { --- 81,90 ---- public void IndexerByIndexTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PgDataReader reader = command.ExecuteReader(); while (reader.Read()) { *************** *** 105,114 **** public void IndexerByNameTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PGDataReader reader = command.ExecuteReader(); while (reader.Read()) { --- 105,114 ---- public void IndexerByNameTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table", Connection, transaction); Console.WriteLine("\r\nDataReader - Read Method - Test"); ! PgDataReader reader = command.ExecuteReader(); while (reader.Read()) { *************** *** 129,136 **** public void GetSchemaTableTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT * FROM public.test_table", Connection, transaction); ! PGDataReader reader = command.ExecuteReader(CommandBehavior.SchemaOnly); DataTable schema = reader.GetSchemaTable(); --- 129,136 ---- public void GetSchemaTableTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT * FROM public.test_table", Connection, transaction); ! PgDataReader reader = command.ExecuteReader(CommandBehavior.SchemaOnly); DataTable schema = reader.GetSchemaTable(); *************** *** 166,173 **** public void GetSchemaTableWithExpressionFieldTest() { ! PGTransaction transaction = Connection.BeginTransaction(); ! PGCommand command = new PGCommand("SELECT *, 0 AS VALOR FROM public.test_table", Connection, transaction); ! PGDataReader reader = command.ExecuteReader(CommandBehavior.SchemaOnly); DataTable schema = reader.GetSchemaTable(); --- 166,173 ---- public void GetSchemaTableWithExpressionFieldTest() { ! PgTransaction transaction = Connection.BeginTransaction(); ! PgCommand command = new PgCommand("SELECT *, 0 AS VALOR FROM public.test_table", Connection, transaction); ! PgDataReader reader = command.ExecuteReader(CommandBehavior.SchemaOnly); DataTable schema = reader.GetSchemaTable(); Index: PGTransactionTest.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient.UnitTests/source/PGTransactionTest.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGTransactionTest.cs 15 Jul 2003 19:11:39 -0000 1.2 --- PGTransactionTest.cs 2 Aug 2003 19:14:14 -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,29 **** using System; using System.Data; ! using PostgreSql.Data.PGSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PGSqlClient.UnitTests { [TestFixture] ! public class PGTransactionTest : PGBaseTest { [Test] --- 19,29 ---- using System; using System.Data; ! using PostgreSql.Data.PgSqlClient; using NUnit.Framework; ! namespace PostgreSql.Data.PgSqlClient.UnitTests { [TestFixture] ! public class PgTransactionTest : PgBaseTest { [Test] *************** *** 31,35 **** { Console.WriteLine("\r\nStarting transaction"); ! PGTransaction transaction = Connection.BeginTransaction(); transaction.Rollback(); } --- 31,35 ---- { Console.WriteLine("\r\nStarting transaction"); ! PgTransaction transaction = Connection.BeginTransaction(); transaction.Rollback(); } *************** *** 39,43 **** { Console.WriteLine("\r\nStarting transaction - ReadCommitted"); ! PGTransaction transaction = Connection.BeginTransaction(IsolationLevel.ReadCommitted); transaction.Rollback(); } --- 39,43 ---- { Console.WriteLine("\r\nStarting transaction - ReadCommitted"); ! PgTransaction transaction = Connection.BeginTransaction(IsolationLevel.ReadCommitted); transaction.Rollback(); } *************** *** 47,51 **** { Console.WriteLine("\r\nStarting transaction - Serializable"); ! PGTransaction transaction = Connection.BeginTransaction(IsolationLevel.Serializable); transaction.Rollback(); } --- 47,51 ---- { Console.WriteLine("\r\nStarting transaction - Serializable"); ! PgTransaction transaction = Connection.BeginTransaction(IsolationLevel.Serializable); transaction.Rollback(); } *************** *** 55,59 **** { Console.WriteLine("\r\nTestin transaction Commit"); ! PGTransaction transaction = Connection.BeginTransaction(); transaction.Commit(); transaction.Dispose(); --- 55,59 ---- { Console.WriteLine("\r\nTestin transaction Commit"); ! PgTransaction transaction = Connection.BeginTransaction(); transaction.Commit(); transaction.Dispose(); *************** *** 64,68 **** { Console.WriteLine("\r\nTestin transaction Rollback"); ! PGTransaction transaction = Connection.BeginTransaction(); transaction.Rollback(); transaction.Dispose(); --- 64,68 ---- { Console.WriteLine("\r\nTestin transaction Rollback"); ! PgTransaction transaction = Connection.BeginTransaction(); transaction.Rollback(); transaction.Dispose(); |
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient In directory sc8-pr-cvs1:/tmp/cvs-serv1321 Modified Files: PGAuthMethods.cs PGCharSet.cs PGCharSetCollection.cs PGClientError.cs PGClientErrorCollection.cs PGClientException.cs PGClientMessageEventArgs.cs PGClientNotificationEventArgs.cs PGCodes.cs PGConnectionParams.cs PGDbClient.cs PGDecodeType.cs PGEncodeType.cs PGFieldDescriptor.cs PGInetReader.cs PGInetWriter.cs PGLayouts.cs PGOutputPacket.cs PGParameter.cs PGResponsePacket.cs PGRowDescriptor.cs PGStatement.cs PGType.cs PGTypeCollection.cs Log Message: * Changed casing of all classes from PGXXX to PgXXX to follow MS guidelines. Index: PGAuthMethods.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGAuthMethods.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGAuthMethods.cs 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGAuthMethods.cs 2 Aug 2003 19:13:49 -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,25 **** using System.Security.Cryptography; ! namespace PostgreSql.Data.NPGClient { internal class MD5Authentication --- 21,25 ---- using System.Security.Cryptography; ! namespace PostgreSql.Data.NPgClient { internal class MD5Authentication Index: PGCharSet.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGCharSet.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGCharSet.cs 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGCharSet.cs 2 Aug 2003 19:13:49 -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 * *************** *** 20,26 **** using System.Text; ! namespace PostgreSql.Data.NPGClient { ! internal class PGCharSet { #region FIELDS --- 20,26 ---- using System.Text; ! namespace PostgreSql.Data.NPgClient { ! internal class PgCharSet { #region FIELDS *************** *** 47,55 **** #region CONSTRUCTORS ! public PGCharSet() { } ! public PGCharSet(string charSet, string systemCharSet) { this.charSet = charSet; --- 47,55 ---- #region CONSTRUCTORS ! public PgCharSet() { } ! public PgCharSet(string charSet, string systemCharSet) { this.charSet = charSet; *************** *** 57,61 **** } ! public PGCharSet(string charSet, int cp) { this.charSet = charSet; --- 57,61 ---- } ! public PgCharSet(string charSet, int cp) { this.charSet = charSet; Index: PGCharSetCollection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGCharSetCollection.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGCharSetCollection.cs 29 Jul 2003 10:15:08 -0000 1.2 --- PGCharSetCollection.cs 2 Aug 2003 19:13:49 -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 * *************** *** 22,41 **** using System.Globalization; ! namespace PostgreSql.Data.NPGClient { ! internal class PGCharSetCollection : ArrayList { #region PROPERTIES ! public new PGCharSet this[int index] { ! get { return (PGCharSet)base[index]; } ! set { base[index] = (PGCharSet)value; } } ! public PGCharSet this[string name] { ! get { return (PGCharSet)this[IndexOf(name)]; } ! set { this[IndexOf(name)] = (PGCharSet)value; } } --- 22,41 ---- using System.Globalization; ! namespace PostgreSql.Data.NPgClient { ! internal class PgCharSetCollection : ArrayList { #region PROPERTIES ! public new PgCharSet this[int index] { ! get { return (PgCharSet)base[index]; } ! set { base[index] = (PgCharSet)value; } } ! public PgCharSet this[string name] { ! get { return (PgCharSet)this[IndexOf(name)]; } ! set { this[IndexOf(name)] = (PgCharSet)value; } } *************** *** 52,56 **** { int index = 0; ! foreach(PGCharSet item in this) { if (cultureAwareCompare(item.CharSet, charset)) --- 52,56 ---- { int index = 0; ! foreach(PgCharSet item in this) { if (cultureAwareCompare(item.CharSet, charset)) *************** *** 68,72 **** } ! public PGCharSet Add(PGCharSet charset) { base.Add(charset); --- 68,72 ---- } ! public PgCharSet Add(PgCharSet charset) { base.Add(charset); *************** *** 75,81 **** } ! public PGCharSet Add(string charset, string systemCharset) { ! PGCharSet charSet = new PGCharSet(charset, systemCharset); base.Add(charSet); --- 75,81 ---- } ! public PgCharSet Add(string charset, string systemCharset) { ! PgCharSet charSet = new PgCharSet(charset, systemCharset); base.Add(charSet); *************** *** 84,90 **** } ! public PGCharSet Add(string charset, int cp) { ! PGCharSet charSet = new PGCharSet(charset, cp); base.Add(charSet); --- 84,90 ---- } ! public PgCharSet Add(string charset, int cp) { ! PgCharSet charSet = new PgCharSet(charset, cp); base.Add(charSet); Index: PGClientError.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGClientError.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGClientError.cs 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGClientError.cs 2 Aug 2003 19:13:49 -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 * *************** *** 19,25 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal sealed class PGClientError { #region FIELDS --- 19,25 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal sealed class PgClientError { #region FIELDS *************** *** 104,117 **** #region CONSTRUCTORS ! public PGClientError() { } ! public PGClientError(string message) { this.message = message; } ! public PGClientError(string severity, string code, string message) { this.severity = severity; --- 104,117 ---- #region CONSTRUCTORS ! public PgClientError() { } ! public PgClientError(string message) { this.message = message; } ! public PgClientError(string severity, string code, string message) { this.severity = severity; Index: PGClientErrorCollection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGClientErrorCollection.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGClientErrorCollection.cs 29 Jul 2003 10:15:08 -0000 1.2 --- PGClientErrorCollection.cs 2 Aug 2003 19:13:49 -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,40 **** using System.Globalization; ! namespace PostgreSql.Data.NPGClient { ! internal sealed class PGClientErrorCollection : ArrayList { #region PROPERTIES ! public PGClientError this[string errorMessage] { ! get { return (PGClientError)this[IndexOf(errorMessage)]; } ! set { this[IndexOf(errorMessage)] = (PGClientError)value; } } ! public new PGClientError this[int errorIndex] { ! get { return (PGClientError)base[errorIndex]; } ! set { base[errorIndex] = (PGClientError)value; } } --- 21,40 ---- using System.Globalization; ! namespace PostgreSql.Data.NPgClient { ! internal sealed class PgClientErrorCollection : ArrayList { #region PROPERTIES ! public PgClientError this[string errorMessage] { ! get { return (PgClientError)this[IndexOf(errorMessage)]; } ! set { this[IndexOf(errorMessage)] = (PgClientError)value; } } ! public new PgClientError this[int errorIndex] { ! get { return (PgClientError)base[errorIndex]; } ! set { base[errorIndex] = (PgClientError)value; } } *************** *** 51,55 **** { int index = 0; ! foreach(PGClientError item in this) { if (cultureAwareCompare(item.Message, errorMessage)) --- 51,55 ---- { int index = 0; ! foreach(PgClientError item in this) { if (cultureAwareCompare(item.Message, errorMessage)) *************** *** 67,71 **** } ! public PGClientError Add(PGClientError error) { base.Add(error); --- 67,71 ---- } ! public PgClientError Add(PgClientError error) { base.Add(error); *************** *** 74,80 **** } ! public PGClientError Add(string severity, string message, string code) { ! PGClientError error = new PGClientError(severity, code, message); return Add(error); --- 74,80 ---- } ! public PgClientError Add(string severity, string message, string code) { ! PgClientError error = new PgClientError(severity, code, message); return Add(error); Index: PGClientException.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGClientException.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGClientException.cs 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGClientException.cs 2 Aug 2003 19:13:49 -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 * *************** *** 20,31 **** using System.Text; ! namespace PostgreSql.Data.NPGClient { ! internal class PGClientException : Exception { #region FIELDS private string message; ! private PGClientErrorCollection errors; #endregion --- 20,31 ---- using System.Text; ! namespace PostgreSql.Data.NPgClient { ! internal class PgClientException : Exception { #region FIELDS private string message; ! private PgClientErrorCollection errors; #endregion *************** *** 38,42 **** } ! public PGClientErrorCollection Errors { get { return errors; } --- 38,42 ---- } ! public PgClientErrorCollection Errors { get { return errors; } *************** *** 47,56 **** #region CONSTRUCTORS ! public PGClientException() : base() { ! errors = new PGClientErrorCollection(); } ! public PGClientException(string message) : this() { this.message = message; --- 47,56 ---- #region CONSTRUCTORS ! public PgClientException() : base() { ! errors = new PgClientErrorCollection(); } ! public PgClientException(string message) : this() { this.message = message; Index: PGClientMessageEventArgs.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGClientMessageEventArgs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PGClientMessageEventArgs.cs 1 Aug 2003 17:51:58 -0000 1.1 --- PGClientMessageEventArgs.cs 2 Aug 2003 19:13:49 -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 * *************** *** 18,38 **** using System; ! using PostgreSql.Data.NPGClient; ! using PostgreSql.Data.PGSqlClient.DbSchema; ! namespace PostgreSql.Data.NPGClient { ! internal delegate void PGClientMessageEventHandler(object sender, PGClientMessageEventArgs e); ! internal sealed class PGClientMessageEventArgs : EventArgs { ! private PGClientException exception; ! public PGClientException Exception { get { return exception; } } ! public PGClientMessageEventArgs(PGClientException exception) { this.exception = exception; --- 18,38 ---- using System; ! using PostgreSql.Data.NPgClient; ! using PostgreSql.Data.PgSqlClient.DbSchema; ! namespace PostgreSql.Data.NPgClient { ! internal delegate void PgClientMessageEventHandler(object sender, PgClientMessageEventArgs e); ! internal sealed class PgClientMessageEventArgs : EventArgs { ! private PgClientException exception; ! public PgClientException Exception { get { return exception; } } ! public PgClientMessageEventArgs(PgClientException exception) { this.exception = exception; Index: PGClientNotificationEventArgs.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGClientNotificationEventArgs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PGClientNotificationEventArgs.cs 1 Aug 2003 17:51:58 -0000 1.1 --- PGClientNotificationEventArgs.cs 2 Aug 2003 19:13:49 -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 * *************** *** 18,29 **** using System; ! using PostgreSql.Data.NPGClient; ! using PostgreSql.Data.PGSqlClient.DbSchema; ! namespace PostgreSql.Data.NPGClient { ! internal delegate void PGClientNotificationEventHandler(object sender, PGClientNotificationEventArgs e); ! internal sealed class PGClientNotificationEventArgs : EventArgs { private int processID; --- 18,29 ---- using System; ! using PostgreSql.Data.NPgClient; ! using PostgreSql.Data.PgSqlClient.DbSchema; ! namespace PostgreSql.Data.NPgClient { ! internal delegate void PgClientNotificationEventHandler(object sender, PgClientNotificationEventArgs e); ! internal sealed class PgClientNotificationEventArgs : EventArgs { private int processID; *************** *** 46,50 **** } ! public PGClientNotificationEventArgs(int processID, string condition, string addtional) { this.processID = processID; --- 46,50 ---- } ! public PgClientNotificationEventArgs(int processID, string condition, string addtional) { this.processID = processID; Index: PGCodes.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGCodes.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGCodes.cs 17 Jul 2003 13:41:42 -0000 1.2 --- PGCodes.cs 2 Aug 2003 19:13:49 -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,25 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal class PGBackendCodes { // Backend Message Formats --- 19,25 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal class PgBackendCodes { // Backend Message Formats *************** *** 46,50 **** } ! internal class PGFrontEndCodes { public const char BIND = 'B'; --- 46,50 ---- } ! internal class PgFrontEndCodes { public const char BIND = 'B'; *************** *** 62,66 **** } ! internal class PGErrorCodes { public const char SEVERITY = 'S'; --- 62,66 ---- } ! internal class PgErrorCodes { public const char SEVERITY = 'S'; *************** *** 77,81 **** } ! internal class PGCodes { // Protocol version 3.0 --- 77,81 ---- } ! internal class PgCodes { // Protocol version 3.0 Index: PGConnectionParams.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGConnectionParams.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGConnectionParams.cs 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGConnectionParams.cs 2 Aug 2003 19:13:49 -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 * *************** *** 20,26 **** using System.Text; ! namespace PostgreSql.Data.NPGClient { ! internal class PGConnectionParams { #region FIELDS --- 20,26 ---- using System.Text; ! namespace PostgreSql.Data.NPgClient { ! internal class PgConnectionParams { #region FIELDS *************** *** 98,102 **** #region CONSTRUCTORS ! public PGConnectionParams() { serverName = "localhost"; --- 98,102 ---- #region CONSTRUCTORS ! public PgConnectionParams() { serverName = "localhost"; Index: PGDbClient.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGDbClient.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PGDbClient.cs 1 Aug 2003 17:51:58 -0000 1.4 --- PGDbClient.cs 2 Aug 2003 19:13:49 -0000 1.5 *************** *** 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 * *************** *** 25,36 **** using System.Text; ! namespace PostgreSql.Data.NPGClient { ! internal class PGDbClient { #region EVENTS ! public event PGClientMessageEventHandler InfoMessage; ! public event PGClientNotificationEventHandler Notification; #endregion --- 25,36 ---- using System.Text; ! namespace PostgreSql.Data.NPgClient { ! internal class PgDbClient { #region EVENTS ! public event PgClientMessageEventHandler InfoMessage; ! public event PgClientNotificationEventHandler Notification; #endregion *************** *** 38,43 **** #region STATIC_FIELDS ! private static PGTypeCollection types; ! private static PGCharSetCollection charSets; #endregion --- 38,43 ---- #region STATIC_FIELDS ! private static PgTypeCollection types; ! private static PgCharSetCollection charSets; #endregion *************** *** 50,56 **** private Socket socket; private NetworkStream networkStream; ! private PGInetWriter send; ! private PGInetReader receive; ! private PGConnectionParams settings; private char transactionStatus; --- 50,56 ---- private Socket socket; private NetworkStream networkStream; ! private PgInetWriter send; ! private PgInetReader receive; ! private PgConnectionParams settings; private char transactionStatus; *************** *** 59,63 **** #region STATIC_PROPERTIES ! public static PGTypeCollection Types { get { return types; } --- 59,63 ---- #region STATIC_PROPERTIES ! public static PgTypeCollection Types { get { return types; } *************** *** 65,69 **** } ! public static PGCharSetCollection CharSets { get { return charSets; } --- 65,69 ---- } ! public static PgCharSetCollection CharSets { get { return charSets; } *************** *** 98,112 **** } ! public PGInetReader Receive { get { return receive; } } ! public PGInetWriter Send { get { return send; } } ! public PGConnectionParams Settings { get { return settings; } --- 98,112 ---- } ! public PgInetReader Receive { get { return receive; } } ! public PgInetWriter Send { get { return send; } } ! public PgConnectionParams Settings { get { return settings; } *************** *** 118,127 **** #region CONSTRUCTORS ! public PGDbClient() { parameterStatus = new Hashtable(); } ! public PGDbClient(PGConnectionParams settings) : this() { this.settings = settings; --- 118,127 ---- #region CONSTRUCTORS ! public PgDbClient() { parameterStatus = new Hashtable(); } ! public PgDbClient(PgConnectionParams settings) : this() { this.settings = settings; *************** *** 136,141 **** try { ! PGDbClient.InitializeTypes(); ! PGDbClient.InitializeCharSets(); InitializeSocket(); --- 136,141 ---- try { ! PgDbClient.InitializeTypes(); ! PgDbClient.InitializeCharSets(); InitializeSocket(); *************** *** 143,149 **** lock (this) { ! PGOutputPacket packet = new PGOutputPacket(4, settings.Encoding); ! packet.WriteInt(PGCodes.PROTOCOL_VERSION3); packet.WriteString("user"); packet.WriteString(settings.UserName); --- 143,149 ---- lock (this) { ! PgOutputPacket packet = new PgOutputPacket(4, settings.Encoding); ! packet.WriteInt(PgCodes.PROTOCOL_VERSION3); packet.WriteString("user"); packet.WriteString(settings.UserName); *************** *** 157,164 **** send.WriteSimplePacket(packet); ! PGResponsePacket response = new PGResponsePacket(); // Check if the is ready for Query ! while (response.Message != PGBackendCodes.READY_FOR_QUERY) { response = ReceiveResponsePacket(); --- 157,164 ---- send.WriteSimplePacket(packet); ! PgResponsePacket response = new PgResponsePacket(); // Check if the is ready for Query ! while (response.Message != PgBackendCodes.READY_FOR_QUERY) { response = ReceiveResponsePacket(); *************** *** 167,171 **** } } ! catch (PGClientException ex) { throw ex; --- 167,171 ---- } } ! catch (PgClientException ex) { throw ex; *************** *** 178,183 **** { // Send packet to the server ! PGOutputPacket packet = new PGOutputPacket(); ! send.WritePacket(PGFrontEndCodes.TERMINATE, packet); // Close all streams --- 178,183 ---- { // Send packet to the server ! PgOutputPacket packet = new PgOutputPacket(); ! send.WritePacket(PgFrontEndCodes.TERMINATE, packet); // Close all streams *************** *** 186,190 **** socket.Close(); } ! catch (PGClientException ex) { throw ex; --- 186,190 ---- socket.Close(); } ! catch (PgClientException ex) { throw ex; *************** *** 196,204 **** #region RESPONSE_METHODS ! public PGResponsePacket ReceiveResponsePacket() { char type; int length; ! PGResponsePacket responsePacket; lock (this) --- 196,204 ---- #region RESPONSE_METHODS ! public PgResponsePacket ReceiveResponsePacket() { char type; int length; ! PgResponsePacket responsePacket; lock (this) *************** *** 209,217 **** if (length != 0) { ! responsePacket = new PGResponsePacket(type, receive.ReadBytes(length)); } else { ! responsePacket = new PGResponsePacket(type, new byte[0]); } --- 209,217 ---- if (length != 0) { ! responsePacket = new PgResponsePacket(type, receive.ReadBytes(length)); } else { ! responsePacket = new PgResponsePacket(type, new byte[0]); } *************** *** 221,242 **** switch (type) { ! case PGBackendCodes.ERROR_RESPONSE: { // Read the error message and trow the exception ! PGClientException ex = processErrorPacket(responsePacket); throw ex; } ! case PGBackendCodes.NOTICE_RESPONSE: { // Read the notice message and raise an InfoMessage event ! PGClientException ex = processErrorPacket(responsePacket); ! this.InfoMessage(this, new PGClientMessageEventArgs(ex)); } break; ! case PGBackendCodes.NOTIFICATION_RESPONSE: { processNotificationResponse(responsePacket); --- 221,242 ---- switch (type) { ! case PgBackendCodes.ERROR_RESPONSE: { // Read the error message and trow the exception ! PgClientException ex = processErrorPacket(responsePacket); throw ex; } ! case PgBackendCodes.NOTICE_RESPONSE: { // Read the notice message and raise an InfoMessage event ! PgClientException ex = processErrorPacket(responsePacket); ! this.InfoMessage(this, new PgClientMessageEventArgs(ex)); } break; ! case PgBackendCodes.NOTIFICATION_RESPONSE: { processNotificationResponse(responsePacket); *************** *** 251,271 **** } ! private void processResponsePacket(PGResponsePacket packet) { switch (packet.Message) { ! case PGBackendCodes.AUTHENTICATION: processAuthPacket(packet); break; ! case PGBackendCodes.PARAMETER_STATUS: processParameterStatus(packet); break; ! case PGBackendCodes.READY_FOR_QUERY: transactionStatus = packet.ReadChar(); break; ! case PGBackendCodes.BACKEND_KEY_DATA: // BackendKeyData Handle = packet.ReadInt(); --- 251,271 ---- } ! private void processResponsePacket(PgResponsePacket packet) { switch (packet.Message) { ! case PgBackendCodes.AUTHENTICATION: processAuthPacket(packet); break; ! case PgBackendCodes.PARAMETER_STATUS: processParameterStatus(packet); break; ! case PgBackendCodes.READY_FOR_QUERY: transactionStatus = packet.ReadChar(); break; ! case PgBackendCodes.BACKEND_KEY_DATA: // BackendKeyData Handle = packet.ReadInt(); *************** *** 275,279 **** } ! private void processParameterStatus(PGResponsePacket packet) { string parameterName = packet.ReadNullString(); --- 275,279 ---- } ! private void processParameterStatus(PgResponsePacket packet) { string parameterName = packet.ReadNullString(); *************** *** 290,324 **** } ! private void processAuthPacket(PGResponsePacket packet) { // Authentication response int authType = packet.ReadInt(); ! PGOutputPacket outPacket = new PGOutputPacket(settings.Encoding); switch (authType) { ! case PGCodes.AUTH_OK: // Authentication successful return; ! case PGCodes.AUTH_KERBEROS_V4: // Kerberos V4 authentication is required break; ! case PGCodes.AUTH_KERBEROS_V5: // Kerberos V5 authentication is required break; ! case PGCodes.AUTH_CLEARTEXT_PASSWORD: // Cleartext password is required outPacket.WriteString(settings.UserPassword); break; ! case PGCodes.AUTH_CRYPT_PASSWORD: // crypt()-encrypted password is required break; ! case PGCodes.AUTH_MD5_PASSWORD: // MD5-encrypted password is required --- 290,324 ---- } ! private void processAuthPacket(PgResponsePacket packet) { // Authentication response int authType = packet.ReadInt(); ! PgOutputPacket outPacket = new PgOutputPacket(settings.Encoding); switch (authType) { ! case PgCodes.AUTH_OK: // Authentication successful return; ! case PgCodes.AUTH_KERBEROS_V4: // Kerberos V4 authentication is required break; ! case PgCodes.AUTH_KERBEROS_V5: // Kerberos V5 authentication is required break; ! case PgCodes.AUTH_CLEARTEXT_PASSWORD: // Cleartext password is required outPacket.WriteString(settings.UserPassword); break; ! case PgCodes.AUTH_CRYPT_PASSWORD: // crypt()-encrypted password is required break; ! case PgCodes.AUTH_MD5_PASSWORD: // MD5-encrypted password is required *************** *** 335,342 **** // Finally write the md5 hash to the packet ! outPacket.WriteString(PGCodes.MD5_PREFIX + hash); break; ! case PGCodes.AUTH_SCM_CREDENTIAL: // SCM credentials message is required break; --- 335,342 ---- // Finally write the md5 hash to the packet ! outPacket.WriteString(PgCodes.MD5_PREFIX + hash); break; ! case PgCodes.AUTH_SCM_CREDENTIAL: // SCM credentials message is required break; *************** *** 344,397 **** // Send the packet to the server ! send.WritePacket(PGFrontEndCodes.PASSWORD_MESSAGE, outPacket); } ! private PGClientException processErrorPacket(PGResponsePacket packet) { char type = ' '; ! PGClientError error = new PGClientError(); ! while (type != PGErrorCodes.END) { type = packet.ReadChar(); switch (type) { ! case PGErrorCodes.SEVERITY: error.Severity = packet.ReadNullString(); break; ! case PGErrorCodes.CODE: error.Code = packet.ReadNullString(); break; ! case PGErrorCodes.MESSAGE: error.Message = packet.ReadNullString(); break; ! case PGErrorCodes.DETAIL: error.Detail = packet.ReadNullString(); break; ! case PGErrorCodes.HINT: error.Hint = packet.ReadNullString(); break; ! case PGErrorCodes.POSITION: error.Position = packet.ReadNullString(); break; ! case PGErrorCodes.WHERE: error.Where = packet.ReadNullString(); break; ! case PGErrorCodes.FILE: error.File = packet.ReadNullString(); break; ! case PGErrorCodes.LINE: error.Line = Convert.ToInt32(packet.ReadNullString()); break; ! case PGErrorCodes.ROUTINE: error.Routine = packet.ReadNullString(); break; --- 344,397 ---- // Send the packet to the server ! send.WritePacket(PgFrontEndCodes.PASSWORD_MESSAGE, outPacket); } ! private PgClientException processErrorPacket(PgResponsePacket packet) { char type = ' '; ! PgClientError error = new PgClientError(); ! while (type != PgErrorCodes.END) { type = packet.ReadChar(); switch (type) { ! case PgErrorCodes.SEVERITY: error.Severity = packet.ReadNullString(); break; ! case PgErrorCodes.CODE: error.Code = packet.ReadNullString(); break; ! case PgErrorCodes.MESSAGE: error.Message = packet.ReadNullString(); break; ! case PgErrorCodes.DETAIL: error.Detail = packet.ReadNullString(); break; ! case PgErrorCodes.HINT: error.Hint = packet.ReadNullString(); break; ! case PgErrorCodes.POSITION: error.Position = packet.ReadNullString(); break; ! case PgErrorCodes.WHERE: error.Where = packet.ReadNullString(); break; ! case PgErrorCodes.FILE: error.File = packet.ReadNullString(); break; ! case PgErrorCodes.LINE: error.Line = Convert.ToInt32(packet.ReadNullString()); break; ! case PgErrorCodes.ROUTINE: error.Routine = packet.ReadNullString(); break; *************** *** 399,403 **** } ! PGClientException exception = new PGClientException(error.Message); exception.Errors.Add(error); --- 399,403 ---- } ! PgClientException exception = new PgClientException(error.Message); exception.Errors.Add(error); *************** *** 406,410 **** } ! private void processNotificationResponse(PGResponsePacket packet) { int processID = packet.ReadInt(); --- 406,410 ---- } ! private void processNotificationResponse(PgResponsePacket packet) { int processID = packet.ReadInt(); *************** *** 413,417 **** // Raise an event as an InfoMessage ! Notification(this, new PGClientNotificationEventArgs(processID, condition, additional)); } --- 413,417 ---- // Raise an event as an InfoMessage ! Notification(this, new PgClientNotificationEventArgs(processID, condition, additional)); } *************** *** 441,450 **** } ! PGStatement stmt = CreateStatement(sql); stmt.Query(); if (stmt.Tag != "START TRANSACTION") { ! throw new PGClientException("A transaction is currently active. Parallel transactions are not supported."); } --- 441,450 ---- } ! PgStatement stmt = CreateStatement(sql); stmt.Query(); if (stmt.Tag != "START TRANSACTION") { ! throw new PgClientException("A transaction is currently active. Parallel transactions are not supported."); } *************** *** 454,463 **** public void CommitTransaction() { ! PGStatement stmt = CreateStatement("COMMIT TRANSACTION"); stmt.Query(); if (stmt.Tag != "COMMIT") { ! throw new PGClientException("There are no transaction for commit."); } --- 454,463 ---- public void CommitTransaction() { ! PgStatement stmt = CreateStatement("COMMIT TRANSACTION"); stmt.Query(); if (stmt.Tag != "COMMIT") { ! throw new PgClientException("There are no transaction for commit."); } *************** *** 467,476 **** public void RollbackTransction() { ! PGStatement stmt = CreateStatement("ROLLBACK TRANSACTION"); stmt.Query(); if (stmt.Tag != "ROLLBACK") { ! throw new PGClientException("There are no transaction for rollback."); } --- 467,476 ---- public void RollbackTransction() { ! PgStatement stmt = CreateStatement("ROLLBACK TRANSACTION"); stmt.Query(); if (stmt.Tag != "ROLLBACK") { ! throw new PgClientException("There are no transaction for rollback."); } *************** *** 488,495 **** try { ! PGOutputPacket packet = new PGOutputPacket(Settings.Encoding); // Send packet to the server ! send.WritePacket(PGFrontEndCodes.FLUSH, packet); } catch (Exception ex) --- 488,495 ---- try { ! PgOutputPacket packet = new PgOutputPacket(Settings.Encoding); // Send packet to the server ! send.WritePacket(PgFrontEndCodes.FLUSH, packet); } catch (Exception ex) *************** *** 506,513 **** try { ! PGOutputPacket packet = new PGOutputPacket(Settings.Encoding); // Send packet to the server ! send.WritePacket(PGFrontEndCodes.SYNC, packet); } catch (Exception ex) --- 506,513 ---- try { ! PgOutputPacket packet = new PgOutputPacket(Settings.Encoding); // Send packet to the server ! send.WritePacket(PgFrontEndCodes.SYNC, packet); } catch (Exception ex) *************** *** 524,530 **** try { ! PGOutputPacket packet = new PGOutputPacket(0); ! packet.WriteInt(PGCodes.CANCEL_REQUEST); packet.WriteInt(Handle); packet.WriteInt(SecretKey); --- 524,530 ---- try { ! PgOutputPacket packet = new PgOutputPacket(0); ! packet.WriteInt(PgCodes.CANCEL_REQUEST); packet.WriteInt(Handle); packet.WriteInt(SecretKey); *************** *** 551,555 **** } ! types = new PGTypeCollection(); types.Add(-2 , "serial8" , DbType.Int64 , Type.GetType("System.Int64") , 0, 1, 8, false, true); --- 551,555 ---- } ! types = new PgTypeCollection(); types.Add(-2 , "serial8" , DbType.Int64 , Type.GetType("System.Int64") , 0, 1, 8, false, true); *************** *** 597,601 **** } ! charSets = new PGCharSetCollection(); charSets.Add("SQL_ASCII", "ascii"); // ASCII --- 597,601 ---- } ! charSets = new PgCharSetCollection(); charSets.Add("SQL_ASCII", "ascii"); // ASCII *************** *** 620,649 **** #region METHODS ! public void SendInfoMessage(PGClientException exception) { if (InfoMessage != null) { ! InfoMessage(this, new PGClientMessageEventArgs(exception)); } } ! public PGStatement CreateStatement() { ! return new PGStatement(this); } ! public PGStatement CreateStatement(string stmtText) { ! return new PGStatement(this, stmtText); } ! public PGStatement CreateStatement(string parseName, string portalName) { ! return new PGStatement(this, parseName, portalName); } ! public PGStatement CreateStatement(string parseName, string portalName, string stmtText) { ! return new PGStatement(this, parseName, portalName, stmtText); } --- 620,649 ---- #region METHODS ! public void SendInfoMessage(PgClientException exception) { if (InfoMessage != null) { ! InfoMessage(this, new PgClientMessageEventArgs(exception)); } } ! public PgStatement CreateStatement() { ! return new PgStatement(this); } ! public PgStatement CreateStatement(string stmtText) { ! return new PgStatement(this, stmtText); } ! public PgStatement CreateStatement(string parseName, string portalName) { ! return new PgStatement(this, parseName, portalName); } ! public PgStatement CreateStatement(string parseName, string portalName, string stmtText) { ! return new PgStatement(this, parseName, portalName, stmtText); } *************** *** 661,666 **** networkStream = new NetworkStream(socket, true); ! send = new PGInetWriter(new BufferedStream(networkStream)); ! receive = new PGInetReader(new BufferedStream(networkStream)); } --- 661,666 ---- networkStream = new NetworkStream(socket, true); ! send = new PgInetWriter(new BufferedStream(networkStream)); ! receive = new PgInetReader(new BufferedStream(networkStream)); } Index: PGDecodeType.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGDecodeType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGDecodeType.cs 17 Jul 2003 21:13:05 -0000 1.2 --- PGDecodeType.cs 2 Aug 2003 19:13:49 -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,25 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal class PGDecodeType { } --- 19,25 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal class PgDecodeType { } Index: PGEncodeType.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGEncodeType.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PGEncodeType.cs 17 Jul 2003 21:13:05 -0000 1.3 --- PGEncodeType.cs 2 Aug 2003 19:13:49 -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 * *************** *** 19,25 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal class PGEncodeType { } --- 19,25 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal class PgEncodeType { } Index: PGFieldDescriptor.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGFieldDescriptor.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGFieldDescriptor.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGFieldDescriptor.cs 2 Aug 2003 19:13:49 -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 * *************** *** 19,25 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal class PGFieldDescriptor { #region FIELDS --- 19,25 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal class PgFieldDescriptor { #region FIELDS *************** *** 28,32 **** private int oidTable; private short oidNumber; ! private PGType dataType; private short dataTypeSize; private int typeModifier; --- 28,32 ---- private int oidTable; private short oidNumber; ! private PgType dataType; private short dataTypeSize; private int typeModifier; *************** *** 55,59 **** } ! public PGType DataType { get { return dataType; } --- 55,59 ---- } ! public PgType DataType { get { return dataType; } *************** *** 83,87 **** #region CONSTRUCTORS ! public PGFieldDescriptor() { } --- 83,87 ---- #region CONSTRUCTORS ! public PgFieldDescriptor() { } Index: PGInetReader.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGInetReader.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGInetReader.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGInetReader.cs 2 Aug 2003 19:13:49 -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 * *************** *** 22,32 **** using System.Net; ! namespace PostgreSql.Data.NPGClient { ! internal class PGInetReader : BinaryReader { #region CONTRUCTORS ! public PGInetReader(Stream input) : base(input) { } --- 22,32 ---- using System.Net; ! namespace PostgreSql.Data.NPgClient { ! internal class PgInetReader : BinaryReader { #region CONTRUCTORS ! public PgInetReader(Stream input) : base(input) { } Index: PGInetWriter.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGInetWriter.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGInetWriter.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGInetWriter.cs 2 Aug 2003 19:13:49 -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 * *************** *** 22,32 **** using System.Net; ! namespace PostgreSql.Data.NPGClient { ! internal class PGInetWriter : BinaryWriter { #region CONSTRUCTORS ! public PGInetWriter(Stream output) : base(output) { } --- 22,32 ---- using System.Net; ! namespace PostgreSql.Data.NPgClient { ! internal class PgInetWriter : BinaryWriter { #region CONSTRUCTORS ! public PgInetWriter(Stream output) : base(output) { } *************** *** 36,40 **** #region METHODS ! public void WriteSimplePacket(PGOutputPacket packet) { // Write packet contents --- 36,40 ---- #region METHODS ! public void WriteSimplePacket(PgOutputPacket packet) { // Write packet contents *************** *** 46,50 **** } ! public void WritePacket(char format, PGOutputPacket packet) { // Update packet Length --- 46,50 ---- } ! public void WritePacket(char format, PgOutputPacket packet) { // Update packet Length Index: PGLayouts.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGLayouts.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGLayouts.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGLayouts.cs 2 Aug 2003 19:13:49 -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 * *************** *** 20,24 **** using System.Runtime.InteropServices; ! namespace PostgreSql.Data.NPGClient { [StructLayout(LayoutKind.Explicit)] --- 20,24 ---- using System.Runtime.InteropServices; ! namespace PostgreSql.Data.NPgClient { [StructLayout(LayoutKind.Explicit)] Index: PGOutputPacket.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGOutputPacket.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PGOutputPacket.cs 20 Jul 2003 09:59:28 -0000 1.4 --- PGOutputPacket.cs 2 Aug 2003 19:13:49 -0000 1.5 *************** *** 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 * *************** *** 24,30 **** using System.Globalization; ! namespace PostgreSql.Data.NPGClient { ! internal class PGOutputPacket : BinaryWriter { #region FIELDS --- 24,30 ---- using System.Globalization; ! namespace PostgreSql.Data.NPgClient { ! internal class PgOutputPacket : BinaryWriter { #region FIELDS *************** *** 46,50 **** #region CONSTRUCTORS ! public PGOutputPacket() : base(new MemoryStream()) { this.encoding = Encoding.Default; --- 46,50 ---- #region CONSTRUCTORS ! public PgOutputPacket() : base(new MemoryStream()) { this.encoding = Encoding.Default; *************** *** 52,56 **** } ! public PGOutputPacket(Encoding encoding) : base(new MemoryStream(), encoding) { this.encoding = encoding; --- 52,56 ---- } ! public PgOutputPacket(Encoding encoding) : base(new MemoryStream(), encoding) { this.encoding = encoding; *************** *** 58,62 **** } ! public PGOutputPacket(int length) : base(new MemoryStream()) { this.encoding = Encoding.Default; --- 58,62 ---- } ! public PgOutputPacket(int length) : base(new MemoryStream()) { this.encoding = Encoding.Default; *************** *** 64,68 **** } ! public PGOutputPacket(int length, Encoding encoding) : base(new MemoryStream(), encoding) { this.encoding = encoding; --- 64,68 ---- } ! public PgOutputPacket(int length, Encoding encoding) : base(new MemoryStream(), encoding) { this.encoding = encoding; *************** *** 77,81 **** { Write(data.ToCharArray()); ! Write(PGCodes.NULL_TERMINATOR); } --- 77,81 ---- { Write(data.ToCharArray()); ! Write(PgCodes.NULL_TERMINATOR); } *************** *** 123,127 **** public void WriteDate(DateTime date) { ! TimeSpan days = date.Subtract(PGCodes.BASE_DATE); WriteInt(days.Days); --- 123,127 ---- public void WriteDate(DateTime date) { ! TimeSpan days = date.Subtract(PgCodes.BASE_DATE); WriteInt(days.Days); *************** *** 130,134 **** public void WriteTimestamp(DateTime timestamp) { ! TimeSpan days = timestamp.Subtract(PGCodes.BASE_DATE); WriteDouble(days.TotalSeconds); --- 130,134 ---- public void WriteTimestamp(DateTime timestamp) { ! TimeSpan days = timestamp.Subtract(PgCodes.BASE_DATE); WriteDouble(days.TotalSeconds); *************** *** 137,143 **** public void WriteTime(DateTime time) { ! DateTime realTime = new DateTime(PGCodes.BASE_DATE.Year, ! PGCodes.BASE_DATE.Month, ! PGCodes.BASE_DATE.Day, time.Hour, time.Minute, --- 137,143 ---- public void WriteTime(DateTime time) { ! DateTime realTime = new DateTime(PgCodes.BASE_DATE.Year, ! PgCodes.BASE_DATE.Month, ! PgCodes.BASE_DATE.Day, time.Hour, time.Minute, *************** *** 145,154 **** time.Millisecond); ! TimeSpan seconds = realTime.Subtract(PGCodes.BASE_DATE); WriteDouble(seconds.TotalSeconds); } ! public void WriteParameter(PGParameter parameter) { int size = parameter.DataType.Size; --- 145,154 ---- time.Millisecond); ! TimeSpan seconds = realTime.Subtract(PgCodes.BASE_DATE); WriteDouble(seconds.TotalSeconds); } ! public void WriteParameter(PgParameter parameter) { int size = parameter.DataType.Size; *************** *** 234,238 **** { string paramValue = parameter.Value.ToString(); ! WriteInt(encoding.GetByteCount(paramValue + PGCodes.NULL_TERMINATOR)); WriteString(paramValue); } --- 234,238 ---- { string paramValue = parameter.Value.ToString(); ! WriteInt(encoding.GetByteCount(paramValue + PgCodes.NULL_TERMINATOR)); WriteString(paramValue); } Index: PGParameter.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGParameter.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGParameter.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGParameter.cs 2 Aug 2003 19:13:49 -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 * *************** *** 19,29 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal class PGParameter { #region FIELDS ! private PGType dataType; private object data; --- 19,29 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal class PgParameter { #region FIELDS ! private PgType dataType; private object data; *************** *** 32,36 **** #region PARAMETERS ! public PGType DataType { get { return dataType; } --- 32,36 ---- #region PARAMETERS ! public PgType DataType { get { return dataType; } *************** *** 48,61 **** #region CONSTRUCTORS ! public PGParameter() { } ! public PGParameter(int dataType) { ! this.dataType = PGDbClient.Types[dataType]; } ! public PGParameter(int dataType, object data) : this(dataType) { this.data = data; --- 48,61 ---- #region CONSTRUCTORS ! public PgParameter() { } ! public PgParameter(int dataType) { ! this.dataType = PgDbClient.Types[dataType]; } ! public PgParameter(int dataType, object data) : this(dataType) { this.data = data; Index: PGResponsePacket.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGResponsePacket.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PGResponsePacket.cs 20 Jul 2003 09:59:28 -0000 1.5 --- PGResponsePacket.cs 2 Aug 2003 19:13:49 -0000 1.6 *************** *** 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 * *************** *** 24,30 **** using System.Net; ! namespace PostgreSql.Data.NPGClient { ! internal class PGResponsePacket : BinaryReader { #region FIELDS --- 24,30 ---- using System.Net; ! namespace PostgreSql.Data.NPgClient { ! internal class PgResponsePacket : BinaryReader { #region FIELDS *************** *** 53,61 **** #region CONSTRUCTORS ! public PGResponsePacket() : base(new MemoryStream()) { } ! public PGResponsePacket(char message, byte[] contents) : base(new MemoryStream(contents)) { this.message = message; --- 53,61 ---- #region CONSTRUCTORS ! public PgResponsePacket() : base(new MemoryStream()) { } ! public PgResponsePacket(char message, byte[] contents) : base(new MemoryStream(contents)) { this.message = message; *************** *** 71,75 **** char c; ! while ((c = ReadChar()) != PGCodes.NULL_TERMINATOR ) { cString.Append(c); --- 71,75 ---- char c; ! while ((c = ReadChar()) != PgCodes.NULL_TERMINATOR ) { cString.Append(c); *************** *** 162,166 **** DateTime date = new DateTime(days); ! return PGCodes.BASE_DATE.AddDays(days); } --- 162,166 ---- DateTime date = new DateTime(days); ! return PgCodes.BASE_DATE.AddDays(days); } *************** *** 169,173 **** double seconds = ReadDouble(); ! return PGCodes.BASE_DATE.AddSeconds(seconds); } --- 169,173 ---- double seconds = ReadDouble(); ! return PgCodes.BASE_DATE.AddSeconds(seconds); } *************** *** 176,185 **** double seconds = ReadDouble(); ! return PGCodes.BASE_DATE.AddSeconds(seconds); } ! public Array ReadPrimitiveArray(PGType type, int length) { ! PGType elementType = type; Array data = null; --- 176,185 ---- double seconds = ReadDouble(); ! return PgCodes.BASE_DATE.AddSeconds(seconds); } ! public Array ReadPrimitiveArray(PgType type, int length) { ! PgType elementType = type; Array data = null; *************** *** 197,201 **** throw new NotSupportedException("Invalid flags value"); } ! elementType = PGDbClient.Types[ReadInt()]; for (int i = 0; i < ndims; i++) { --- 197,201 ---- throw new NotSupportedException("Invalid flags value"); } ! elementType = PgDbClient.Types[ReadInt()]; for (int i = 0; i < ndims; i++) { *************** *** 213,219 **** } ! public Array ReadStringArray(PGType type, int length) { ! PGType elementType = PGDbClient.Types[type.ArrayType]; Array data = null; --- 213,219 ---- } ! public Array ReadStringArray(PgType type, int length) { ! PgType elementType = PgDbClient.Types[type.ArrayType]; Array data = null; *************** *** 233,242 **** } ! public Array ReadVector(PGType type, int length) { ! PGType elementType = PGDbClient.Types[type.ArrayType]; Array data = null; ! data = Array.CreateInstance(elementType.SystemType, PGCodes.INDEX_MAX_KEYS); for (int i = 0; i < data.Length; i++ ) --- 233,242 ---- } ! public Array ReadVector(PgType type, int length) { ! PgType elementType = PgDbClient.Types[type.ArrayType]; Array data = null; ! data = Array.CreateInstance(elementType.SystemType, PgCodes.INDEX_MAX_KEYS); for (int i = 0; i < data.Length; i++ ) *************** *** 249,253 **** } ! public object ReadValue(PGType type, int length) { switch (type.DbType) --- 249,253 ---- } ! public object ReadValue(PgType type, int length) { switch (type.DbType) *************** *** 340,344 **** #region PRIVATE_METHODS ! private byte[] decodeArrayData(PGType type, int elementCount, int length) { byte[] data = new byte[length]; --- 340,344 ---- #region PRIVATE_METHODS ! private byte[] decodeArrayData(PgType type, int elementCount, int length) { byte[] data = new byte[length]; Index: PGRowDescriptor.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGRowDescriptor.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGRowDescriptor.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGRowDescriptor.cs 2 Aug 2003 19:13:49 -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 * *************** *** 19,29 **** using System; ! namespace PostgreSql.Data.NPGClient { ! internal class PGRowDescriptor { #region FIELDS ! private PGFieldDescriptor[] fields; #endregion --- 19,29 ---- using System; ! namespace PostgreSql.Data.NPgClient { ! internal class PgRowDescriptor { #region FIELDS ! private PgFieldDescriptor[] fields; #endregion *************** *** 31,35 **** #region PROPERTIES ! public PGFieldDescriptor[] Fields { get { return fields; } --- 31,35 ---- #region PROPERTIES ! public PgFieldDescriptor[] Fields { get { return fields; } *************** *** 41,51 **** #region CONSTRUCTORS ! public PGRowDescriptor() { } ! public PGRowDescriptor(int count) { ! fields = new PGFieldDescriptor[count]; } --- 41,51 ---- #region CONSTRUCTORS ! public PgRowDescriptor() { } ! public PgRowDescriptor(int count) { ! fields = new PgFieldDescriptor[count]; } Index: PGStatement.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGStatement.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGStatement.cs 1 Aug 2003 17:51:58 -0000 1.2 --- PGStatement.cs 2 Aug 2003 19:13:49 -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 * *************** *** 22,30 **** using System.Collections; ! namespace PostgreSql.Data.NPGClient { #region ENUMS ! internal enum PGStatementStatus { Initial, --- 22,30 ---- using System.Collections; ! namespace PostgreSql.Data.NPgClient { #region ENUMS ! internal enum PgStatementStatus { I... [truncated message content] |
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] |
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv1215 Modified Files: AssemblyInfo.cs PGCommand.cs PGCommandBuilder.cs PGConnection.cs PGConnectionPool.cs PGDataAdapter.cs PGDataReader.cs PGDbConnection.cs PGDbSchemaType.cs PGDbType.cs PGError.cs PGErrorCollection.cs PGException.cs PGInfoMessageEventArgs.cs PGNotificationEventArgs.cs PGParameter.cs PGParameterCollection.cs PGRowUpdatedEventArgs.cs PGRowUpdatingEventArgs.cs PGTransaction.cs Log Message: * Changed casing of all classes from PGXXX to PgXXX to follow MS guidelines. Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/AssemblyInfo.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AssemblyInfo.cs 12 Jul 2003 08:11:20 -0000 1.1.1.1 --- AssemblyInfo.cs 2 Aug 2003 19:13:09 -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 * *************** *** 26,30 **** [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] ! [assembly: AssemblyProduct("PGSqlClient - ADO.NET Data provider for PostgreSQL 7.4+")] [assembly: AssemblyCopyright("2003 - Carlos Guzmán Álvarez")] [assembly: AssemblyTrademark("")] --- 26,30 ---- [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] ! [assembly: AssemblyProduct("PgSqlClient - ADO.NET Data provider for PostgreSQL 7.4+")] [assembly: AssemblyCopyright("2003 - Carlos Guzmán Álvarez")] [assembly: AssemblyTrademark("")] *************** *** 32,36 **** [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyDelaySign(false)] ! [assembly: AssemblyKeyFile("PostgreSql.Data.PGSqlClient.snk")] [assembly: AssemblyKeyName("")] [assembly: CLSCompliant(true)] --- 32,36 ---- [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyDelaySign(false)] ! [assembly: AssemblyKeyFile("PostgreSql.Data.PgSqlClient.snk")] [assembly: AssemblyKeyName("")] [assembly: CLSCompliant(true)] Index: PGCommand.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGCommand.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PGCommand.cs 31 Jul 2003 10:54:40 -0000 1.7 --- PGCommand.cs 2 Aug 2003 19:13:09 -0000 1.8 *************** *** 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 * *************** *** 24,39 **** using System.Text.RegularExpressions; ! using PostgreSql.Data.NPGClient; ! namespace PostgreSql.Data.PGSqlClient { ! [ToolboxBitmap(typeof(PGCommand), "Resources.ToolBox.PGCommand.bmp")] ! public sealed class PGCommand : Component, IDbCommand, ICloneable { #region FIELDS ! private PGConnection connection; ! private PGTransaction transaction; ! private PGParameterCollection parameters; private UpdateRowSource updatedRowSource; private CommandBehavior commandBehavior; --- 24,39 ---- using System.Text.RegularExpressions; ! using PostgreSql.Data.NPgClient; ! namespace PostgreSql.Data.PgSqlClient { ! [ToolboxBitmap(typeof(PgCommand), "Resources.ToolBox.PgCommand.bmp")] ! public sealed class PgCommand : Component, IDbCommand, ICloneable { #region FIELDS ! private PgConnection connection; ! private PgTransaction transaction; ! private PgParameterCollection parameters; private UpdateRowSource updatedRowSource; private CommandBehavior commandBehavior; *************** *** 46,50 **** private MatchCollection namedParameters; ! private PGStatement statement; #endregion --- 46,50 ---- private MatchCollection namedParameters; ! private PgStatement statement; #endregion *************** *** 99,107 **** { get { return Connection; } ! set { Connection = (PGConnection)value; } } [Category("Behavior"), DefaultValue(null)] ! public PGConnection Connection { get { return connection; } --- 99,107 ---- { get { return Connection; } ! set { Connection = (PgConnection)value; } } [Category("Behavior"), DefaultValue(null)] ! public PgConnection Connection { get { return connection; } *************** *** 142,146 **** [Category("Data"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] ! public PGParameterCollection Parameters { get { return parameters; } --- 142,146 ---- [Category("Data"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] ! public PgParameterCollection Parameters { get { return parameters; } *************** *** 150,154 **** { get { return Transaction; } ! set { Transaction = (PGTransaction)value; } } --- 150,154 ---- { get { return Transaction; } ! set { Transaction = (PgTransaction)value; } } *************** *** 156,160 **** DataSysDescription("Tansaction context used by the command."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] ! public PGTransaction Transaction { get { return transaction; } --- 156,160 ---- DataSysDescription("Tansaction context used by the command."), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] ! public PgTransaction Transaction { get { return transaction; } *************** *** 184,188 **** } ! internal PGStatement Statement { get { return statement; } --- 184,188 ---- } ! internal PgStatement Statement { get { return statement; } *************** *** 198,202 **** #region CONSTRUCTORS ! public PGCommand() { commandText = String.Empty; --- 198,202 ---- #region CONSTRUCTORS ! public PgCommand() { commandText = String.Empty; *************** *** 206,222 **** commandBehavior = CommandBehavior.Default; designTimeVisible = true; ! parameters = new PGParameterCollection(); search = new Regex("(@([a-zA-Z-$][a-zA-Z0-9_$]*))"); } ! public PGCommand(string cmdText) : this(cmdText, null, null) { } ! public PGCommand(string cmdText, PGConnection connection) : this(cmdText, connection, null) { } ! public PGCommand(string cmdText, PGConnection connection, PGTransaction transaction) : this() { CommandText = cmdText; --- 206,222 ---- commandBehavior = CommandBehavior.Default; designTimeVisible = true; ! parameters = new PgParameterCollection(); search = new Regex("(@([a-zA-Z-$][a-zA-Z0-9_$]*))"); } ! public PgCommand(string cmdText) : this(cmdText, null, null) { } ! public PgCommand(string cmdText, PgConnection connection) : this(cmdText, connection, null) { } ! public PgCommand(string cmdText, PgConnection connection, PgTransaction transaction) : this() { CommandText = cmdText; *************** *** 268,272 **** object ICloneable.Clone() { ! PGCommand command = new PGCommand(CommandText, Connection, Transaction); command.CommandType = commandType; --- 268,272 ---- object ICloneable.Clone() { ! PgCommand command = new PgCommand(CommandText, Connection, Transaction); command.CommandType = commandType; *************** *** 288,294 **** } ! public PGParameter CreateParameter() { ! return new PGParameter(); } --- 288,294 ---- } ! public PgParameter CreateParameter() { ! return new PgParameter(); } *************** *** 332,341 **** } ! public PGDataReader ExecuteReader() { return ExecuteReader(CommandBehavior.Default); } ! public PGDataReader ExecuteReader(CommandBehavior behavior) { if (Connection == null || Connection.State != ConnectionState.Open) --- 332,341 ---- } ! public PgDataReader ExecuteReader() { return ExecuteReader(CommandBehavior.Default); } ! public PgDataReader ExecuteReader(CommandBehavior behavior) { if (Connection == null || Connection.State != ConnectionState.Open) *************** *** 370,374 **** } ! return new PGDataReader(this); } --- 370,374 ---- } ! return new PgDataReader(this); } *************** *** 442,448 **** } } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } --- 442,448 ---- } } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } *************** *** 458,463 **** try { ! if (statement == null || statement.Status == PGStatementStatus.Initial || ! statement.Status == PGStatementStatus.Error) { if (commandType == CommandType.StoredProcedure && --- 458,463 ---- try { ! if (statement == null || statement.Status == PgStatementStatus.Initial || ! statement.Status == PgStatementStatus.Error) { if (commandType == CommandType.StoredProcedure && *************** *** 493,499 **** } } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 493,499 ---- } } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 515,521 **** statement.Execute(); } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 515,521 ---- statement.Execute(); } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 528,534 **** statement.Query(); } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 528,534 ---- statement.Query(); } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 544,550 **** statement = null; } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 544,550 ---- statement = null; } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 569,576 **** while (paramEnumerator.MoveNext()) { ! if (((PGParameter)paramEnumerator.Current).Direction == ParameterDirection.Output || ! ((PGParameter)paramEnumerator.Current).Direction == ParameterDirection.ReturnValue) { ! ((PGParameter)paramEnumerator.Current).Value = values[i]; i++; } --- 569,576 ---- while (paramEnumerator.MoveNext()) { ! if (((PgParameter)paramEnumerator.Current).Direction == ParameterDirection.Output || ! ((PgParameter)paramEnumerator.Current).Direction == ParameterDirection.ReturnValue) { ! ((PgParameter)paramEnumerator.Current).Value = values[i]; i++; } Index: PGCommandBuilder.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGCommandBuilder.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PGCommandBuilder.cs 30 Jul 2003 18:54:56 -0000 1.6 --- PGCommandBuilder.cs 2 Aug 2003 19:13:09 -0000 1.7 *************** *** 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,41 **** using System.ComponentModel; ! using PostgreSql.Data.NPGClient; ! namespace PostgreSql.Data.PGSqlClient { ! public sealed class PGCommandBuilder : Component { #region FIELDS ! private PGDataAdapter dataAdapter; private string sqlInsert; private string sqlUpdate; private string sqlDelete; ! private PGCommand insertCommand; ! private PGCommand updateCommand; ! private PGCommand deleteCommand; private string whereClausule; private string setClausule; --- 23,41 ---- using System.ComponentModel; ! using PostgreSql.Data.NPgClient; ! namespace PostgreSql.Data.PgSqlClient { ! public sealed class PgCommandBuilder : Component { #region FIELDS ! private PgDataAdapter dataAdapter; private string sqlInsert; private string sqlUpdate; private string sqlDelete; ! private PgCommand insertCommand; ! private PgCommand updateCommand; ! private PgCommand deleteCommand; private string whereClausule; private string setClausule; *************** *** 53,57 **** [DefaultValue(null)] ! public PGDataAdapter DataAdapter { get { return dataAdapter; } --- 53,57 ---- [DefaultValue(null)] ! public PgDataAdapter DataAdapter { get { return dataAdapter; } *************** *** 61,68 **** // Registers the CommandBuilder as a listener for RowUpdating events that are ! // generated by the PGDataAdapter specified in this property. if (dataAdapter != null) { ! dataAdapter.RowUpdating += new PGRowUpdatingEventHandler(rowUpdatingHandler); } } --- 61,68 ---- // Registers the CommandBuilder as a listener for RowUpdating events that are ! // generated by the PgDataAdapter specified in this property. if (dataAdapter != null) { ! dataAdapter.RowUpdating += new PgRowUpdatingEventHandler(rowUpdatingHandler); } } *************** *** 101,105 **** } ! private PGCommand selectCommand { get --- 101,105 ---- } ! private PgCommand selectCommand { get *************** *** 118,122 **** #region CONSTRUCTORS ! public PGCommandBuilder() { sqlInsert = "INSERT INTO {0} ({1}) VALUES ({2})"; --- 118,122 ---- #region CONSTRUCTORS ! public PgCommandBuilder() { sqlInsert = "INSERT INTO {0} ({1}) VALUES ({2})"; *************** *** 129,133 **** } ! public PGCommandBuilder(PGDataAdapter adapter) : this() { this.DataAdapter = adapter; --- 129,133 ---- } ! public PgCommandBuilder(PgDataAdapter adapter) : this() { this.DataAdapter = adapter; *************** *** 138,142 **** #region DESTRUCTORS ! ~PGCommandBuilder() { Dispose(false); --- 138,142 ---- #region DESTRUCTORS ! ~PgCommandBuilder() { Dispose(false); *************** *** 184,188 **** #region STATIC_METHODS ! public static void DeriveParameters(PGCommand command) { if (command.CommandType != CommandType.StoredProcedure) --- 184,188 ---- #region STATIC_METHODS ! public static void DeriveParameters(PgCommand command) { if (command.CommandType != CommandType.StoredProcedure) *************** *** 201,207 **** for (int i = 0; i < command.Statement.Parameters.Length; i++) { ! PGType type = command.Statement.Parameters[i].DataType; ! PGParameter parameter = new PGParameter(); parameter.ParameterName = "@ip" + i.ToString(); parameter.DbType = type.DbType; --- 201,207 ---- for (int i = 0; i < command.Statement.Parameters.Length; i++) { ! PgType type = command.Statement.Parameters[i].DataType; ! PgParameter parameter = new PgParameter(); parameter.ParameterName = "@ip" + i.ToString(); parameter.DbType = type.DbType; *************** *** 218,224 **** for (int i = 0; i < command.Statement.RowDescriptor.Fields.Length; i++) { ! PGType type = command.Statement.RowDescriptor.Fields[i].DataType; ! PGParameter parameter = new PGParameter(); parameter.ParameterName = "@ip" + i.ToString(); parameter.DbType = type.DbType; --- 218,224 ---- for (int i = 0; i < command.Statement.RowDescriptor.Fields.Length; i++) { ! PgType type = command.Statement.RowDescriptor.Fields[i].DataType; ! PgParameter parameter = new PgParameter(); parameter.ParameterName = "@ip" + i.ToString(); parameter.DbType = type.DbType; *************** *** 235,239 **** #region METHODS ! public PGCommand GetInsertCommand() { if (insertCommand == null) --- 235,239 ---- #region METHODS ! public PgCommand GetInsertCommand() { if (insertCommand == null) *************** *** 246,250 **** } ! public PGCommand GetUpdateCommand() { if (updateCommand == null) --- 246,250 ---- } ! public PgCommand GetUpdateCommand() { if (updateCommand == null) *************** *** 257,261 **** } ! public PGCommand GetDeleteCommand() { if (deleteCommand == null) --- 257,261 ---- } ! public PgCommand GetDeleteCommand() { if (deleteCommand == null) *************** *** 280,284 **** #region BUILD_COMMAND_METHODS ! private PGCommand buildInsertCommand(DataRow row, DataTableMapping tableMapping) { StringBuilder sql = new StringBuilder(); --- 280,284 ---- #region BUILD_COMMAND_METHODS ! private PgCommand buildInsertCommand(DataRow row, DataTableMapping tableMapping) { StringBuilder sql = new StringBuilder(); *************** *** 287,291 **** string dsColumnName = String.Empty; ! insertCommand = new PGCommand(sql.ToString(), selectCommand.Connection, selectCommand.Transaction); int i = 0; --- 287,291 ---- string dsColumnName = String.Empty; ! insertCommand = new PgCommand(sql.ToString(), selectCommand.Connection, selectCommand.Transaction); int i = 0; *************** *** 309,313 **** values.Append("@param_" + i.ToString()); ! PGParameter parameter = createParameter(schemaRow, i, false); if (tableMapping != null) --- 309,313 ---- values.Append("@param_" + i.ToString()); ! PgParameter parameter = createParameter(schemaRow, i, false); if (tableMapping != null) *************** *** 348,352 **** } ! private PGCommand buildUpdateCommand(DataRow row, DataTableMapping tableMapping) { StringBuilder sql = new StringBuilder(); --- 348,352 ---- } ! private PgCommand buildUpdateCommand(DataRow row, DataTableMapping tableMapping) { StringBuilder sql = new StringBuilder(); *************** *** 360,364 **** } ! updateCommand = new PGCommand(sql.ToString(), selectCommand.Connection, selectCommand.Transaction); int i = 0; --- 360,364 ---- } ! updateCommand = new PgCommand(sql.ToString(), selectCommand.Connection, selectCommand.Transaction); int i = 0; *************** *** 377,381 **** "@param_" + i.ToString()); ! PGParameter parameter = createParameter(schemaRow, i, false); if (tableMapping != null) --- 377,381 ---- "@param_" + i.ToString()); ! PgParameter parameter = createParameter(schemaRow, i, false); if (tableMapping != null) *************** *** 420,424 **** "@param_" + i.ToString()); ! PGParameter parameter = createParameter(schemaRow, i, true); if (tableMapping != null) --- 420,424 ---- "@param_" + i.ToString()); ! PgParameter parameter = createParameter(schemaRow, i, true); if (tableMapping != null) *************** *** 459,463 **** } ! private PGCommand buildDeleteCommand(DataRow row, DataTableMapping tableMapping) { StringBuilder sql = new StringBuilder(); --- 459,463 ---- } ! private PgCommand buildDeleteCommand(DataRow row, DataTableMapping tableMapping) { StringBuilder sql = new StringBuilder(); *************** *** 470,474 **** } ! deleteCommand = new PGCommand(sql.ToString(), selectCommand.Connection, selectCommand.Transaction); // Build where clausule --- 470,474 ---- } ! deleteCommand = new PgCommand(sql.ToString(), selectCommand.Connection, selectCommand.Transaction); // Build where clausule *************** *** 487,491 **** "@param_" + i.ToString()); ! PGParameter parameter = createParameter(schemaRow, i, true); if (tableMapping != null) --- 487,491 ---- "@param_" + i.ToString()); ! PgParameter parameter = createParameter(schemaRow, i, true); if (tableMapping != null) *************** *** 526,532 **** } ! private PGParameter createParameter(DataRow schemaRow, int index, bool isWhereParameter) { ! PGParameter parameter = new PGParameter(String.Format("@param_{0}", index), (PGDbType)schemaRow["ProviderType"]); parameter.Size = Convert.ToInt32(schemaRow["ColumnSize"]); --- 526,532 ---- } ! private PgParameter createParameter(DataRow schemaRow, int index, bool isWhereParameter) { ! PgParameter parameter = new PgParameter(String.Format("@param_{0}", index), (PgDbType)schemaRow["ProviderType"]); parameter.Size = Convert.ToInt32(schemaRow["ColumnSize"]); *************** *** 625,629 **** if (schemaTable == null) { ! PGDataReader reader = selectCommand.ExecuteReader(CommandBehavior.SchemaOnly); schemaTable = reader.GetSchemaTable(); reader.Close(); --- 625,629 ---- if (schemaTable == null) { ! PgDataReader reader = selectCommand.ExecuteReader(CommandBehavior.SchemaOnly); schemaTable = reader.GetSchemaTable(); reader.Close(); *************** *** 670,674 **** #region EVENT_HANDLER ! private void rowUpdatingHandler(object sender, PGRowUpdatingEventArgs e) { if (e.Status != UpdateStatus.Continue) --- 670,674 ---- #region EVENT_HANDLER ! private void rowUpdatingHandler(object sender, PgRowUpdatingEventArgs e) { if (e.Status != UpdateStatus.Continue) Index: PGConnection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGConnection.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PGConnection.cs 1 Aug 2003 17:51:19 -0000 1.6 --- PGConnection.cs 2 Aug 2003 19:13:09 -0000 1.7 *************** *** 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,40 **** using System.Collections; using System.ComponentModel; ! using PostgreSql.Data.NPGClient; ! using PostgreSql.Data.PGSqlClient.DbSchema; ! namespace PostgreSql.Data.PGSqlClient { ! [ToolboxBitmap(typeof(PGConnection), "Resources.ToolBox.PGConnection.bmp")] [DefaultEvent("InfoMessage")] ! public sealed class PGConnection : Component, IDbConnection, ICloneable { #region EVENTS public event StateChangeEventHandler StateChange; ! public event PGInfoMessageEventHandler InfoMessage; ! public event PGNotificationEventHandler Notification; #endregion --- 23,40 ---- using System.Collections; using System.ComponentModel; ! using PostgreSql.Data.NPgClient; ! using PostgreSql.Data.PgSqlClient.DbSchema; ! namespace PostgreSql.Data.PgSqlClient { ! [ToolboxBitmap(typeof(PgConnection), "Resources.ToolBox.PgConnection.bmp")] [DefaultEvent("InfoMessage")] ! public sealed class PgConnection : Component, IDbConnection, ICloneable { #region EVENTS public event StateChangeEventHandler StateChange; ! public event PgInfoMessageEventHandler InfoMessage; ! public event PgNotificationEventHandler Notification; #endregion *************** *** 42,55 **** #region FIELDS ! private PGDbConnection dbConnection; private ConnectionState state; private bool disposed; private string connectionString; ! private PGDataReader dataReader; ! private PGTransaction activeTxn; private ArrayList activeCommands; ! private PGClientMessageEventHandler infoMessageHandler; ! private PGClientNotificationEventHandler notificationHandler; #endregion --- 42,55 ---- #region FIELDS ! private PgDbConnection dbConnection; private ConnectionState state; private bool disposed; private string connectionString; ! private PgDataReader dataReader; ! private PgTransaction activeTxn; private ArrayList activeCommands; ! private PgClientMessageEventHandler infoMessageHandler; ! private PgClientNotificationEventHandler notificationHandler; #endregion *************** *** 69,73 **** if (state == ConnectionState.Closed) { ! PGDbConnection tmpConn = new PGDbConnection(value); connectionString = value; tmpConn = null; --- 69,73 ---- if (state == ConnectionState.Closed) { ! PgDbConnection tmpConn = new PgDbConnection(value); connectionString = value; tmpConn = null; *************** *** 168,172 **** } ! internal PGDataReader DataReader { get { return dataReader; } --- 168,172 ---- } ! internal PgDataReader DataReader { get { return dataReader; } *************** *** 174,178 **** } ! internal PGDbConnection DbConnection { get { return dbConnection; } --- 174,178 ---- } ! internal PgDbConnection DbConnection { get { return dbConnection; } *************** *** 184,188 **** #region CONSTRUCTORS ! public PGConnection() { state = ConnectionState.Closed; --- 184,188 ---- #region CONSTRUCTORS ! public PgConnection() { state = ConnectionState.Closed; *************** *** 190,194 **** } ! public PGConnection(string connString) : this() { this.ConnectionString = connString; --- 190,194 ---- } ! public PgConnection(string connString) : this() { this.ConnectionString = connString; *************** *** 236,240 **** object ICloneable.Clone() { ! return new PGConnection(ConnectionString); } --- 236,240 ---- object ICloneable.Clone() { ! return new PgConnection(ConnectionString); } *************** *** 253,257 **** } ! public PGTransaction BeginTransaction() { if (state == ConnectionState.Closed) --- 253,257 ---- } ! public PgTransaction BeginTransaction() { if (state == ConnectionState.Closed) *************** *** 272,281 **** try { ! activeTxn = new PGTransaction(this); activeTxn.InternalBeginTransaction(); } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } --- 272,281 ---- try { ! activeTxn = new PgTransaction(this); activeTxn.InternalBeginTransaction(); } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } *************** *** 283,287 **** } ! public PGTransaction BeginTransaction(IsolationLevel level) { if (state == ConnectionState.Closed) --- 283,287 ---- } ! public PgTransaction BeginTransaction(IsolationLevel level) { if (state == ConnectionState.Closed) *************** *** 302,311 **** try { ! activeTxn = new PGTransaction(this, level); activeTxn.InternalBeginTransaction(); } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } --- 302,311 ---- try { ! activeTxn = new PgTransaction(this, level); activeTxn.InternalBeginTransaction(); } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } *************** *** 343,347 **** this.Open(); } ! catch (PGException ex) { this.dbConnection.Settings.Database = oldDb; --- 343,347 ---- this.Open(); } ! catch (PgException ex) { this.dbConnection.Settings.Database = oldDb; *************** *** 361,369 **** state = ConnectionState.Connecting; ! dbConnection = new PGDbConnection(connectionString); if (dbConnection.Settings.Pooling) { ! dbConnection = PGConnectionPool.GetConnection(connectionString); } else --- 361,369 ---- state = ConnectionState.Connecting; ! dbConnection = new PgDbConnection(connectionString); if (dbConnection.Settings.Pooling) { ! dbConnection = PgConnectionPool.GetConnection(connectionString); } else *************** *** 384,398 **** // Add Info message event handler ! infoMessageHandler = new PGClientMessageEventHandler(OnInfoMessage); dbConnection.DB.InfoMessage += infoMessageHandler; // Add notification event handler ! notificationHandler = new PGClientNotificationEventHandler(OnNotification); dbConnection.DB.Notification += notificationHandler; } ! catch (PGClientException ex) { state = ConnectionState.Closed; ! throw new PGException(ex.Message, ex); } } --- 384,398 ---- // Add Info message event handler ! infoMessageHandler = new PgClientMessageEventHandler(OnInfoMessage); dbConnection.DB.InfoMessage += infoMessageHandler; // Add notification event handler ! notificationHandler = new PgClientNotificationEventHandler(OnNotification); dbConnection.DB.Notification += notificationHandler; } ! catch (PgClientException ex) { state = ConnectionState.Closed; ! throw new PgException(ex.Message, ex); } } *************** *** 432,436 **** if (dbConnection.Pooled) { ! PGConnectionPool.FreeConnection(dbConnection); } else --- 432,436 ---- if (dbConnection.Pooled) { ! PgConnectionPool.FreeConnection(dbConnection); } else *************** *** 450,456 **** } } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 450,456 ---- } } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 462,468 **** } ! public PGCommand CreateCommand() { ! PGCommand command = new PGCommand(); command.Connection = this; --- 462,468 ---- } ! public PgCommand CreateCommand() { ! PgCommand command = new PgCommand(); command.Connection = this; *************** *** 477,484 **** if (activeCommands.Count > 0) { ! PGCommand[] commands = new PGCommand[activeCommands.Count]; activeCommands.CopyTo(0, commands, 0, commands.Length); ! foreach (PGCommand command in commands) { command.Dispose(); --- 477,484 ---- if (activeCommands.Count > 0) { ! PgCommand[] commands = new PgCommand[activeCommands.Count]; activeCommands.CopyTo(0, commands, 0, commands.Length); ! foreach (PgCommand command in commands) { command.Dispose(); *************** *** 493,497 **** } ! public DataTable GetDbSchemaTable(PGDbSchemaType schema, object[] restrictions) { if (DataReader != null) --- 493,497 ---- } ! public DataTable GetDbSchemaTable(PgDbSchemaType schema, object[] restrictions) { if (DataReader != null) *************** *** 500,504 **** } ! IDbSchema dbSchema = PGDbSchemaFactory.GetSchema(schema); if (dbSchema == null) --- 500,504 ---- } ! IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(schema); if (dbSchema == null) *************** *** 561,589 **** // Create database ! PGCommand command = new PGCommand(commandText.ToString(), this); command.ExecuteNonQuery(); command.Dispose(); } } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } ! private void OnInfoMessage(object sender, PGClientMessageEventArgs e) { if (InfoMessage != null) { ! InfoMessage(this, new PGInfoMessageEventArgs(e.Exception)); } } ! private void OnNotification(object sender, PGClientNotificationEventArgs e) { if (Notification != null) { Notification(this, ! new PGNotificationEventArgs( e.ProcessID, e.Condition, --- 561,589 ---- // Create database ! PgCommand command = new PgCommand(commandText.ToString(), this); command.ExecuteNonQuery(); command.Dispose(); } } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } ! private void OnInfoMessage(object sender, PgClientMessageEventArgs e) { if (InfoMessage != null) { ! InfoMessage(this, new PgInfoMessageEventArgs(e.Exception)); } } ! private void OnNotification(object sender, PgClientNotificationEventArgs e) { if (Notification != null) { Notification(this, ! new PgNotificationEventArgs( e.ProcessID, e.Condition, Index: PGConnectionPool.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGConnectionPool.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGConnectionPool.cs 20 Jul 2003 09:58:57 -0000 1.2 --- PGConnectionPool.cs 2 Aug 2003 19:13:09 -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,33 **** using System.Collections; using System.Threading; ! using PostgreSql.Data.NPGClient; ! namespace PostgreSql.Data.PGSqlClient { ! internal class PGConnectionPool : MarshalByRefObject { #region FIELDS ! private static PGPoolManager pool = null; #endregion --- 21,33 ---- using System.Collections; using System.Threading; ! using PostgreSql.Data.NPgClient; ! namespace PostgreSql.Data.PgSqlClient { ! internal class PgConnectionPool : MarshalByRefObject { #region FIELDS ! private static PgPoolManager pool = null; #endregion *************** *** 39,54 **** if (pool == null) { ! pool = new PGPoolManager(); } } ! public static PGDbConnection GetConnection(string connectionString) { Initialize(); ! return ((PGDbConnection)pool.CheckOut(connectionString)); } ! public static void FreeConnection(PGDbConnection c) { pool.CheckIn(c); --- 39,54 ---- if (pool == null) { ! pool = new PgPoolManager(); } } ! public static PgDbConnection GetConnection(string connectionString) { Initialize(); ! return ((PgDbConnection)pool.CheckOut(connectionString)); } ! public static void FreeConnection(PgDbConnection c) { pool.CheckIn(c); *************** *** 58,62 **** } ! internal class PGPoolManager { #region FIELDS --- 58,62 ---- } ! internal class PgPoolManager { #region FIELDS *************** *** 70,74 **** #region CONSTRUCTORS ! public PGPoolManager() { locked = ArrayList.Synchronized(new ArrayList()); --- 70,74 ---- #region CONSTRUCTORS ! public PgPoolManager() { locked = ArrayList.Synchronized(new ArrayList()); *************** *** 85,101 **** #region METHODS ! public PGDbConnection CheckOut(string connectionString) { ! PGDbConnection newConnection = null; long now = System.DateTime.Now.Ticks; ! lock (typeof(PGConnectionPool)) { if (unlocked.Count > 0) { ! PGDbConnection[] list = new PGDbConnection[unlocked.Count]; unlocked.CopyTo(0, list, 0, list.Length); ! foreach(PGDbConnection connection in list) { if (Validate(connection, connectionString)) --- 85,101 ---- #region METHODS ! public PgDbConnection CheckOut(string connectionString) { ! PgDbConnection newConnection = null; long now = System.DateTime.Now.Ticks; ! lock (typeof(PgConnectionPool)) { if (unlocked.Count > 0) { ! PgDbConnection[] list = new PgDbConnection[unlocked.Count]; unlocked.CopyTo(0, list, 0, list.Length); ! foreach(PgDbConnection connection in list) { if (Validate(connection, connectionString)) *************** *** 141,147 **** } ! public void CheckIn(PGDbConnection connection) { ! lock (typeof(PGDbConnection)) { connection.Created = System.DateTime.Now.Ticks; --- 141,147 ---- } ! public void CheckIn(PgDbConnection connection) { ! lock (typeof(PgDbConnection)) { connection.Created = System.DateTime.Now.Ticks; *************** *** 164,172 **** } ! private PGDbConnection Create(string connectionString) { try { ! PGDbConnection connection = new PGDbConnection(connectionString); connection.Connect(); connection.Pooled = true; --- 164,172 ---- } ! private PgDbConnection Create(string connectionString) { try { ! PgDbConnection connection = new PgDbConnection(connectionString); connection.Connect(); connection.Pooled = true; *************** *** 174,178 **** return connection; } ! catch (PGClientException ex) { throw ex; --- 174,178 ---- return connection; } ! catch (PgClientException ex) { throw ex; *************** *** 180,184 **** } ! private bool Validate(PGDbConnection connection, string connectionString) { try --- 180,184 ---- } ! private bool Validate(PgDbConnection connection, string connectionString) { try *************** *** 193,197 **** } ! private void Expire(PGDbConnection connection) { try --- 193,197 ---- } ! private void Expire(PgDbConnection connection) { try *************** *** 204,208 **** catch (Exception) { ! throw new PGException("Error closing database connection."); } } --- 204,208 ---- catch (Exception) { ! throw new PgException("Error closing database connection."); } } *************** *** 216,223 **** if (unlocked.Count > 0) { ! PGDbConnection[] list = new PGDbConnection[unlocked.Count]; unlocked.CopyTo(0, list, 0, list.Length); ! foreach (PGDbConnection connection in list) { if (connection.Lifetime != 0) --- 216,223 ---- if (unlocked.Count > 0) { ! PgDbConnection[] list = new PgDbConnection[unlocked.Count]; unlocked.CopyTo(0, list, 0, list.Length); ! foreach (PgDbConnection connection in list) { if (connection.Lifetime != 0) Index: PGDataAdapter.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGDataAdapter.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PGDataAdapter.cs 31 Jul 2003 10:54:40 -0000 1.5 --- PGDataAdapter.cs 2 Aug 2003 19:13:09 -0000 1.6 *************** *** 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 * *************** *** 24,39 **** using System.ComponentModel.Design; ! namespace PostgreSql.Data.PGSqlClient { #region DELEGATES ! public delegate void PGRowUpdatedEventHandler(object sender, PGRowUpdatedEventArgs e); ! public delegate void PGRowUpdatingEventHandler(object sender, PGRowUpdatingEventArgs e); #endregion ! [ToolboxBitmap(typeof(PGDataAdapter), "Resources.ToolBox.PGDataAdapter.bmp"), DefaultEvent("RowUpdated")] ! public sealed class PGDataAdapter : DbDataAdapter, IDbDataAdapter { #region EVENTS --- 24,39 ---- using System.ComponentModel.Design; ! namespace PostgreSql.Data.PgSqlClient { #region DELEGATES ! public delegate void PgRowUpdatedEventHandler(object sender, PgRowUpdatedEventArgs e); ! public delegate void PgRowUpdatingEventHandler(object sender, PgRowUpdatingEventArgs e); #endregion ! [ToolboxBitmap(typeof(PgDataAdapter), "Resources.ToolBox.PgDataAdapter.bmp"), DefaultEvent("RowUpdated")] ! public sealed class PgDataAdapter : DbDataAdapter, IDbDataAdapter { #region EVENTS *************** *** 46,53 **** #region FIELDS ! private PGCommand selectCommand; ! private PGCommand insertCommand; ! private PGCommand updateCommand; ! private PGCommand deleteCommand; private bool disposed; --- 46,53 ---- #region FIELDS ! private PgCommand selectCommand; ! private PgCommand insertCommand; ! private PgCommand updateCommand; ! private PgCommand deleteCommand; private bool disposed; *************** *** 59,63 **** { get { return selectCommand; } ! set { selectCommand = (PGCommand)value; } } --- 59,63 ---- { get { return selectCommand; } ! set { selectCommand = (PgCommand)value; } } *************** *** 65,69 **** { get { return insertCommand; } ! set { insertCommand = (PGCommand)value; } } --- 65,69 ---- { get { return insertCommand; } ! set { insertCommand = (PgCommand)value; } } *************** *** 71,75 **** { get { return updateCommand; } ! set { updateCommand = (PGCommand)value; } } --- 71,75 ---- { get { return updateCommand; } ! set { updateCommand = (PgCommand)value; } } *************** *** 77,85 **** { get { return deleteCommand; } ! set { deleteCommand = (PGCommand)value; } } [Category("DataCategory_Update"), DefaultValue(null)] ! public PGCommand SelectCommand { get { return selectCommand; } --- 77,85 ---- { get { return deleteCommand; } ! set { deleteCommand = (PgCommand)value; } } [Category("DataCategory_Update"), DefaultValue(null)] ! public PgCommand SelectCommand { get { return selectCommand; } *************** *** 88,92 **** [Category("DataCategory_Update"), DefaultValue(null)] ! public PGCommand InsertCommand { get { return insertCommand; } --- 88,92 ---- [Category("DataCategory_Update"), DefaultValue(null)] ! public PgCommand InsertCommand { get { return insertCommand; } *************** *** 95,99 **** [Category("DataCategory_Fill"), DefaultValue(null)] ! public PGCommand UpdateCommand { get { return updateCommand; } --- 95,99 ---- [Category("DataCategory_Fill"), DefaultValue(null)] ! public PgCommand UpdateCommand { get { return updateCommand; } *************** *** 102,106 **** [Category("DataCategory_Update"), DefaultValue(null)] ! public PGCommand DeleteCommand { get { return deleteCommand; } --- 102,106 ---- [Category("DataCategory_Update"), DefaultValue(null)] ! public PgCommand DeleteCommand { get { return deleteCommand; } *************** *** 112,132 **** #region CONSTRUCTORS ! public PGDataAdapter() { } ! public PGDataAdapter(PGCommand selectCommand) : this() { this.selectCommand = selectCommand; } ! public PGDataAdapter(string commandText, PGConnection connection) : this() { ! this.selectCommand = new PGCommand(commandText, connection); } ! public PGDataAdapter(string commandText, string connectionString) : this() { ! this.selectCommand = new PGCommand(commandText, new PGConnection(connectionString)); } --- 112,132 ---- #region CONSTRUCTORS ! public PgDataAdapter() { } ! public PgDataAdapter(PgCommand selectCommand) : this() { this.selectCommand = selectCommand; } ! public PgDataAdapter(string commandText, PgConnection connection) : this() { ! this.selectCommand = new PgCommand(commandText, connection); } ! public PgDataAdapter(string commandText, string connectionString) : this() { ! this.selectCommand = new PgCommand(commandText, new PgConnection(connectionString)); } *************** *** 172,176 **** #region METHODS ! public event PGRowUpdatedEventHandler RowUpdated { add { Events.AddHandler(EventRowUpdated, value); } --- 172,176 ---- #region METHODS ! public event PgRowUpdatedEventHandler RowUpdated { add { Events.AddHandler(EventRowUpdated, value); } *************** *** 179,183 **** [Category("DataCategory_Update")] ! public event PGRowUpdatingEventHandler RowUpdating { add { Events.AddHandler(EventRowUpdating, value); } --- 179,183 ---- [Category("DataCategory_Update")] ! public event PgRowUpdatingEventHandler RowUpdating { add { Events.AddHandler(EventRowUpdating, value); } *************** *** 191,203 **** protected override RowUpdatedEventArgs CreateRowUpdatedEvent(DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) { ! return new PGRowUpdatedEventArgs(dataRow, command, statementType, tableMapping); } protected override void OnRowUpdated(RowUpdatedEventArgs value) { ! PGRowUpdatedEventHandler handler = (PGRowUpdatedEventHandler) Events[EventRowUpdated]; ! if ((null != handler) && (value is PGRowUpdatedEventArgs)) { ! handler(this, (PGRowUpdatedEventArgs) value); } } --- 191,203 ---- protected override RowUpdatedEventArgs CreateRowUpdatedEvent(DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) { ! return new PgRowUpdatedEventArgs(dataRow, command, statementType, tableMapping); } protected override void OnRowUpdated(RowUpdatedEventArgs value) { ! PgRowUpdatedEventHandler handler = (PgRowUpdatedEventHandler) Events[EventRowUpdated]; ! if ((null != handler) && (value is PgRowUpdatedEventArgs)) { ! handler(this, (PgRowUpdatedEventArgs) value); } } *************** *** 205,217 **** protected override RowUpdatingEventArgs CreateRowUpdatingEvent(DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) { ! return new PGRowUpdatingEventArgs(dataRow, command, statementType, tableMapping); } protected override void OnRowUpdating(RowUpdatingEventArgs value) { ! PGRowUpdatingEventHandler handler = (PGRowUpdatingEventHandler) Events[EventRowUpdating]; ! if ((null != handler) && (value is PGRowUpdatingEventArgs)) { ! handler(this, (PGRowUpdatingEventArgs) value); } } --- 205,217 ---- protected override RowUpdatingEventArgs CreateRowUpdatingEvent(DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) { ! return new PgRowUpdatingEventArgs(dataRow, command, statementType, tableMapping); } protected override void OnRowUpdating(RowUpdatingEventArgs value) { ! PgRowUpdatingEventHandler handler = (PgRowUpdatingEventHandler) Events[EventRowUpdating]; ! if ((null != handler) && (value is PgRowUpdatingEventArgs)) { ! handler(this, (PgRowUpdatingEventArgs) value); } } Index: PGDataReader.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGDataReader.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PGDataReader.cs 29 Jul 2003 10:14:53 -0000 1.10 --- PGDataReader.cs 2 Aug 2003 19:13:09 -0000 1.11 *************** *** 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 * *************** *** 24,33 **** using System.Reflection; using System.ComponentModel; ! using PostgreSql.Data.NPGClient; ! using PostgreSql.Data.PGSqlClient.DbSchema; ! namespace PostgreSql.Data.PGSqlClient { ! public sealed class PGDataReader : MarshalByRefObject, IEnumerable, IDataReader, IDisposable, IDataRecord { #region FIELDS --- 24,33 ---- using System.Reflection; using System.ComponentModel; ! using PostgreSql.Data.NPgClient; ! using PostgreSql.Data.PgSqlClient.DbSchema; ! namespace PostgreSql.Data.PgSqlClient { ! public sealed class PgDataReader : MarshalByRefObject, IEnumerable, IDataReader, IDisposable, IDataRecord { #region FIELDS *************** *** 40,44 **** private int fieldCount; private DataTable schemaTable; ! private PGCommand command; private object[] row; --- 40,44 ---- private int fieldCount; private DataTable schemaTable; ! private PgCommand command; private object[] row; *************** *** 47,51 **** #region CONSTRUCTORS ! private PGDataReader() { open = true; --- 47,51 ---- #region CONSTRUCTORS ! private PgDataReader() { open = true; *************** *** 55,59 **** } ! internal PGDataReader(PGCommand command) : this() { command.Connection.DataReader = this; --- 55,59 ---- } ! internal PgDataReader(PgCommand command) : this() { command.Connection.DataReader = this; *************** *** 66,70 **** #region DESTRUCTORS ! ~PGDataReader() { Dispose(false); --- 66,70 ---- #region DESTRUCTORS ! ~PgDataReader() { Dispose(false); *************** *** 201,207 **** read = (row == null) ? false : true; } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 201,207 ---- read = (row == null) ? false : true; } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 282,295 **** } ! private object[] getColumnInfo(PGFieldDescriptor field) { object[] columnInfo = null; ! IDbSchema dbSchema = PGDbSchemaFactory.GetSchema(PGDbSchemaType.Columns); ! dbSchema.AddWhereFilter("pg_attribute.attnum = " + field.OidNumber); ! dbSchema.AddWhereFilter("pg_attribute.attrelid = " + field.OidTable); ! PGCommand schemaCmd = new PGCommand(dbSchema.GetCommandText(null), command.Connection); schemaCmd.InternalPrepare(); schemaCmd.InternalExecute(); --- 282,295 ---- } ! private object[] getColumnInfo(PgFieldDescriptor field) { object[] columnInfo = null; ! IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(PgDbSchemaType.Columns); ! dbSchema.AddWhereFilter("Pg_attribute.attnum = " + field.OidNumber); ! dbSchema.AddWhereFilter("Pg_attribute.attrelid = " + field.OidTable); ! PgCommand schemaCmd = new PgCommand(dbSchema.GetCommandText(null), command.Connection); schemaCmd.InternalPrepare(); schemaCmd.InternalExecute(); *************** *** 306,318 **** } ! private System.Array getPrimaryKeyInfo(PGFieldDescriptor field) { System.Array columnInfo = null; ! IDbSchema dbSchema = PGDbSchemaFactory.GetSchema(PGDbSchemaType.Primary_Keys); ! dbSchema.AddWhereFilter("pg_class.oid = " + field.OidTable); ! PGCommand schemaCmd = new PGCommand(dbSchema.GetCommandText(null), command.Connection); schemaCmd.InternalPrepare(); schemaCmd.InternalExecute(); --- 306,318 ---- } ! private System.Array getPrimaryKeyInfo(PgFieldDescriptor field) { System.Array columnInfo = null; ! IDbSchema dbSchema = PgDbSchemaFactory.GetSchema(PgDbSchemaType.Primary_Keys); ! dbSchema.AddWhereFilter("Pg_class.oid = " + field.OidTable); ! PgCommand schemaCmd = new PgCommand(dbSchema.GetCommandText(null), command.Connection); schemaCmd.InternalPrepare(); schemaCmd.InternalExecute(); *************** *** 627,631 **** } ! private PGDbType getProviderType(int i) { return command.Statement.RowDescriptor.Fields[i].DataType.ProviderType; --- 627,631 ---- } ! private PgDbType getProviderType(int i) { return command.Statement.RowDescriptor.Fields[i].DataType.ProviderType; *************** *** 689,693 **** private bool isReadOnly(int i) { ! PGType type = command.Statement.RowDescriptor.Fields[i].DataType; return type.IsSerial ? true : false; --- 689,693 ---- private bool isReadOnly(int i) { ! PgType type = command.Statement.RowDescriptor.Fields[i].DataType; return type.IsSerial ? true : false; *************** *** 701,705 **** } ! PGType type = command.Statement.RowDescriptor.Fields[i].DataType; return type.IsSerial ? true : false; --- 701,705 ---- } ! PgType type = command.Statement.RowDescriptor.Fields[i].DataType; return type.IsSerial ? true : false; Index: PGDbConnection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGDbConnection.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGDbConnection.cs 12 Jul 2003 21:36:27 -0000 1.2 --- PGDbConnection.cs 2 Aug 2003 19:13:09 -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 * *************** *** 22,36 **** using System.Text.RegularExpressions; ! using PostgreSql.Data.NPGClient; ! namespace PostgreSql.Data.PGSqlClient { ! internal sealed class PGDbConnection : MarshalByRefObject { #region FIELDS ! private PGDbClient db; private string connectionString; ! private PGConnectionParams settings; private long created; private long lifetime; --- 22,36 ---- using System.Text.RegularExpressions; ! using PostgreSql.Data.NPgClient; ! namespace PostgreSql.Data.PgSqlClient { ! internal sealed class PgDbConnection : MarshalByRefObject { #region FIELDS ! private PgDbClient db; private string connectionString; ! private PgConnectionParams settings; private long created; private long lifetime; *************** *** 43,47 **** #region PROPERTIES ! public PGDbClient DB { get { return db; } --- 43,47 ---- #region PROPERTIES ! public PgDbClient DB { get { return db; } *************** *** 69,73 **** } ! public PGConnectionParams Settings { get { return settings; } --- 69,73 ---- } ! public PgConnectionParams Settings { get { return settings; } *************** *** 78,84 **** #region CONSTRUCTORS ! private PGDbConnection() { ! settings = new PGConnectionParams(); // search = new Regex(@"([\w\s\d]*)\s*=\s*([\w\s\d]*)"); search = new Regex(@"([\w\s\d]*)\s*=\s*([^;]*)"); --- 78,84 ---- #region CONSTRUCTORS ! private PgDbConnection() { ! settings = new PgConnectionParams(); // search = new Regex(@"([\w\s\d]*)\s*=\s*([\w\s\d]*)"); search = new Regex(@"([\w\s\d]*)\s*=\s*([^;]*)"); *************** *** 90,94 **** } ! public PGDbConnection(string connectionString) : this() { this.connectionString = connectionString; --- 90,94 ---- } ! public PgDbConnection(string connectionString) : this() { this.connectionString = connectionString; *************** *** 104,113 **** try { ! db = new PGDbClient(settings); db.Connect(); } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 104,113 ---- try { ! db = new PgDbClient(settings); db.Connect(); } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } *************** *** 119,125 **** db.Disconnect(); } ! catch (PGClientException ex) { ! throw new PGException(ex.Message, ex); } } --- 119,125 ---- db.Disconnect(); } ! catch (PgClientException ex) { ! throw new PgException(ex.Message, ex); } } Index: PGDbSchemaType.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGDbSchemaType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGDbSchemaType.cs 22 Jul 2003 17:22:20 -0000 1.2 --- PGDbSchemaType.cs 2 Aug 2003 19:13:09 -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,25 **** using System; ! namespace PostgreSql.Data.PGSqlClient { ! public enum PGDbSchemaType { Aggregates, --- 19,25 ---- using System; ! namespace PostgreSql.Data.PgSqlClient { ! public enum PgDbSchemaType { Aggregates, Index: PGDbType.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGDbType.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGDbType.cs 14 Jul 2003 10:28:49 -0000 1.2 --- PGDbType.cs 2 Aug 2003 19:13:09 -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,26 **** using System; ! namespace PostgreSql.Data.PGSqlClient { [Serializable] ! public enum PGDbType { Binary , --- 19,26 ---- using System; ! namespace PostgreSql.Data.PgSqlClient { [Serializable] ! public enum PgDbType { Binary , Index: PGError.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGError.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGError.cs 12 Jul 2003 08:11:21 -0000 1.1.1.1 --- PGError.cs 2 Aug 2003 19:13:09 -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 * *************** *** 19,26 **** using System; ! namespace PostgreSql.Data.PGSqlClient { [Serializable] ! public sealed class PGError { #region FIELDS --- 19,26 ---- using System; ! namespace PostgreSql.Data.PgSqlClient { [Serializable] ! public sealed class PgError { #region FIELDS *************** *** 105,118 **** #region CONSTRUCTORS ! internal PGError() { } ! internal PGError(string message) { this.message = message; } ! internal PGError(string severity, string code, string message) { this.severity = severity; --- 105,118 ---- #region CONSTRUCTORS ! internal PgError() { } ! internal PgError(string message) { this.message = message; } ! internal PgError(string severity, string code, string message) { this.severity = severity; Index: PGErrorCollection.cs ==============================================================... [truncated message content] |
From: <car...@us...> - 2003-08-02 11:18:52
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv525 Modified Files: changes.txt Log Message: Updated CHANGES.TXT Index: changes.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changes.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** changes.txt 31 Jul 2003 11:02:19 -0000 1.5 --- changes.txt 2 Aug 2003 11:18:50 -0000 1.6 *************** *** 9,12 **** --- 9,19 ---- * Added makefile for mono:: in linux. + * Improved PostgreSQL 3.0 protocol handling. + + * Added initial implementation of asynchronous notification ( PGConnection.Notification )support ( task #82889 ). + + * Added initial implementation of PGConnection.InfoMessage event ( task #82902 ). + + |
From: <car...@us...> - 2003-08-01 19:26:12
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv32703 Modified Files: changelog.txt Log Message: Updated CHANGELOG.TXT Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changelog.txt,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** changelog.txt 31 Jul 2003 11:00:38 -0000 1.37 --- changelog.txt 1 Aug 2003 17:52:37 -0000 1.38 *************** *** 3,6 **** --- 3,25 ---- + 2003-07-01 Carlos Guzmán Álvarez <car...@te...> + + * Improved PostgreSQL 3.0 protocol handling. + + * Added some new files: + + - PGInfoMessageEventArgs.cs + + - PGNotificationEventArgs.cs + + - PGClientMessageEventArgs.cs + + - PGClientNotificationEventArgs.cs + + * Added initial revision of asynchronous notification support ( task #82889 ). + + * Added implementation of PGConnection.InfoMessage event ( task #82902 ). + + 2003-07-31 Carlos Guzmán Álvarez <car...@te...> |
From: <car...@us...> - 2003-08-01 18:45:29
|
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv32505 Modified Files: PGConnection.cs Added Files: PGInfoMessageEventArgs.cs PGNotificationEventArgs.cs Log Message: * Improved PostgreSQL 3.0 protocol handling. * Added some new files: - PGInfoMessageEventArgs.cs - PGNotificationEventArgs.cs - PGClientMessageEventArgs.cs - PGClientNotificationEventArgs.cs * Added initial revision of asynchronous notification support ( task #82889 ). * Added implementation of PGConnection.InfoMessage event ( task #82902 ). --- NEW FILE: PGInfoMessageEventArgs.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PGNotificationEventArgs.cs --- (This appears to be a binary file; contents omitted.) Index: PGConnection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGConnection.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PGConnection.cs 31 Jul 2003 10:54:40 -0000 1.5 --- PGConnection.cs 1 Aug 2003 17:51:19 -0000 1.6 *************** *** 23,27 **** using System.Collections; using System.ComponentModel; - using PostgreSql.Data.NPGClient; using PostgreSql.Data.PGSqlClient.DbSchema; --- 23,26 ---- *************** *** 33,39 **** public sealed class PGConnection : Component, IDbConnection, ICloneable { ! #region events ! public event StateChangeEventHandler StateChange; #endregion --- 32,40 ---- public sealed class PGConnection : Component, IDbConnection, ICloneable { ! #region EVENTS ! public event StateChangeEventHandler StateChange; ! public event PGInfoMessageEventHandler InfoMessage; ! public event PGNotificationEventHandler Notification; #endregion *************** *** 49,52 **** --- 50,56 ---- private ArrayList activeCommands; + private PGClientMessageEventHandler infoMessageHandler; + private PGClientNotificationEventHandler notificationHandler; + #endregion *************** *** 369,374 **** } ! state = ConnectionState.Open; ! if (StateChange != null) { --- 373,378 ---- } ! // Set connection state to Open ! state = ConnectionState.Open; if (StateChange != null) { *************** *** 376,380 **** --- 380,393 ---- } + // Initialize active commands list activeCommands = new ArrayList(); + + // Add Info message event handler + infoMessageHandler = new PGClientMessageEventHandler(OnInfoMessage); + dbConnection.DB.InfoMessage += infoMessageHandler; + + // Add notification event handler + notificationHandler = new PGClientNotificationEventHandler(OnNotification); + dbConnection.DB.Notification += notificationHandler; } catch (PGClientException ex) *************** *** 393,396 **** --- 406,410 ---- lock (dbConnection) { + // Close DataReader if (dataReader != null) { *************** *** 398,403 **** --- 412,419 ---- } + // Dispose Active commands DisposeActiveCommands(); + // Rollback active transation if (activeTxn != null) { *************** *** 406,409 **** --- 422,433 ---- } + // Remove info message event handler + dbConnection.DB.InfoMessage -= infoMessageHandler; + + // Remove notification event handler + dbConnection.DB.Notification -= notificationHandler; + + // Close connection permanently or send it + // back to the pool if (dbConnection.Pooled) { *************** *** 545,548 **** --- 569,592 ---- { throw new PGException(ex.Message, ex); + } + } + + private void OnInfoMessage(object sender, PGClientMessageEventArgs e) + { + if (InfoMessage != null) + { + InfoMessage(this, new PGInfoMessageEventArgs(e.Exception)); + } + } + + private void OnNotification(object sender, PGClientNotificationEventArgs e) + { + if (Notification != null) + { + Notification(this, + new PGNotificationEventArgs( + e.ProcessID, + e.Condition, + e.Aditional)); } } |
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient In directory sc8-pr-cvs1:/tmp/cvs-serv32580 Modified Files: PGDbClient.cs PGStatement.cs Added Files: PGClientMessageEventArgs.cs PGClientNotificationEventArgs.cs Log Message: * Improved PostgreSQL 3.0 protocol handling. * Added some new files: - PGInfoMessageEventArgs.cs - PGNotificationEventArgs.cs - PGClientMessageEventArgs.cs - PGClientNotificationEventArgs.cs * Added initial revision of asynchronous notification support ( task #82889 ). * Added implementation of PGConnection.InfoMessage event ( task #82902 ). --- NEW FILE: PGClientMessageEventArgs.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PGClientNotificationEventArgs.cs --- (This appears to be a binary file; contents omitted.) Index: PGDbClient.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGDbClient.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PGDbClient.cs 17 Jul 2003 13:41:42 -0000 1.3 --- PGDbClient.cs 1 Aug 2003 17:51:58 -0000 1.4 *************** *** 29,32 **** --- 29,39 ---- internal class PGDbClient { + #region EVENTS + + public event PGClientMessageEventHandler InfoMessage; + public event PGClientNotificationEventHandler Notification; + + #endregion + #region STATIC_FIELDS *************** *** 212,222 **** } ! if (type == PGBackendCodes.ERROR_RESPONSE) { ! // Read the error message and raise an exception ! PGClientException ex = processErrorPacket(responsePacket); ! throw ex; ! } return responsePacket; --- 219,250 ---- } ! switch (type) { ! case PGBackendCodes.ERROR_RESPONSE: ! { ! // Read the error message and trow the exception ! PGClientException ex = processErrorPacket(responsePacket); ! throw ex; ! } ! ! case PGBackendCodes.NOTICE_RESPONSE: ! { ! // Read the notice message and raise an InfoMessage event ! PGClientException ex = processErrorPacket(responsePacket); ! ! this.InfoMessage(this, new PGClientMessageEventArgs(ex)); ! } ! break; ! ! case PGBackendCodes.NOTIFICATION_RESPONSE: ! { ! processNotificationResponse(responsePacket); ! } ! break; ! ! default: ! break; ! } return responsePacket; *************** *** 378,381 **** --- 406,419 ---- } + private void processNotificationResponse(PGResponsePacket packet) + { + int processID = packet.ReadInt(); + string condition = packet.ReadNullString(); + string additional = packet.ReadNullString(); + + // Raise an event as an InfoMessage + Notification(this, new PGClientNotificationEventArgs(processID, condition, additional)); + } + #endregion *************** *** 581,584 **** --- 619,630 ---- #region METHODS + + public void SendInfoMessage(PGClientException exception) + { + if (InfoMessage != null) + { + InfoMessage(this, new PGClientMessageEventArgs(exception)); + } + } public PGStatement CreateStatement() Index: PGStatement.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/NPGClient/PGStatement.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PGStatement.cs 12 Jul 2003 08:11:23 -0000 1.1.1.1 --- PGStatement.cs 1 Aug 2003 17:51:58 -0000 1.2 *************** *** 344,360 **** // Sync server and client ! db.Flush(); // Receive response PGResponsePacket response = new PGResponsePacket(); ! while (response.Message != PGBackendCodes.COMMAND_COMPLETE && ! response.Message != PGBackendCodes.EMPTY_QUERY_RESPONSE && ! response.Message != PGBackendCodes.NODATA && ! response.Message != PGBackendCodes.PORTAL_SUSPENDED) { response = db.ReceiveResponsePacket(); processSqlPacket(response); } ! // Update status this.status = PGStatementStatus.Executed; --- 344,357 ---- // Sync server and client ! db.Sync(); // Receive response PGResponsePacket response = new PGResponsePacket(); ! while (response.Message != PGBackendCodes.READY_FOR_QUERY) { response = db.ReceiveResponsePacket(); processSqlPacket(response); } ! // Update status this.status = PGStatementStatus.Executed; *************** *** 637,646 **** case "FETCH": recordsAffected = Int32.Parse(elements[1]); - break; - - case "CREATE": - case "ALTER": - case "DROP": - db.Sync(); break; } --- 634,637 ---- |
From: <car...@us...> - 2003-07-31 11:08:59
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv20077 Modified Files: PGSqlClient.build Log Message: Fixed Toolbox bitmaps resources Index: PGSqlClient.build =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PGSqlClient.build,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PGSqlClient.build 24 Jul 2003 11:01:36 -0000 1.5 --- PGSqlClient.build 31 Jul 2003 10:54:13 -0000 1.6 *************** *** 145,151 **** <absolute file="System.XML.dll" /> </references> ! <arg value="/resource:${resources.dir}\Toolbox\PGConnection.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolboxBitmaps.PGConnection.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PGCommand.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolboxBitmaps.PGCommand.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PGDataAdapter.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolboxBitmaps.PGDataAdapter.bmp" /> <arg value="/optimize+" /> </csc> --- 145,151 ---- <absolute file="System.XML.dll" /> </references> ! <arg value="/resource:${resources.dir}\Toolbox\PGConnection.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGConnection.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PGCommand.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGCommand.bmp" /> ! <arg value="/resource:${resources.dir}\Toolbox\PGDataAdapter.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGDataAdapter.bmp" /> <arg value="/optimize+" /> </csc> |
From: <car...@us...> - 2003-07-31 11:02:22
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv21619 Modified Files: changes.txt Log Message: Updated changes.txt Index: changes.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changes.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** changes.txt 31 Jul 2003 08:35:58 -0000 1.4 --- changes.txt 31 Jul 2003 11:02:19 -0000 1.5 *************** *** 3,6 **** --- 3,14 ---- + Alpha 3 ( XX-XX-2003 ) + ----- - - -- -- ---- - + + + * Added makefile for mono:: in linux. + + + Alpha 2 ( 31-07-2003 ) ----- - - -- -- ---- - |
From: <car...@us...> - 2003-07-31 11:00:43
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv21347 Modified Files: changelog.txt Log Message: Updated CHANGELOG.TXT Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changelog.txt,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** changelog.txt 31 Jul 2003 08:35:58 -0000 1.36 --- changelog.txt 31 Jul 2003 11:00:38 -0000 1.37 *************** *** 3,6 **** --- 3,14 ---- + 2003-07-31 Carlos Guzmán Álvarez <car...@te...> + + * Added Linux makefile for mono:: ( Task #82784 ) + + * Fixed Toolbox bitmaps resources ( error #780770 ) + + + < ----------------------------------- Alpha 3 ---------------------------------- > |
From: <car...@us...> - 2003-07-31 10:58:26
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv19994 Added Files: makefile Log Message: Added makefile for mono on linux --- NEW FILE: makefile --- LIBRARY = PostgreSql.Data.PGSqlClient.dll all: $(LIBRARY) install clean CSC = mcs COPY = cp # References to assemblies LD_FLAGS = -reference:System.dll -reference:System.Data.dll -reference:System.Drawing.dll -reference:System.Xml.dll # Resources for the Toolbox TOOL_RESOURCES = -resource:PostgreSql.Data.PGSqlClient/source/Resources/ToolBox/PGConnection.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.PGConnection.bmp -resource:PostgreSql.Data.PGSqlClient/source/Resources/ToolBox/PGCommand.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.FbCommand.bmp -resource:PostgreSql.Data.PGSqlClient/source/Resources/ToolBox/PGDataAdapter.bmp,PostgreSql.Data.PGSqlClient.Resources.ToolBox.FbDataAdapter.bmp # Source files RECURSE_SOURCE = -recurse:./PostgreSql.Data.PGSqlClient/source/*.cs # Defines DEFINE = -define:_DEBUG PostgreSql.Data.PGSqlClient.dll: $(CSC) -target:library -out:$(LIBRARY) $(LD_FLAGS) $(DEFINE) $(TOOL_RESOURCES) $(RECURSE_SOURCE) install: rm -rf build mkdir -p build $(COPY) $(LIBRARY) ./build clean: rm $(LIBRARY) |
From: <car...@us...> - 2003-07-31 10:54:43
|
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv20140 Modified Files: PGCommand.cs PGConnection.cs PGDataAdapter.cs Log Message: Fixed Toolbox bitmaps resources Index: PGCommand.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGCommand.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PGCommand.cs 30 Jul 2003 18:34:45 -0000 1.6 --- PGCommand.cs 31 Jul 2003 10:54:40 -0000 1.7 *************** *** 28,32 **** namespace PostgreSql.Data.PGSqlClient { ! [ToolboxBitmap(typeof(PGCommand), "Resources.ToolboxBitmaps.PGCommand.bmp")] public sealed class PGCommand : Component, IDbCommand, ICloneable { --- 28,32 ---- namespace PostgreSql.Data.PGSqlClient { ! [ToolboxBitmap(typeof(PGCommand), "Resources.ToolBox.PGCommand.bmp")] public sealed class PGCommand : Component, IDbCommand, ICloneable { Index: PGConnection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGConnection.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PGConnection.cs 29 Jul 2003 23:26:12 -0000 1.4 --- PGConnection.cs 31 Jul 2003 10:54:40 -0000 1.5 *************** *** 29,33 **** namespace PostgreSql.Data.PGSqlClient { ! [ToolboxBitmap(typeof(PGConnection), "Resources.ToolboxBitmaps.PGConnection.bmp")] [DefaultEvent("InfoMessage")] public sealed class PGConnection : Component, IDbConnection, ICloneable --- 29,33 ---- namespace PostgreSql.Data.PGSqlClient { ! [ToolboxBitmap(typeof(PGConnection), "Resources.ToolBox.PGConnection.bmp")] [DefaultEvent("InfoMessage")] public sealed class PGConnection : Component, IDbConnection, ICloneable Index: PGDataAdapter.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGDataAdapter.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PGDataAdapter.cs 16 Jul 2003 20:17:49 -0000 1.4 --- PGDataAdapter.cs 31 Jul 2003 10:54:40 -0000 1.5 *************** *** 33,37 **** #endregion ! [ToolboxBitmap(typeof(PGDataAdapter), "Resources.ToolboxBitmaps.PGDataAdapter.bmp"), DefaultEvent("RowUpdated")] public sealed class PGDataAdapter : DbDataAdapter, IDbDataAdapter --- 33,37 ---- #endregion ! [ToolboxBitmap(typeof(PGDataAdapter), "Resources.ToolBox.PGDataAdapter.bmp"), DefaultEvent("RowUpdated")] public sealed class PGDataAdapter : DbDataAdapter, IDbDataAdapter |
From: <car...@us...> - 2003-07-31 08:40:53
|
Update of /cvsroot/pgsqlclient/pgsqlclient In directory sc8-pr-cvs1:/tmp/cvs-serv29121 Modified Files: changelog.txt changes.txt Log Message: Prepare for Alpha 2 release Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changelog.txt,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** changelog.txt 30 Jul 2003 18:58:21 -0000 1.35 --- changelog.txt 31 Jul 2003 08:35:58 -0000 1.36 *************** *** 3,6 **** --- 3,8 ---- + < ----------------------------------- Alpha 3 ---------------------------------- > + 2003-07-30 Carlos Guzmán Álvarez <car...@te...> Index: changes.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/changes.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** changes.txt 30 Jul 2003 18:38:21 -0000 1.3 --- changes.txt 31 Jul 2003 08:35:58 -0000 1.4 *************** *** 3,7 **** ! Alpha 2 ( XX-XX-2003 ) ----- - - -- -- ---- - --- 3,7 ---- ! Alpha 2 ( 31-07-2003 ) ----- - - -- -- ---- - |
From: <car...@us...> - 2003-07-30 19:12:23
|
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv6561 Modified Files: PGCommandBuilder.cs Log Message: Fixed handling of expression columns at checkSchemaTable method Index: PGCommandBuilder.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/PGCommandBuilder.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PGCommandBuilder.cs 30 Jul 2003 17:36:08 -0000 1.5 --- PGCommandBuilder.cs 30 Jul 2003 18:54:56 -0000 1.6 *************** *** 646,651 **** (string)schemaRow["BaseTableName"]; } ! if (tableName != (string)schemaRow["BaseSchemaName"] + "." + (string)schemaRow["BaseTableName"] && ! !(bool)schemaRow["IsExpression"]) { throw new InvalidOperationException("Dynamic SQL generation is not supported against multiple base tables."); --- 646,650 ---- (string)schemaRow["BaseTableName"]; } ! if (!(bool)schemaRow["IsExpression"] && tableName != (string)schemaRow["BaseSchemaName"] + "." + (string)schemaRow["BaseTableName"]) { throw new InvalidOperationException("Dynamic SQL generation is not supported against multiple base tables."); |