[pgsqlclient-checkins] pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema PGAggregatesSchema.cs
Status: Inactive
Brought to you by:
carlosga_fb
Update of /cvsroot/pgsqlclient/pgsqlclient/PostgreSql.Data.PGSqlClient/source/DbSchema In directory sc8-pr-cvs1:/tmp/cvs-serv22922 Modified Files: PGAggregatesSchema.cs PGCastsSchema.cs PGCheckConstraints.cs PGColumnsSchema.cs PGDatabaseSchema.cs Log Message: Minor changes to db schema support Index: PGAggregatesSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/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 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGAggregatesSchema.cs 21 Jul 2003 19:54:22 -0000 1.2 *************** *** 47,54 **** 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"); } --- 47,54 ---- 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"); } Index: PGCastsSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/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 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGCastsSchema.cs 21 Jul 2003 19:54:22 -0000 1.2 *************** *** 46,53 **** 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"); } --- 46,53 ---- 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"); } *************** *** 57,62 **** 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"); } --- 57,62 ---- 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"); } Index: PGCheckConstraints.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/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 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGCheckConstraints.cs 21 Jul 2003 19:54:22 -0000 1.2 *************** *** 44,52 **** AddRestrictionColumn("pg_namespace.nspname", "CONSTRAINT_SCHEMA", null); AddRestrictionColumn("pg_constraint.conname", "CONSTRAINT_NAME", null); - AddRestrictionColumn("pg_get_constraintdef(pg_constraint.oid)", "CHECK_CLAUSULE", null); } public override void AddDataColumns() { AddDataColumn("pg_description.description", "DESCRIPTION"); } --- 44,52 ---- 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"); } *************** *** 54,60 **** 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_description", "pg_constraint.oid = pg_description.objoid"); } --- 54,60 ---- 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_description" , "pg_constraint.oid = pg_description.objoid"); } Index: PGColumnsSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/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 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGColumnsSchema.cs 21 Jul 2003 19:54:22 -0000 1.2 *************** *** 42,59 **** 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"); --- 42,59 ---- 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"); *************** *** 62,68 **** 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"); } --- 62,68 ---- 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"); } Index: PGDatabaseSchema.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient/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 12 Jul 2003 08:11:22 -0000 1.1.1.1 --- PGDatabaseSchema.cs 21 Jul 2003 19:54:22 -0000 1.2 *************** *** 47,53 **** public override void AddDataColumns() { ! AddDataColumn("pg_database.datistemplate", "IS_TEMPLATE"); ! AddDataColumn("pg_database.datallowconn", "ALLOW_CONNECTION"); ! AddDataColumn("pg_database.datconfig", "DATABASE_CONFIG"); } --- 47,53 ---- public override void AddDataColumns() { ! AddDataColumn("pg_database.datistemplate" , "IS_TEMPLATE"); ! AddDataColumn("pg_database.datallowconn" , "ALLOW_CONNECTION"); ! AddDataColumn("pg_database.datconfig" , "DATABASE_CONFIG"); } |