From: <car...@us...> - 2006-03-17 16:50:46
|
Revision: 32 Author: carlosga_fb Date: 2006-03-17 08:50:32 -0800 (Fri, 17 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=32&view=rev Log Message: ----------- ?\194?\183 More changes on database schema support ?\194?\183 Fixed bug in vector field processing Modified Paths: -------------- pgsqlclient/source/PostgreSql/Data/Protocol/PgResponsePacket.cs pgsqlclient/source/PostgreSql/Data/Schema/MetaData.xml pgsqlclient/source/PostgreSql/Data/Schema/PgColumns.cs pgsqlclient/source/PostgreSql/Data/Schema/PgIndexes.cs pgsqlclient/source/PostgreSql.Data.PostgreSqlClient.suo Modified: pgsqlclient/source/PostgreSql/Data/Protocol/PgResponsePacket.cs =================================================================== --- pgsqlclient/source/PostgreSql/Data/Protocol/PgResponsePacket.cs 2006-03-17 15:13:10 UTC (rev 31) +++ pgsqlclient/source/PostgreSql/Data/Protocol/PgResponsePacket.cs 2006-03-17 16:50:32 UTC (rev 32) @@ -309,7 +309,7 @@ PgType elementType = PgDatabase.DataTypes[type.ElementType]; Array data = null; - data = Array.CreateInstance(elementType.SystemType, PgCodes.INDEX_MAX_KEYS); + data = Array.CreateInstance(elementType.SystemType, (length / elementType.Size)); for (int i = 0; i < data.Length; i++ ) { Modified: pgsqlclient/source/PostgreSql/Data/Schema/MetaData.xml =================================================================== --- pgsqlclient/source/PostgreSql/Data/Schema/MetaData.xml 2006-03-17 15:13:10 UTC (rev 31) +++ pgsqlclient/source/PostgreSql/Data/Schema/MetaData.xml 2006-03-17 16:50:32 UTC (rev 32) @@ -259,6 +259,24 @@ <PopulationMechanism>PrepareCollection</PopulationMechanism> </MetaDataCollections> <Restrictions> + <CollectionName>CheckConstraints</CollectionName> + <RestrictionName>Catalog</RestrictionName> + <RestrictionDefault>constraint_catalog</RestrictionDefault> + <RestrictionNumber>1</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>CheckConstraints</CollectionName> + <RestrictionName>Schema</RestrictionName> + <RestrictionDefault>constraint_schema</RestrictionDefault> + <RestrictionNumber>2</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>CheckConstraints</CollectionName> + <RestrictionName>Name</RestrictionName> + <RestrictionDefault>constraint_name</RestrictionDefault> + <RestrictionNumber>3</RestrictionNumber> + </Restrictions> + <Restrictions> <CollectionName>Columns</CollectionName> <RestrictionName>Catalog</RestrictionName> <RestrictionDefault>table_catalog</RestrictionDefault> @@ -292,61 +310,61 @@ <CollectionName>Indexes</CollectionName> <RestrictionName>Catalog</RestrictionName> <RestrictionDefault>table_catalog</RestrictionDefault> - <RestrictionNumber>0</RestrictionNumber> + <RestrictionNumber>1</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Indexes</CollectionName> <RestrictionName>Schema</RestrictionName> <RestrictionDefault>table_schema</RestrictionDefault> - <RestrictionNumber>1</RestrictionNumber> + <RestrictionNumber>2</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Indexes</CollectionName> <RestrictionName>TableName</RestrictionName> <RestrictionDefault>table_name</RestrictionDefault> - <RestrictionNumber>2</RestrictionNumber> + <RestrictionNumber>3</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Indexes</CollectionName> <RestrictionName>Name</RestrictionName> <RestrictionDefault>index_name</RestrictionDefault> - <RestrictionNumber>3</RestrictionNumber> + <RestrictionNumber>4</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Functions</CollectionName> <RestrictionName>Catalog</RestrictionName> <RestrictionDefault>function_catalog</RestrictionDefault> - <RestrictionNumber>0</RestrictionNumber> + <RestrictionNumber>1</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Functions</CollectionName> <RestrictionName>Schema</RestrictionName> <RestrictionDefault>function_schema</RestrictionDefault> - <RestrictionNumber>1</RestrictionNumber> + <RestrictionNumber>2</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Functions</CollectionName> <RestrictionName>Name</RestrictionName> <RestrictionDefault>function_name</RestrictionDefault> - <RestrictionNumber>2</RestrictionNumber> + <RestrictionNumber>3</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>PrimaryKeys</CollectionName> <RestrictionName>Schema</RestrictionName> <RestrictionDefault>table_catalog</RestrictionDefault> - <RestrictionNumber>0</RestrictionNumber> + <RestrictionNumber>1</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>PrimaryKeys</CollectionName> <RestrictionName>Schema</RestrictionName> <RestrictionDefault>table_schema</RestrictionDefault> - <RestrictionNumber>1</RestrictionNumber> + <RestrictionNumber>2</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>PrimaryKeys</CollectionName> <RestrictionName>Table</RestrictionName> <RestrictionDefault>table_name</RestrictionDefault> - <RestrictionNumber>2</RestrictionNumber> + <RestrictionNumber>3</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Tables</CollectionName> @@ -376,43 +394,43 @@ <CollectionName>Triggers</CollectionName> <RestrictionName>TableCatalog</RestrictionName> <RestrictionDefault>table_catalog</RestrictionDefault> - <RestrictionNumber>0</RestrictionNumber> + <RestrictionNumber>1</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Triggers</CollectionName> <RestrictionName>TableSchema</RestrictionName> <RestrictionDefault>table_schema</RestrictionDefault> - <RestrictionNumber>1</RestrictionNumber> + <RestrictionNumber>2</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Triggers</CollectionName> <RestrictionName>TableName</RestrictionName> <RestrictionDefault>table_name</RestrictionDefault> - <RestrictionNumber>2</RestrictionNumber> + <RestrictionNumber>3</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Triggers</CollectionName> <RestrictionName>Name</RestrictionName> <RestrictionDefault>trigger_name</RestrictionDefault> - <RestrictionNumber>3</RestrictionNumber> + <RestrictionNumber>4</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Views</CollectionName> <RestrictionName>Catalog</RestrictionName> <RestrictionDefault>view_catalog</RestrictionDefault> - <RestrictionNumber>0</RestrictionNumber> + <RestrictionNumber>1</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Views</CollectionName> <RestrictionName>Schema</RestrictionName> <RestrictionDefault>view_schema</RestrictionDefault> - <RestrictionNumber>1</RestrictionNumber> + <RestrictionNumber>2</RestrictionNumber> </Restrictions> <Restrictions> <CollectionName>Views</CollectionName> <RestrictionName>Name</RestrictionName> <RestrictionDefault>view_name</RestrictionDefault> - <RestrictionNumber>2</RestrictionNumber> + <RestrictionNumber>3</RestrictionNumber> </Restrictions> <DataSourceInformation> <CompositeIdentifierSeparatorPattern>.</CompositeIdentifierSeparatorPattern> Modified: pgsqlclient/source/PostgreSql/Data/Schema/PgColumns.cs =================================================================== --- pgsqlclient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-03-17 15:13:10 UTC (rev 31) +++ pgsqlclient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-03-17 16:50:32 UTC (rev 32) @@ -35,7 +35,10 @@ "numeric_precision, " + "numeric_scale, " + "ordinal_position, " + - "case is_nullable when true then false when false then true AS is_not_null, " + + "case is_nullable " + + "when true then false " + + "when false then true " + + "end AS is_not_null, " + "column_default, " + "character_octet_length, " + "character_set_catalog, " + @@ -43,7 +46,7 @@ "character_set_name, " + "collation_catalog, " + "collation_schema, " + - "collation_name, " + + "collation_name " + "FROM information_schema.columns "; if (restrictions != null && restrictions.Length > 0) Modified: pgsqlclient/source/PostgreSql/Data/Schema/PgIndexes.cs =================================================================== --- pgsqlclient/source/PostgreSql/Data/Schema/PgIndexes.cs 2006-03-17 15:13:10 UTC (rev 31) +++ pgsqlclient/source/PostgreSql/Data/Schema/PgIndexes.cs 2006-03-17 16:50:32 UTC (rev 32) @@ -27,20 +27,19 @@ { string sql = "SELECT " + - "null AS TABLE_CATALOG " + + "null AS TABLE_CATALOG, " + "pg_namespace.nspname AS TABLE_SCHEMA, " + "pg_class.relname AS TABLE_NAME, " + "null AS INDEX_CATALOG, " + "pg_namespidx.nspname AS INDEX_SCHEMA, " + "pg_classidx.relname AS INDEX_NAME, " + "pg_am.amname AS TYPE, " + - "pg_index.indkey AS INDEX_KEY, " + - "pg_index.indisclustered AS CLUSTERED, " + - "pg_index.indisunique AS UNIQUE, " + - "pg_index.indisprimary AS PRIMARY, " + + "pg_index.indisclustered AS IS_CLUSTERED, " + + "pg_index.indisunique AS IS_UNIQUE, " + + "pg_index.indisprimary AS IS_PRIMARY, " + "pg_am.amindexnulls AS ALLOW_NULLS, " + - "pg_am.amcanmulticol AS MULTICOLUMN, " + - "pg_am.amconcurrent AS CONCURRENT, " + + "pg_am.amcanmulticol AS IS_MULTICOLUMN, " + + "pg_am.amconcurrent AS IS_CONCURRENT, " + "pg_description.description AS DESCRIPTION " + "FROM pg_index " + "left join pg_class ON pg_index.indrelid = pg_class.oid " + Modified: pgsqlclient/source/PostgreSql.Data.PostgreSqlClient.suo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |