pgsqlclient-checkins Mailing List for PostgreSqlClient (Page 4)
Status: Inactive
Brought to you by:
carlosga_fb
Menu
▾
▴
pgsqlclient-checkins — Mailing list for CVS commit messages.
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...> - 2006-04-12 13:41:30
|
Revision: 102 Author: carlosga_fb Date: 2006-04-12 06:41:07 -0700 (Wed, 12 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=102&view=rev Log Message: ----------- ?\194?\183 Changes on Connection String parameter handling Modified Paths: -------------- trunk/PostgreSqlClient/source/UnitTests/App.config Modified: trunk/PostgreSqlClient/source/UnitTests/App.config =================================================================== --- trunk/PostgreSqlClient/source/UnitTests/App.config 2006-04-12 13:40:15 UTC (rev 101) +++ trunk/PostgreSqlClient/source/UnitTests/App.config 2006-04-12 13:41:07 UTC (rev 102) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <configuration> <appSettings> - <add key="User" value="postgres" /> + <add key="User" value="" /> <add key="Password" value="" /> - <add key="Database" value="test" /> + <add key="Catalog" value="test" /> <add key="DataSource" value="localhost" /> - <add key="Port" value="5432" /> + <add key="PortNumber" value="5432" /> <add key="Connection lifetime" value="1" /> <add key="Pooling" value="false" /> <add key="Packet Size" value="8192" /> - <add key="SSL" value="false" /> + <add key="SSL" value="true" /> </appSettings> </configuration> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-12 13:40:28
|
Revision: 101 Author: carlosga_fb Date: 2006-04-12 06:40:15 -0700 (Wed, 12 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=101&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/UnitTests/PgBaseTest.cs Modified: trunk/PostgreSqlClient/source/UnitTests/PgBaseTest.cs =================================================================== --- trunk/PostgreSqlClient/source/UnitTests/PgBaseTest.cs 2006-04-12 13:39:37 UTC (rev 100) +++ trunk/PostgreSqlClient/source/UnitTests/PgBaseTest.cs 2006-04-12 13:40:15 UTC (rev 101) @@ -63,10 +63,10 @@ PgConnectionStringBuilder csb = new PgConnectionStringBuilder(); csb.DataSource = ConfigurationManager.AppSettings["DataSource"]; - csb.Database = ConfigurationManager.AppSettings["Database"]; + csb.Catalog = ConfigurationManager.AppSettings["Catalog"]; csb.UserID = ConfigurationManager.AppSettings["User"]; csb.Password = ConfigurationManager.AppSettings["Password"]; - csb.Port = Convert.ToInt32(ConfigurationManager.AppSettings["Port"]); + csb.PortNumber = Convert.ToInt32(ConfigurationManager.AppSettings["PortNumber"]); csb.Ssl = Convert.ToBoolean(ConfigurationManager.AppSettings["SSL"]); csb.Pooling = false; @@ -94,10 +94,10 @@ PgConnectionStringBuilder csb = new PgConnectionStringBuilder(); csb.DataSource = ConfigurationManager.AppSettings["DataSource"]; - csb.Database = ""; + csb.Catalog = ""; csb.UserID = ConfigurationManager.AppSettings["User"]; csb.Password = ConfigurationManager.AppSettings["Password"]; - csb.Port = Convert.ToInt32(ConfigurationManager.AppSettings["Port"]); + csb.PortNumber = Convert.ToInt32(ConfigurationManager.AppSettings["PortNumber"]); csb.Ssl = Convert.ToBoolean(ConfigurationManager.AppSettings["SSL"]); csb.Pooling = false; @@ -118,10 +118,10 @@ PgConnectionStringBuilder csb = new PgConnectionStringBuilder(); csb.DataSource = ConfigurationManager.AppSettings["DataSource"]; - csb.Database = ""; + csb.Catalog = ""; csb.UserID = ConfigurationManager.AppSettings["User"]; csb.Password = ConfigurationManager.AppSettings["Password"]; - csb.Port = Convert.ToInt32(ConfigurationManager.AppSettings["Port"]); + csb.PortNumber = Convert.ToInt32(ConfigurationManager.AppSettings["PortNumber"]); csb.Ssl = Convert.ToBoolean(ConfigurationManager.AppSettings["SSL"]); csb.Pooling = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-12 13:39:55
|
Revision: 100 Author: carlosga_fb Date: 2006-04-12 06:39:37 -0700 (Wed, 12 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=100&view=rev Log Message: ----------- ?\194?\183 Changes on Connection String parameter handling Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.suo Modified: trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln 2006-04-11 20:58:24 UTC (rev 99) +++ trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln 2006-04-12 13:39:37 UTC (rev 100) @@ -9,6 +9,8 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostgreSql.Data.PostgreSqlClient.UnitTests", "UnitTests\PostgreSql.Data.PostgreSqlClient.UnitTests.csproj", "{C45C7BFF-90E8-4ED4-B015-A3CD7774B565}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostgreSql.VisualStudio.DataTools", "PostgreSql\VisualStudio\DataTools\PostgreSql.VisualStudio.DataTools.csproj", "{371E5E40-132D-4CBA-A93A-814B835A44D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -31,6 +33,10 @@ {C45C7BFF-90E8-4ED4-B015-A3CD7774B565}.Debug|Any CPU.Build.0 = Debug|Any CPU {C45C7BFF-90E8-4ED4-B015-A3CD7774B565}.Release|Any CPU.ActiveCfg = Release|Any CPU {C45C7BFF-90E8-4ED4-B015-A3CD7774B565}.Release|Any CPU.Build.0 = Release|Any CPU + {371E5E40-132D-4CBA-A93A-814B835A44D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {371E5E40-132D-4CBA-A93A-814B835A44D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {371E5E40-132D-4CBA-A93A-814B835A44D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {371E5E40-132D-4CBA-A93A-814B835A44D5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/PostgreSqlClient/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. |
|
From: <car...@us...> - 2006-04-11 20:58:30
|
Revision: 99 Author: carlosga_fb Date: 2006-04-11 13:58:24 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=99&view=rev Log Message: ----------- 2006-04-11 Carlos Guzman Alvarez (car...@te...) - Implemented Savepoint support. - Added several changes and bug fixes on database schema support. Modified Paths: -------------- trunk/PostgreSqlClient/changelog.txt Modified: trunk/PostgreSqlClient/changelog.txt =================================================================== --- trunk/PostgreSqlClient/changelog.txt 2006-04-11 20:57:14 UTC (rev 98) +++ trunk/PostgreSqlClient/changelog.txt 2006-04-11 20:58:24 UTC (rev 99) @@ -1,2 +1,9 @@ PostgreSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+ ---------------- - ----------------------------------------- + + +2006-04-11 Carlos Guzman Alvarez (car...@te...) + + - Implemented Savepoint support. + + - Added several changes and bug fixes on database schema support. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 20:57:22
|
Revision: 98 Author: carlosga_fb Date: 2006-04-11 13:57:14 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=98&view=rev Log Message: ----------- 2006-04-11 Carlos Guzman Alvarez (car...@te...) - Implemented Savepoint support. - Added several changes and bug fixes on database schema support. Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnection.cs trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionInternal.cs trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgTransaction.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnection.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnection.cs 2006-04-11 20:15:14 UTC (rev 97) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnection.cs 2006-04-11 20:57:14 UTC (rev 98) @@ -254,7 +254,7 @@ #endregion - #region \xB7 Methods \xB7 + #region \xB7 Begin Transaction Methods \xB7 public new PgTransaction BeginTransaction() { @@ -263,7 +263,7 @@ public new PgTransaction BeginTransaction(IsolationLevel level) { - if (this.state == ConnectionState.Closed) + if (this.State == ConnectionState.Closed) { throw new InvalidOperationException("BeginTransaction requires an open and available Connection."); } @@ -271,7 +271,26 @@ return this.connectionInternal.BeginTransaction(level); } - public override void ChangeDatabase(string db) + public PgTransaction BeginTransaction(string transactionName) + { + return this.BeginTransaction(IsolationLevel.ReadCommitted, transactionName); + } + + public PgTransaction BeginTransaction(IsolationLevel level, string transactionName) + { + if (this.State == ConnectionState.Closed) + { + throw new InvalidOperationException("BeginTransaction requires an open and available Connection."); + } + + return this.connectionInternal.BeginTransaction(level, transactionName); + } + + #endregion + + #region \xB7 Methods \xB7 + + public override void ChangeDatabase(string db) { if (this.state == ConnectionState.Closed) { Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionInternal.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionInternal.cs 2006-04-11 20:15:14 UTC (rev 97) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionInternal.cs 2006-04-11 20:57:14 UTC (rev 98) @@ -154,6 +154,27 @@ return this.activeTransaction; } + public PgTransaction BeginTransaction(IsolationLevel level, string transactionName) + { + if (this.activeTransaction != null && !this.activeTransaction.IsUpdated) + { + throw new InvalidOperationException("A transaction is currently active. Parallel transactions are not supported."); + } + + try + { + this.activeTransaction = new PgTransaction(this.owningConnection, level); + this.activeTransaction.InternalBeginTransaction(); + this.activeTransaction.Save(transactionName); + } + catch (PgClientException ex) + { + throw new PgException(ex.Message, ex); + } + + return this.activeTransaction; + } + public void DisposeActiveTransaction() { // Rollback active transation Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgTransaction.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgTransaction.cs 2006-04-11 20:15:14 UTC (rev 97) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgTransaction.cs 2006-04-11 20:57:14 UTC (rev 98) @@ -137,26 +137,8 @@ #endregion - #region \xB7 Internal Methods \xB7 - - internal void InternalBeginTransaction() - { - try - { - this.connection.InternalConnection.Database.BeginTransaction(isolationLevel); + #region \xB7 DbTransaction Overriden Methods \xB7 - this.IsUpdated = false; - } - catch (PgClientException ex) - { - throw new PgException(ex.Message, ex); - } - } - - #endregion - - #region \xB7 Methods \xB7 - public override void Commit() { this.CheckTransaction(); @@ -191,6 +173,139 @@ #endregion + #region \xB7 SavePoint Methods \xB7 + + /// <include file='Doc/en_EN/FbTransaction.xml' path='doc/class[@name="FbTransaction"]/method[@name="Save(System.String)"]/*'/> + public void Save(string savePointName) + { + lock (this) + { + if (savePointName == null) + { + throw new ArgumentException("No transaction name was be specified."); + } + else + { + if (savePointName.Length == 0) + { + throw new ArgumentException("No transaction name was be specified."); + } + } + if (this.isUpdated) + { + throw new InvalidOperationException("This Transaction has completed; it is no longer usable."); + } + + try + { + PgCommand command = new PgCommand( + "SAVEPOINT " + savePointName, + this.connection, + this); + command.ExecuteNonQuery(); + command.Dispose(); + } + catch (PgClientException ex) + { + throw new PgException(ex.Message, ex); + } + } + } + + /// <include file='Doc/en_EN/FbTransaction.xml' path='doc/class[@name="FbTransaction"]/method[@name="Commit(System.String)"]/*'/> + public void Commit(string savePointName) + { + lock (this) + { + if (savePointName == null) + { + throw new ArgumentException("No transaction name was be specified."); + } + else + { + if (savePointName.Length == 0) + { + throw new ArgumentException("No transaction name was be specified."); + } + } + if (this.isUpdated) + { + throw new InvalidOperationException("This Transaction has completed; it is no longer usable."); + } + + try + { + PgCommand command = new PgCommand( + "RELEASE SAVEPOINT " + savePointName, + this.connection, + this); + command.ExecuteNonQuery(); + command.Dispose(); + } + catch (PgClientException ex) + { + throw new PgException(ex.Message, ex); + } + } + } + + /// <include file='Doc/en_EN/FbTransaction.xml' path='doc/class[@name="FbTransaction"]/method[@name="Rollback(System.String)"]/*'/> + public void Rollback(string savePointName) + { + lock (this) + { + if (savePointName == null) + { + throw new ArgumentException("No transaction name was be specified."); + } + else + { + if (savePointName.Length == 0) + { + throw new ArgumentException("No transaction name was be specified."); + } + } + if (this.isUpdated) + { + throw new InvalidOperationException("This Transaction has completed; it is no longer usable."); + } + + try + { + PgCommand command = new PgCommand( + "ROLLBACK WORK TO SAVEPOINT " + savePointName, + this.connection, + this); + command.ExecuteNonQuery(); + command.Dispose(); + } + catch (PgClientException ex) + { + throw new PgException(ex.Message, ex); + } + } + } + + #endregion + + #region \xB7 Internal Methods \xB7 + + internal void InternalBeginTransaction() + { + try + { + this.connection.InternalConnection.Database.BeginTransaction(isolationLevel); + + this.IsUpdated = false; + } + catch (PgClientException ex) + { + throw new PgException(ex.Message, ex); + } + } + + #endregion + #region \xB7 Private Methods \xB7 private void CheckTransaction() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 20:15:26
|
Revision: 97 Author: carlosga_fb Date: 2006-04-11 13:15:14 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=97&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj 2006-04-11 19:43:43 UTC (rev 96) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj 2006-04-11 20:15:14 UTC (rev 97) @@ -119,6 +119,8 @@ <Compile Include="PgTypes\PgTimeSpan.cs" /> <Compile Include="Schema\PgForeignKeyColumns.cs" /> <Compile Include="Schema\PgForeignKeys.cs" /> + <Compile Include="Schema\PgSequences.cs" /> + <Compile Include="Schema\PgUniqueKeys.cs" /> <Compile Include="Schema\PgViewColumns.cs" /> <Compile Include="Schema\PgViews.cs" /> <Compile Include="Schema\PgCheckConstraints.cs" /> @@ -138,6 +140,10 @@ <EmbeddedResource Include="Resources\ToolBox\PgDataAdapter.bmp" /> </ItemGroup> <ItemGroup> + <Reference Include="SD.LLBLGen.Pro.DBDriverCore, Version=1.0.2005.1, Culture=neutral, PublicKeyToken=ca73b74ba4e3ff27"> + <SpecificVersion>False</SpecificVersion> + <HintPath>C:\Archivos de programa\Solutions Design\LLBLGen Pro\SD.LLBLGen.Pro.DBDriverCore.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Design" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 19:44:01
|
Revision: 96 Author: carlosga_fb Date: 2006-04-11 12:43:43 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=96&view=rev Log Message: ----------- ?\194?\183 Tons of Schema changes and bug fixes Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs Added Paths: ----------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 19:43:43 UTC (rev 96) @@ -189,7 +189,7 @@ </MetaDataCollections> <MetaDataCollections> <CollectionName>PrimaryKeys</CollectionName> - <NumberOfRestrictions>4</NumberOfRestrictions> + <NumberOfRestrictions>3</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> <PopulationMechanism>PrepareCollection</PopulationMechanism> </MetaDataCollections> @@ -212,7 +212,7 @@ <NumberOfRestrictions>0</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> <PopulationMechanism>SQLCommand</PopulationMechanism> - <PopulationString>SELECT current_database() AS SCHEMA_CATALOG, pg_namespace.nspname AS SCHEMA_NAME, pg_shadow.usename AS SCHEMA_OWNER, pg_description.description AS DESCRIPTION FROM pg_namespace left join pg_shadow ON pg_namespace.nspowner = pg_shadow.usesysid left join pg_description ON pg_namespace.oid = pg_description.objoid ORDER BY pg_namespace.nspname, pg_shadow.usename</PopulationString> + <PopulationString>SELECT current_database() AS SCHEMA_CATALOG, pg_namespace.nspname AS SCHEMA_NAME, pg_shadow.usename AS SCHEMA_OWNER, pg_description.description AS DESCRIPTION, CASE WHEN nspname LIKE 'pg\\_temp\\_%%' THEN 1 WHEN (nspname LIKE 'pg\\_%' OR nspname = 'information_schema') THEN 0 ELSE 3 END AS SCHEMA_TYPE FROM pg_namespace left join pg_shadow ON pg_namespace.nspowner = pg_shadow.usesysid left join pg_description ON pg_namespace.oid = pg_description.objoid ORDER BY pg_namespace.nspname, pg_shadow.usename</PopulationString> </MetaDataCollections> <MetaDataCollections> <CollectionName>Sequences</CollectionName> @@ -252,14 +252,20 @@ <NumberOfIdentifierParts>0</NumberOfIdentifierParts> <PopulationMechanism>PrepareCollection</PopulationMechanism> </MetaDataCollections> - <MetaDataCollections> - <CollectionName>Users</CollectionName> - <NumberOfRestrictions>0</NumberOfRestrictions> - <NumberOfIdentifierParts>0</NumberOfIdentifierParts> - <PopulationMechanism>SQLCommand</PopulationMechanism> - <PopulationString>SELECT pg_shadow.usename AS USER_NAME, pg_shadow.usecreatedb AS CREATE_DATABASE, pg_shadow.usesuper AS IS_SUPERUSER, pg_shadow.usecatupd AS UPDATE_SYSCATALOGS, pg_shadow.passwd AS PASSWORD, pg_shadow.useconfig AS CONFIGURATION FROM pg_shadow ORDER BY pg_shadow.usename</PopulationString> - </MetaDataCollections> - <MetaDataCollections> + <MetaDataCollections> + <CollectionName>UniqueKeys</CollectionName> + <NumberOfRestrictions>3</NumberOfRestrictions> + <NumberOfIdentifierParts>0</NumberOfIdentifierParts> + <PopulationMechanism>PrepareCollection</PopulationMechanism> + </MetaDataCollections> + <MetaDataCollections> + <CollectionName>Users</CollectionName> + <NumberOfRestrictions>0</NumberOfRestrictions> + <NumberOfIdentifierParts>0</NumberOfIdentifierParts> + <PopulationMechanism>SQLCommand</PopulationMechanism> + <PopulationString>SELECT pg_shadow.usename AS USER_NAME, pg_shadow.usecreatedb AS CREATE_DATABASE, pg_shadow.usesuper AS IS_SUPERUSER, pg_shadow.usecatupd AS UPDATE_SYSCATALOGS, pg_shadow.passwd AS PASSWORD, pg_shadow.useconfig AS CONFIGURATION FROM pg_shadow ORDER BY pg_shadow.usename</PopulationString> + </MetaDataCollections> + <MetaDataCollections> <CollectionName>Views</CollectionName> <NumberOfRestrictions>3</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> @@ -313,12 +319,6 @@ <RestrictionDefault>column_name</RestrictionDefault> <RestrictionNumber>4</RestrictionNumber> </Restrictions> - <Restrictions> - <CollectionName>PrimaryKeys</CollectionName> - <RestrictionName>Catalog</RestrictionName> - <RestrictionDefault>table_catalog</RestrictionDefault> - <RestrictionNumber>1</RestrictionNumber> - </Restrictions> <Restrictions> <CollectionName>Indexes</CollectionName> <RestrictionName>Catalog</RestrictionName> @@ -536,6 +536,24 @@ <RestrictionNumber>4</RestrictionNumber> </Restrictions> <Restrictions> + <CollectionName>UniqueKeys</CollectionName> + <RestrictionName>Schema</RestrictionName> + <RestrictionDefault>table_catalog</RestrictionDefault> + <RestrictionNumber>1</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>UniqueKeys</CollectionName> + <RestrictionName>Schema</RestrictionName> + <RestrictionDefault>table_schema</RestrictionDefault> + <RestrictionNumber>2</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>UniqueKeys</CollectionName> + <RestrictionName>Table</RestrictionName> + <RestrictionDefault>table_name</RestrictionDefault> + <RestrictionNumber>3</RestrictionNumber> + </Restrictions> + <Restrictions> <CollectionName>Views</CollectionName> <RestrictionName>Catalog</RestrictionName> <RestrictionDefault>view_catalog</RestrictionDefault> Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -133,6 +133,8 @@ } } + schema.AcceptChanges(); + return schema; } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -145,11 +145,13 @@ } } - // CleanUp - selectColumn.Dispose(); + foreignKeyColumns.AcceptChanges(); foreignKeyColumns.Columns.Remove("CONSTRAINT_TABLE_COLUMNS"); foreignKeyColumns.Columns.Remove("REFERENCED_TABLE_COLUMNS"); + // CleanUp + selectColumn.Dispose(); + return foreignKeyColumns; } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -25,6 +25,7 @@ protected override string BuildSql(string[] restrictions) { + string where = ""; string sql = "SELECT " + "current_database() AS FUNCTION_CATALOG, " + @@ -42,7 +43,8 @@ "pg_proc.proretset AS RETURNS_SET, " + "pg_proc.prorettype AS RETURN_TYPE, " + "pg_proc.pronargs AS ARGUMENT_NUMBER, " + - "pg_proc.proargtypes AS ARGUMENTS, " + + "pg_proc.proargtypes AS ARGUMENT_TYPES, " + + "pg_proc.proargtypes AS ARGUMENT_NAMES, " + "pg_proc.prosrc AS SOURCE, " + "pg_description.description AS DESCRIPTION " + "FROM " + @@ -61,17 +63,25 @@ // FUNCTION_SCHEMA if (restrictions.Length > 1 && restrictions[1] != null) { - sql += String.Format(" and pg_namespace.nspname = '{0}'", restrictions[1]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format("pg_namespace.nspname = '{0}'", restrictions[1]); } // FUNCTION_NAME if (restrictions.Length > 2 && restrictions[2] != null) { - sql += String.Format(" and pg_proc.proname = '{0}'", restrictions[2]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format(" and pg_proc.proname = '{0}'", restrictions[2]); } } - sql += " ORDER BY pg_namespace.nspname, pg_proc.proname"; + sql += "WHERE " + where + " ORDER BY pg_namespace.nspname, pg_proc.proname"; return sql; } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -125,6 +125,8 @@ { // CleanUp selectColumn.Dispose(); + + primaryKeyColumns.AcceptChanges(); primaryKeyColumns.Columns.Remove("PK_COLUMNS"); } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -58,7 +58,7 @@ adapter.Fill(dataTable); - this.ProcessResult(connection, dataTable); + dataTable = this.ProcessResult(connection, dataTable); } catch (PgException) { Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -138,6 +138,10 @@ schema = new PgTriggers(); break; + case "uniquekeys": + schema = new PgUniqueKeys(); + break; + case "views": schema = new PgViews(); break; Added: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs (rev 0) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -0,0 +1,138 @@ +/* + * PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+ + * + * The contents of this file are subject to the Initial + * Developer's Public License Version 1.0 (the "License"); + * you may not use this file except in compliance with the + * License. + * + * Software distributed under the License is distributed on + * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either + * express or implied. See the License for the specific + * language governing rights and limitations under the License. + * + * Copyright (c) 2003, 2006 Carlos Guzman Alvarez + * All Rights Reserved. + */ + +using System; +using System.Data; + +using PostgreSql.Data.PostgreSqlClient; + +namespace PostgreSql.Data.Schema +{ + internal sealed class PgUniqueKeys : PgSchema + { + #region \xB7 Protected Methods \xB7 + + protected override string BuildSql(string[] restrictions) + { + string sql = + "SELECT " + + "current_database() AS TABLE_CATALOG, " + + "pg_namespace.nspname AS TABLE_SCHEMA, " + + "pg_class.relname AS TABLE_NAME, " + + "null AS COLUMN_NAME, " + + "pg_constraint.conname AS UK_NAME, " + + "pg_constraint.conkey AS UK_COLUMNS, " + + "pg_description.description AS DESCRIPTION " + + "FROM pg_constraint " + + "left join pg_class ON pg_constraint.conrelid = pg_class.oid " + + "left join pg_namespace ON pg_constraint.connamespace = pg_namespace.oid " + + "left join pg_description ON pg_constraint.oid = pg_description.objoid " + + "WHERE " + + "pg_constraint.contype = 'u' "; + + if (restrictions != null && restrictions.Length > 0) + { + // TABLE_CATALOG + if (restrictions.Length > 0 && restrictions[0] != null) + { + } + + // TABLE_SCHEMA + if (restrictions.Length > 1 && restrictions[1] != null) + { + sql += String.Format(" and pg_namespace.nspname = '{0}'", restrictions[1]); + } + + // TABLE_NAME + if (restrictions.Length > 2 && restrictions[2] != null) + { + sql += String.Format(" and pg_class.relname = '{0}'", restrictions[2]); + } + } + + sql += " ORDER BY pg_namespace.nspname, pg_class.relname, pg_constraint.conname"; + + return sql; + } + + protected override System.Data.DataTable ProcessResult(PostgreSql.Data.PostgreSqlClient.PgConnection connection, System.Data.DataTable schema) + { + DataTable uniqueKeyColumns = schema.Clone(); + string sql = + "SELECT " + + "column_name " + + "FROM information_schema.columns " + + "WHERE " + + "table_catalog=current_database() AND " + + "table_schema=@tableSchema AND " + + "table_name=@tableName AND " + + "ordinal_position=@ordinalPosition"; + + PgCommand selectColumn = new PgCommand(sql, connection); + selectColumn.Parameters.Add("@tableSchema", PgDbType.Text); + selectColumn.Parameters.Add("@tableName", PgDbType.Text); + selectColumn.Parameters.Add("@ordinalPosition", PgDbType.Text); + + try + { + selectColumn.Prepare(); + + foreach (DataRow row in schema.Rows) + { + Array pkColumns = (Array)row["UK_COLUMNS"]; + + for (int i = 0; i < pkColumns.Length; i++) + { + DataRow primaryKeyColumn = uniqueKeyColumns.NewRow(); + + // Grab the table column name + selectColumn.Parameters["@tableSchema"].Value = row["TABLE_SCHEMA"]; + selectColumn.Parameters["@tableName"].Value = row["TABLE_NAME"]; + selectColumn.Parameters["@ordinalPosition"].Value = Convert.ToInt16(pkColumns.GetValue(i + 1)); + + string pkColumnName = (string)selectColumn.ExecuteScalar(); + + // Create the new primary key column info + primaryKeyColumn["TABLE_CATALOG"] = row["TABLE_CATALOG"]; + primaryKeyColumn["TABLE_SCHEMA"] = row["TABLE_SCHEMA"]; + primaryKeyColumn["TABLE_NAME"] = row["TABLE_NAME"]; + primaryKeyColumn["COLUMN_NAME"] = pkColumnName; + primaryKeyColumn["DESCRIPTION"] = row["DESCRIPTION"]; + + uniqueKeyColumns.Rows.Add(primaryKeyColumn); + } + } + } + catch + { + throw; + } + finally + { + // CleanUp + selectColumn.Dispose(); + + uniqueKeyColumns.AcceptChanges(); + uniqueKeyColumns.Columns.Remove("UK_COLUMNS"); + } + + return uniqueKeyColumns; + } + + #endregion + } +} Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs 2006-04-11 17:25:08 UTC (rev 95) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs 2006-04-11 19:43:43 UTC (rev 96) @@ -30,7 +30,8 @@ "current_database() AS VIEW_CATALOG, " + "pg_namespace.nspname AS VIEW_SCHEMA, " + "pg_class.relname AS VIEW_NAME, " + - "pg_attribute.attname AS COLUMN_NAME " + + "pg_attribute.attname AS COLUMN_NAME, " + + "pg_attribute.attnum AS ORDINAL_POSITION " + "FROM " + "pg_class " + "left join pg_namespace ON pg_class.relnamespace = pg_namespace.oid " + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 17:25:23
|
Revision: 95 Author: carlosga_fb Date: 2006-04-11 10:25:08 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=95&view=rev Log Message: ----------- ?\194?\183 More Database Schema Fixes Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 17:24:10 UTC (rev 94) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 17:25:08 UTC (rev 95) @@ -797,7 +797,7 @@ <DbType>15</DbType> </DataTypes> <DataTypes> - <TypeName>char</TypeName> + <TypeName>character</TypeName> <ProviderDbType>5</ProviderDbType> <ColumnSize>2147483647</ColumnSize> <CreateFormat /> @@ -822,7 +822,7 @@ <DbType>16</DbType> </DataTypes> <DataTypes> - <TypeName>varchar</TypeName> + <TypeName>character varying</TypeName> <ProviderDbType>27</ProviderDbType> <ColumnSize>2147483647</ColumnSize> <CreateFormat /> @@ -872,7 +872,7 @@ <DbType>16</DbType> </DataTypes> <DataTypes> - <TypeName>binary</TypeName> + <TypeName>bytea</TypeName> <ProviderDbType>1</ProviderDbType> <ColumnSize>2147483647</ColumnSize> <CreateFormat /> @@ -922,7 +922,7 @@ <DbType>6</DbType> </DataTypes> <DataTypes> - <TypeName>time</TypeName> + <TypeName>timestamp without time zone</TypeName> <ProviderDbType>23</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> @@ -947,7 +947,7 @@ <DbType>6</DbType> </DataTypes> <DataTypes> - <TypeName>time(tz)</TypeName> + <TypeName>time with time zone</TypeName> <ProviderDbType>24</ProviderDbType> <ColumnSize>12</ColumnSize> <CreateFormat /> @@ -972,7 +972,7 @@ <DbType>6</DbType> </DataTypes> <DataTypes> - <TypeName>timestamp</TypeName> + <TypeName>timestamp without time zone</TypeName> <ProviderDbType>25</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> @@ -997,7 +997,7 @@ <DbType>6</DbType> </DataTypes> <DataTypes> - <TypeName>timestamp(tz)</TypeName> + <TypeName>timestamp with time zone</TypeName> <ProviderDbType>26</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 17:24:10 UTC (rev 94) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 17:25:08 UTC (rev 95) @@ -16,6 +16,8 @@ */ using System; +using System.Data; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { @@ -33,6 +35,7 @@ "table_name, " + "column_name, " + "data_type, " + + "0 AS COLUMN_SIZE, " + "numeric_precision, " + "numeric_scale, " + "ordinal_position, " + @@ -41,14 +44,18 @@ "when 'YES' then true " + "end AS is_nullable, " + "column_default, " + + "character_maximum_length AS CHARACTER_LENGTH, " + "character_octet_length, " + "character_set_catalog, " + "character_set_schema, " + "character_set_name, " + "collation_catalog, " + "collation_schema, " + - "collation_name " + - "FROM information_schema.columns "; + "collation_name, " + + "domain_catalog, " + + "domain_schema, " + + "domain_name " + + "FROM information_schema.columns "; if (restrictions != null && restrictions.Length > 0) { @@ -98,6 +105,37 @@ return sql; } + protected override DataTable ProcessResult(PgConnection connection, DataTable schema) + { + DataTable dataTypes = connection.GetSchema("DataTypes"); + + foreach (DataRow column in schema.Rows) + { + switch (column["DATA_TYPE"].ToString()) + { + case "text": + column["COLUMN_SIZE"] = column["CHARACTER_OCTET_LENGTH"]; + break; + + case "character": + case "character variying": + column["COLUMN_SIZE"] = column["CHARACTER_LENGTH"]; + break; + + default: + dataTypes.DefaultView.RowFilter = String.Format("TypeName='{0}'", column["COLUMN_NAME"]); + + if (dataTypes.DefaultView.Count == 1) + { + column["COLUMN_SIZE"] = dataTypes.DefaultView[0]["ColumnSize"]; + } + break; + } + } + + return schema; + } + #endregion } } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs 2006-04-11 17:24:10 UTC (rev 94) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs 2006-04-11 17:25:08 UTC (rev 95) @@ -147,6 +147,8 @@ // CleanUp selectColumn.Dispose(); + foreignKeyColumns.Columns.Remove("CONSTRAINT_TABLE_COLUMNS"); + foreignKeyColumns.Columns.Remove("REFERENCED_TABLE_COLUMNS"); return foreignKeyColumns; } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs 2006-04-11 17:24:10 UTC (rev 94) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs 2006-04-11 17:25:08 UTC (rev 95) @@ -16,7 +16,10 @@ */ using System; +using System.Data; +using PostgreSql.Data.PostgreSqlClient; + namespace PostgreSql.Data.Schema { internal sealed class PgPrimaryKeys : PgSchema @@ -29,8 +32,9 @@ "SELECT " + "current_database() AS TABLE_CATALOG, " + "pg_namespace.nspname AS TABLE_SCHEMA, " + - "pg_class.relname AS TABLE_NAME, " + - "pg_constraint.conname AS PK_NAME, " + + "pg_class.relname AS TABLE_NAME, " + + "null AS COLUMN_NAME, " + + "pg_constraint.conname AS PK_NAME, " + "pg_constraint.conkey AS PK_COLUMNS, " + "pg_description.description AS DESCRIPTION " + "FROM pg_constraint " + @@ -65,6 +69,68 @@ return sql; } + protected override System.Data.DataTable ProcessResult(PostgreSql.Data.PostgreSqlClient.PgConnection connection, System.Data.DataTable schema) + { + DataTable primaryKeyColumns = schema.Clone(); + string sql = + "SELECT " + + "column_name " + + "FROM information_schema.columns " + + "WHERE " + + "table_catalog=current_database() AND " + + "table_schema=@tableSchema AND " + + "table_name=@tableName AND " + + "ordinal_position=@ordinalPosition"; + + PgCommand selectColumn = new PgCommand(sql, connection); + selectColumn.Parameters.Add("@tableSchema", PgDbType.Text); + selectColumn.Parameters.Add("@tableName", PgDbType.Text); + selectColumn.Parameters.Add("@ordinalPosition", PgDbType.Text); + + try + { + selectColumn.Prepare(); + + foreach (DataRow row in schema.Rows) + { + Array pkColumns = (Array)row["PK_COLUMNS"]; + + for (int i = 0; i < pkColumns.Length; i++) + { + DataRow primaryKeyColumn = primaryKeyColumns.NewRow(); + + // Grab the table column name + selectColumn.Parameters["@tableSchema"].Value = row["TABLE_SCHEMA"]; + selectColumn.Parameters["@tableName"].Value = row["TABLE_NAME"]; + selectColumn.Parameters["@ordinalPosition"].Value = Convert.ToInt16(pkColumns.GetValue(i + 1)); + + string pkColumnName = (string)selectColumn.ExecuteScalar(); + + // Create the new primary key column info + primaryKeyColumn["TABLE_CATALOG"] = row["TABLE_CATALOG"]; + primaryKeyColumn["TABLE_SCHEMA"] = row["TABLE_SCHEMA"]; + primaryKeyColumn["TABLE_NAME"] = row["TABLE_NAME"]; + primaryKeyColumn["COLUMN_NAME"] = pkColumnName; + primaryKeyColumn["DESCRIPTION"] = row["DESCRIPTION"]; + + primaryKeyColumns.Rows.Add(primaryKeyColumn); + } + } + } + catch + { + throw; + } + finally + { + // CleanUp + selectColumn.Dispose(); + primaryKeyColumns.Columns.Remove("PK_COLUMNS"); + } + + return primaryKeyColumns; + } + #endregion } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 17:24:34
|
Revision: 94 Author: carlosga_fb Date: 2006-04-11 10:24:10 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=94&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/UnitTests/PgDatabaseSchemaTest.cs Modified: trunk/PostgreSqlClient/source/UnitTests/PgDatabaseSchemaTest.cs =================================================================== --- trunk/PostgreSqlClient/source/UnitTests/PgDatabaseSchemaTest.cs 2006-04-11 15:00:09 UTC (rev 93) +++ trunk/PostgreSqlClient/source/UnitTests/PgDatabaseSchemaTest.cs 2006-04-11 17:24:10 UTC (rev 94) @@ -142,6 +142,12 @@ } [Test] + public void Sequences() + { + DataTable sequences = Connection.GetSchema("Sequences"); + } + + [Test] public void SqlLanguages() { DataTable sqlLanguages = Connection.GetSchema("SqlLanguages"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 15:00:17
|
Revision: 93 Author: carlosga_fb Date: 2006-04-11 08:00:09 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=93&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgParameter.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgParameter.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgParameter.cs 2006-04-11 14:59:40 UTC (rev 92) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgParameter.cs 2006-04-11 15:00:09 UTC (rev 93) @@ -469,7 +469,7 @@ private DbType PgDbTypeToDbType(PgDbType PgDbType) { - switch(this.providerType) + switch (this.providerType) { case PgDbType.Boolean: return DbType.Boolean; @@ -520,7 +520,7 @@ private PgDbType DbTypeToPgType(DbType dbType) { - switch(dbType) + switch (dbType) { case DbType.Byte: return PgDbType.Byte; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 14:59:46
|
Revision: 92 Author: carlosga_fb Date: 2006-04-11 07:59:40 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=92&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionStringBuilder.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionStringBuilder.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionStringBuilder.cs 2006-04-11 14:59:22 UTC (rev 91) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSqlClient/PgConnectionStringBuilder.cs 2006-04-11 14:59:40 UTC (rev 92) @@ -31,10 +31,10 @@ set { this["Data Source"] = value; } } - public string Database + public string Catalog { - get { return this.GetString("Database"); } - set { this["Database"] = value; } + get { return this.GetString("Catalog"); } + set { this["Catalog"] = value; } } public string UserID This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 14:59:29
|
Revision: 91 Author: carlosga_fb Date: 2006-04-11 07:59:22 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=91&view=rev Log Message: ----------- ?\194?\183 Database Schema Fixes Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 14:56:02 UTC (rev 90) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 14:59:22 UTC (rev 91) @@ -59,7 +59,7 @@ { where += " and "; } - where += String.Format(" and table_catalog = '{0}'", restrictions[0]); + where += String.Format("table_catalog = '{0}'", restrictions[0]); } // TABLE_SCHEMA @@ -69,7 +69,7 @@ { where += " and "; } - where += String.Format(" and table_schema = '{0}'", restrictions[1]); + where += String.Format("table_schema = '{0}'", restrictions[1]); } // TABLE_NAME @@ -79,7 +79,7 @@ { where += " and "; } - where += String.Format(" and table_name = '{0}'", restrictions[2]); + where += String.Format("table_name = '{0}'", restrictions[2]); } // COLUMN_NAME @@ -89,7 +89,7 @@ { where += " and "; } - where += String.Format(" and column_name = '{0}'", restrictions[3]); + where += String.Format("column_name = '{0}'", restrictions[3]); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 14:56:15
|
Revision: 90 Author: carlosga_fb Date: 2006-04-11 07:56:02 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=90&view=rev Log Message: ----------- ?\194?\183 Database Schema Fixes Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 12:43:34 UTC (rev 89) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-04-11 14:56:02 UTC (rev 90) @@ -25,6 +25,7 @@ protected override string BuildSql(string[] restrictions) { + string where = ""; string sql = "SELECT " + "table_catalog, " + @@ -54,29 +55,45 @@ // TABLE_CATALOG if (restrictions.Length > 0 && restrictions[0] != null) { - sql += String.Format(" and table_catalog = '{0}'", restrictions[0]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format(" and table_catalog = '{0}'", restrictions[0]); } // TABLE_SCHEMA if (restrictions.Length > 1 && restrictions[1] != null) { - sql += String.Format(" and table_schema = '{0}'", restrictions[1]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format(" and table_schema = '{0}'", restrictions[1]); } // TABLE_NAME if (restrictions.Length > 2 && restrictions[2] != null) { - sql += String.Format(" and table_name = '{0}'", restrictions[2]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format(" and table_name = '{0}'", restrictions[2]); } // COLUMN_NAME if (restrictions.Length > 3 && restrictions[3] != null) { - sql += String.Format(" and column_name = '{0}'", restrictions[3]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format(" and column_name = '{0}'", restrictions[3]); } } - sql += " ORDER BY table_catalog, table_schema, table_name, ordinal_position"; + sql += "WHERE " + where + " ORDER BY table_catalog, table_schema, table_name, ordinal_position"; return sql; } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-04-11 12:43:34 UTC (rev 89) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-04-11 14:56:02 UTC (rev 90) @@ -25,6 +25,7 @@ protected override string BuildSql(string[] restrictions) { + string where = ""; string sql = "SELECT " + "current_database() AS TABLE_CATALOG, " + @@ -48,44 +49,69 @@ "left join pg_tablespace ON pg_class.reltablespace = pg_tablespace.oid " + "left join pg_description ON pg_class.oid = pg_description.objoid "; - if (restrictions != null && restrictions.Length > 0) - { - // TABLE_CATALOG - if (restrictions.Length > 0 && restrictions[0] != null) - { - } + sql += "WHERE "; - // TABLE_SCHEMA - if (restrictions.Length > 1 && restrictions[1] != null) - { - sql += String.Format(" and pg_namespace.nspname = '{0}'", restrictions[1]); - } + if (restrictions != null && restrictions.Length > 0) + { + // TABLE_CATALOG + if (restrictions.Length > 0 && restrictions[0] != null) + { + } - // TABLE_NAME - if (restrictions.Length > 2 && restrictions[2] != null) - { - sql += String.Format(" and pg_class.relname = '{0}'", restrictions[2]); - } + // TABLE_SCHEMA + if (restrictions.Length > 1 && restrictions[1] != null) + { + if (where.Length > 0) + { + where += " and "; + } + where += String.Format("pg_namespace.nspname = '{0}'", restrictions[1]); + } - // TABLE_TYPE - if (restrictions.Length > 3 && restrictions[3] != null) - { - sql += String.Format(" and pg_class.relkind = '{0}'", restrictions[3]); - } + // TABLE_NAME + if (restrictions.Length > 2 && restrictions[2] != null) + { + if (where.Length > 0) + { + where += " and "; + } + where += String.Format("pg_class.relname = '{0}'", restrictions[2]); + } + // TABLE_TYPE + if (restrictions.Length > 3 && restrictions[3] != null) + { + if (where.Length > 0) + { + where += " and "; + } + where += String.Format("pg_class.relkind = '{0}'", restrictions[3]); + } + else + { + if (where.Length > 0) + { + where += " and "; + } + where += "pg_class.relkind = 'r'"; + } + // TABLESPACE if (restrictions.Length > 4 && restrictions[4] != null) { - sql += String.Format(" and pg_tablespace.spcname = '{0}'", restrictions[4]); + if (where.Length > 0) + { + where += " and "; + } + where += String.Format("pg_tablespace.spcname = '{0}'", restrictions[4]); } } - - if (restrictions != null && (restrictions.Length < 4 || restrictions[3] == null)) + else { - sql += "WHERE pg_class.relkind = 'r' "; + where += " pg_class.relkind = 'r'"; } - sql += " ORDER BY pg_class.relkind, pg_namespace.nspname, pg_class.relname"; + sql += where + " ORDER BY pg_class.relkind, pg_namespace.nspname, pg_class.relname"; return sql; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 12:43:49
|
Revision: 89 Author: carlosga_fb Date: 2006-04-11 05:43:34 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=89&view=rev Log Message: ----------- ?\194?\183 Added new schema for PostgreSQL tablespaces Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 12:05:45 UTC (rev 88) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 12:43:34 UTC (rev 89) @@ -229,7 +229,7 @@ </MetaDataCollections> <MetaDataCollections> <CollectionName>Tables</CollectionName> - <NumberOfRestrictions>4</NumberOfRestrictions> + <NumberOfRestrictions>5</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> <PopulationMechanism>PrepareCollection</PopulationMechanism> </MetaDataCollections> @@ -241,9 +241,10 @@ </MetaDataCollections> <MetaDataCollections> <CollectionName>TableSpaces</CollectionName> - <NumberOfRestrictions>2</NumberOfRestrictions> + <NumberOfRestrictions>0</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> - <PopulationMechanism>PrepareCollection</PopulationMechanism> + <PopulationMechanism>SQLCommand</PopulationMechanism> + <PopulationString>SELECT spcname as TABLESPACE_NAME from pg_tablespace</PopulationString> </MetaDataCollections> <MetaDataCollections> <CollectionName>Triggers</CollectionName> @@ -505,6 +506,12 @@ <RestrictionNumber>4</RestrictionNumber> </Restrictions> <Restrictions> + <CollectionName>Tables</CollectionName> + <RestrictionName>Tablespace</RestrictionName> + <RestrictionDefault>tablespace</RestrictionDefault> + <RestrictionNumber>5</RestrictionNumber> + </Restrictions> + <Restrictions> <CollectionName>Triggers</CollectionName> <RestrictionName>TableCatalog</RestrictionName> <RestrictionDefault>table_catalog</RestrictionDefault> Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs 2006-04-11 12:05:45 UTC (rev 88) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs 2006-04-11 12:43:34 UTC (rev 89) @@ -126,6 +126,10 @@ schema = new PgPrimaryKeys(); break; + case "sequences": + schema = new PgSequences(); + break; + case "tables": schema = new PgTables(); break; Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-04-11 12:05:45 UTC (rev 88) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-04-11 12:43:34 UTC (rev 89) @@ -34,6 +34,7 @@ "when 'r' THEN 'TABLE' " + "when 'v' THEN 'VIEW' " + "END AS TABLE_TYPE, " + + "pg_tablespace.spcname AS TABLESPACE, " + "pg_class.relhasindex AS HAS_INDEXES, " + "pg_class.relisshared AS IS_SHARED, " + "pg_class.relchecks AS CONSTRAINT_COUNT, " + @@ -44,6 +45,7 @@ "pg_description.description AS DESCRIPTION " + "FROM pg_class " + "left join pg_namespace ON pg_class.relnamespace = pg_namespace.oid " + + "left join pg_tablespace ON pg_class.reltablespace = pg_tablespace.oid " + "left join pg_description ON pg_class.oid = pg_description.objoid "; if (restrictions != null && restrictions.Length > 0) @@ -70,9 +72,15 @@ { sql += String.Format(" and pg_class.relkind = '{0}'", restrictions[3]); } - } - if (restrictions.Length < 4 || restrictions[3] == null) + // TABLESPACE + if (restrictions.Length > 4 && restrictions[4] != null) + { + sql += String.Format(" and pg_tablespace.spcname = '{0}'", restrictions[4]); + } + } + + if (restrictions != null && (restrictions.Length < 4 || restrictions[3] == null)) { sql += "WHERE pg_class.relkind = 'r' "; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 12:05:57
|
Revision: 88 Author: carlosga_fb Date: 2006-04-11 05:05:45 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=88&view=rev Log Message: ----------- ?\194?\183 Fixed bug on relkind handling Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-04-11 12:05:09 UTC (rev 87) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-04-11 12:05:45 UTC (rev 88) @@ -25,28 +25,27 @@ protected override string BuildSql(string[] restrictions) { - string sql = - "SELECT " + + string sql = + "SELECT " + "current_database() AS TABLE_CATALOG, " + - "pg_namespace.nspname AS TABLE_SCHEMA, " + - "pg_class.relname AS TABLE_NAME, " + - "case pg_class.relkind " + - "when 'r' THEN 'TABLE' " + - "when 'v' THEN 'VIEW' " + - "END AS TABLE_TYPE, " + - "pg_class.relhasindex AS HAS_INDEXES, " + - "pg_class.relisshared AS IS_SHARED, " + - "pg_class.relchecks AS CONSTRAINT_COUNT, " + - "pg_class.reltriggers AS TRIGGER_COUNT, " + - "pg_class.relhaspkey AS HAS_PRIMARY_KEY, " + - "pg_class.relhasrules AS HAS_RULES, " + - "pg_class.relhassubclass AS HAS_SUBCLASS, " + - "pg_description.description AS DESCRIPTION "+ - "FROM pg_class " + - "left join pg_namespace ON pg_class.relnamespace = pg_namespace.oid " + - "left join pg_description ON pg_class.oid = pg_description.objoid " + - "WHERE pg_class.relkind = 'r' "; - + "pg_namespace.nspname AS TABLE_SCHEMA, " + + "pg_class.relname AS TABLE_NAME, " + + "case pg_class.relkind " + + "when 'r' THEN 'TABLE' " + + "when 'v' THEN 'VIEW' " + + "END AS TABLE_TYPE, " + + "pg_class.relhasindex AS HAS_INDEXES, " + + "pg_class.relisshared AS IS_SHARED, " + + "pg_class.relchecks AS CONSTRAINT_COUNT, " + + "pg_class.reltriggers AS TRIGGER_COUNT, " + + "pg_class.relhaspkey AS HAS_PRIMARY_KEY, " + + "pg_class.relhasrules AS HAS_RULES, " + + "pg_class.relhassubclass AS HAS_SUBCLASS, " + + "pg_description.description AS DESCRIPTION " + + "FROM pg_class " + + "left join pg_namespace ON pg_class.relnamespace = pg_namespace.oid " + + "left join pg_description ON pg_class.oid = pg_description.objoid "; + if (restrictions != null && restrictions.Length > 0) { // TABLE_CATALOG @@ -73,6 +72,11 @@ } } + if (restrictions.Length < 4 || restrictions[3] == null) + { + sql += "WHERE pg_class.relkind = 'r' "; + } + sql += " ORDER BY pg_class.relkind, pg_namespace.nspname, pg_class.relname"; return sql; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-11 12:05:24
|
Revision: 87 Author: carlosga_fb Date: 2006-04-11 05:05:09 -0700 (Tue, 11 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=87&view=rev Log Message: ----------- ?\194?\183 Added new schema implementation for PostgreSQL Sequences Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml Added Paths: ----------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-09 12:40:05 UTC (rev 86) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-04-11 12:05:09 UTC (rev 87) @@ -214,7 +214,13 @@ <PopulationMechanism>SQLCommand</PopulationMechanism> <PopulationString>SELECT current_database() AS SCHEMA_CATALOG, pg_namespace.nspname AS SCHEMA_NAME, pg_shadow.usename AS SCHEMA_OWNER, pg_description.description AS DESCRIPTION FROM pg_namespace left join pg_shadow ON pg_namespace.nspowner = pg_shadow.usesysid left join pg_description ON pg_namespace.oid = pg_description.objoid ORDER BY pg_namespace.nspname, pg_shadow.usename</PopulationString> </MetaDataCollections> - <MetaDataCollections> + <MetaDataCollections> + <CollectionName>Sequences</CollectionName> + <NumberOfRestrictions>3</NumberOfRestrictions> + <NumberOfIdentifierParts>0</NumberOfIdentifierParts> + <PopulationMechanism>PrepareCollection</PopulationMechanism> + </MetaDataCollections> + <MetaDataCollections> <CollectionName>SqlLanguages</CollectionName> <NumberOfRestrictions>0</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> @@ -233,7 +239,13 @@ <NumberOfIdentifierParts>0</NumberOfIdentifierParts> <PopulationMechanism>PrepareCollection</PopulationMechanism> </MetaDataCollections> - <MetaDataCollections> + <MetaDataCollections> + <CollectionName>TableSpaces</CollectionName> + <NumberOfRestrictions>2</NumberOfRestrictions> + <NumberOfIdentifierParts>0</NumberOfIdentifierParts> + <PopulationMechanism>PrepareCollection</PopulationMechanism> + </MetaDataCollections> + <MetaDataCollections> <CollectionName>Triggers</CollectionName> <NumberOfRestrictions>4</NumberOfRestrictions> <NumberOfIdentifierParts>0</NumberOfIdentifierParts> @@ -450,7 +462,25 @@ <RestrictionDefault>table_name</RestrictionDefault> <RestrictionNumber>3</RestrictionNumber> </Restrictions> - <Restrictions> + <Restrictions> + <CollectionName>Sequences</CollectionName> + <RestrictionName>Catalog</RestrictionName> + <RestrictionDefault>sequence_catalog</RestrictionDefault> + <RestrictionNumber>1</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>Sequences</CollectionName> + <RestrictionName>Schema</RestrictionName> + <RestrictionDefault>sequence_schema</RestrictionDefault> + <RestrictionNumber>2</RestrictionNumber> + </Restrictions> + <Restrictions> + <CollectionName>Sequences</CollectionName> + <RestrictionName>Name</RestrictionName> + <RestrictionDefault>sequence_name</RestrictionDefault> + <RestrictionNumber>3</RestrictionNumber> + </Restrictions> + <Restrictions> <CollectionName>Tables</CollectionName> <RestrictionName>Catalog</RestrictionName> <RestrictionDefault>table_catalog</RestrictionDefault> Added: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs (rev 0) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs 2006-04-11 12:05:09 UTC (rev 87) @@ -0,0 +1,66 @@ +/* + * PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+ + * + * The contents of this file are subject to the Initial + * Developer's Public License Version 1.0 (the "License"); + * you may not use this file except in compliance with the + * License. + * + * Software distributed under the License is distributed on + * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either + * express or implied. See the License for the specific + * language governing rights and limitations under the License. + * + * Copyright (c) 2003, 2006 Carlos Guzman Alvarez + * All Rights Reserved. + */ + +using System; + +namespace PostgreSql.Data.Schema +{ + internal class PgSequences : PgSchema + { + #region \xB7 Protected Methods \xB7 + + protected override string BuildSql(string[] restrictions) + { + string sql = + "SELECT " + + "current_database() AS SEQUENCE_CATALOG, " + + "pg_namespace.nspname AS SEQUENCE_SCHEMA, " + + "pg_class.relname AS SEQUENCE_NAME, " + + "pg_description.description AS DESCRIPTION " + + "FROM pg_class " + + "left join pg_namespace ON pg_class.relnamespace = pg_namespace.oid " + + "left join pg_description ON pg_class.oid = pg_description.objoid " + + "WHERE pg_class.relkind = 'S' "; + + if (restrictions != null && restrictions.Length > 0) + { + // SEQUENCE_CATALOG + if (restrictions.Length > 0 && restrictions[0] != null) + { + } + + // SEQUENCE_SCHEMA + if (restrictions.Length > 1 && restrictions[1] != null) + { + sql += String.Format(" and pg_namespace.nspname = '{0}'", restrictions[1]); + } + + // SEQUENCE_NAME + if (restrictions.Length > 2 && restrictions[2] != null) + { + sql += String.Format(" and pg_class.relname = '{0}'", restrictions[2]); + } + } + + sql += " ORDER BY pg_namespace.nspname, pg_class.relname"; + + return sql; + } + + #endregion + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-09 12:40:29
|
Revision: 86 Author: carlosga_fb Date: 2006-04-09 05:40:05 -0700 (Sun, 09 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=86&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj 2006-04-09 12:39:24 UTC (rev 85) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/PostgreSql.Data.PostgreSqlClient.csproj 2006-04-09 12:40:05 UTC (rev 86) @@ -154,12 +154,6 @@ <EmbeddedResource Include="Schema\MetaData.xml" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\SecureSocketLayer\SecureSocketLayer.csproj"> - <Project>{8CA6C4CF-1737-4680-8AC7-4D34E3CC35DE}</Project> - <Name>SecureSocketLayer</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> <None Include="PostgreSql.Data.PostgreSqlClient.snk" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-09 12:39:34
|
Revision: 85 Author: carlosga_fb Date: 2006-04-09 05:39:24 -0700 (Sun, 09 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=85&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Properties/AssemblyInfo.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Properties/AssemblyInfo.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Properties/AssemblyInfo.cs 2006-04-09 12:38:47 UTC (rev 84) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Properties/AssemblyInfo.cs 2006-04-09 12:39:24 UTC (rev 85) @@ -29,5 +29,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2")] -[assembly: AssemblyFileVersion("2")] +[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyFileVersion("2.0.0.0")] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-04-09 12:39:11
|
Revision: 84 Author: carlosga_fb Date: 2006-04-09 05:38:47 -0700 (Sun, 09 Apr 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=84&view=rev Log Message: ----------- Allow the Database to be specified as Catalog in the connection string Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Protocol/PgConnectionOptions.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Protocol/PgConnectionOptions.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Protocol/PgConnectionOptions.cs 2006-03-29 13:33:51 UTC (rev 83) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Protocol/PgConnectionOptions.cs 2006-04-09 12:38:47 UTC (rev 84) @@ -155,6 +155,7 @@ break; case "database": + case "catalog": this.database = element.Groups[2].Value.Trim(); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-03-29 13:33:58
|
Revision: 83 Author: carlosga_fb Date: 2006-03-29 05:33:51 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=83&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/readme.txt Modified: trunk/PostgreSqlClient/readme.txt =================================================================== --- trunk/PostgreSqlClient/readme.txt 2006-03-29 13:30:42 UTC (rev 82) +++ trunk/PostgreSqlClient/readme.txt 2006-03-29 13:33:51 UTC (rev 83) @@ -7,7 +7,7 @@ The ADO.NET Data Provider source code and the NUnit Test suite are released under the terms of the Initial Developer's PUBLIC LICENSE Version 1.0 -Ssl/Tle implementation source code is released under the terms of the +Ssl/Tls implementation source code is released under the terms of the Mit/X11 license. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-03-29 13:31:01
|
Revision: 82 Author: carlosga_fb Date: 2006-03-29 05:30:42 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=82&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/readme.txt Modified: trunk/PostgreSqlClient/readme.txt =================================================================== --- trunk/PostgreSqlClient/readme.txt 2006-03-29 13:26:26 UTC (rev 81) +++ trunk/PostgreSqlClient/readme.txt 2006-03-29 13:30:42 UTC (rev 82) @@ -1,28 +1,16 @@ -PgSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+ -------------------------------------------------------- +PostgreSqlClient - ADO.NET Data Provider for PostgreSQL 7.4+ +---------------- - ----------------------------------------- Licenses -------- -PostgreSql.Data.PgSqlClient and PgSqlClient.Data.PgSqlClient.UnitTest -source code is released under the terms of the LGPL license -(http://www.opensource.org/licenses/lgpl-license.php). +The ADO.NET Data Provider source code and the NUnit Test suite are released under +the terms of the Initial Developer's PUBLIC LICENSE Version 1.0 -Mono.Security.Protocol.Tls source code is released under the terms of the +Ssl/Tle implementation source code is released under the terms of the Mit/X11 license. -(http://www.opensource.org/licenses/mit-license.php) -Copys of both licenses can be found with this package: - PostgreSql.Data.PgSqlClient.License.txt (LGPL) - PostgreSql.Data.PgSqlClient.License.html(LGPL) - -and - - Mono.Security.Protocol.Tls.License.txt (MIT/X11) - - - Developement list ----------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-03-29 13:26:46
|
Revision: 81 Author: carlosga_fb Date: 2006-03-29 05:26:26 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=81&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.suo Modified: trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln 2006-03-29 13:25:02 UTC (rev 80) +++ trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.sln 2006-03-29 13:26:26 UTC (rev 81) @@ -7,8 +7,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecureSocketLayerTest", "SecureSocketLayerTest\SecureSocketLayerTest.csproj", "{7AFCAB88-9EA7-4263-B339-AB9A05C1C600}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{7B05AD5A-05E4-4E41-B6B9-25D5F73D9235}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostgreSql.Data.PostgreSqlClient.UnitTests", "UnitTests\PostgreSql.Data.PostgreSqlClient.UnitTests.csproj", "{C45C7BFF-90E8-4ED4-B015-A3CD7774B565}" EndProject Global @@ -29,10 +27,6 @@ {7AFCAB88-9EA7-4263-B339-AB9A05C1C600}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AFCAB88-9EA7-4263-B339-AB9A05C1C600}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AFCAB88-9EA7-4263-B339-AB9A05C1C600}.Release|Any CPU.Build.0 = Release|Any CPU - {7B05AD5A-05E4-4E41-B6B9-25D5F73D9235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B05AD5A-05E4-4E41-B6B9-25D5F73D9235}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B05AD5A-05E4-4E41-B6B9-25D5F73D9235}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B05AD5A-05E4-4E41-B6B9-25D5F73D9235}.Release|Any CPU.Build.0 = Release|Any CPU {C45C7BFF-90E8-4ED4-B015-A3CD7774B565}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C45C7BFF-90E8-4ED4-B015-A3CD7774B565}.Debug|Any CPU.Build.0 = Debug|Any CPU {C45C7BFF-90E8-4ED4-B015-A3CD7774B565}.Release|Any CPU.ActiveCfg = Release|Any CPU Modified: trunk/PostgreSqlClient/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. |
|
From: <car...@us...> - 2006-03-29 13:25:19
|
Revision: 80 Author: carlosga_fb Date: 2006-03-29 05:25:02 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=80&view=rev Log Message: ----------- Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql.Data.PostgreSqlClient.suo Modified: trunk/PostgreSqlClient/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. |
|
From: <car...@us...> - 2006-03-29 13:24:05
|
Revision: 79 Author: carlosga_fb Date: 2006-03-29 05:23:54 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=79&view=rev Log Message: ----------- ?\194?\183 Updated build file Modified Paths: -------------- trunk/PostgreSqlClient/builds/win32/PgSqlClient.build Modified: trunk/PostgreSqlClient/builds/win32/PgSqlClient.build =================================================================== --- trunk/PostgreSqlClient/builds/win32/PgSqlClient.build 2006-03-29 13:21:07 UTC (rev 78) +++ trunk/PostgreSqlClient/builds/win32/PgSqlClient.build 2006-03-29 13:23:54 UTC (rev 79) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<project name="PostgreSql.Data.PgSqlClient" default="build-all"> +<project name="PostgreSql.Data.PostgreSqlClient" default="build-all"> <!-- Project properties --> <property name="project.name" @@ -7,11 +7,11 @@ /> <property name="project.version" - value="2.0 alpha 1" + value="2.0 Beta 1" /> <property name="project.release.type" - value="alpha" + value="beta1" overwrite="false" /> <!-- nightly / dev / alpha / beta# / rc# / release --> @@ -89,11 +89,12 @@ <if test="${not property::exists('nunit.framework.dll')}"> <sysinfo /> - <property - name="nunit.framework.dll" - value="C:\desarrollo\Herramientas\nunit\bin\nunit.framework.dll" - readonly="false" - /> + <sysinfo /> + <property + name="nunit.framework.dll" + value="${sys.os.folder.programfiles}\NUnit-Net-2.0 2.2.7\bin\nunit.framework.dll" + readonly="false" + /> </if> </target> @@ -180,12 +181,11 @@ <csc target="library" output="${build.dir}/${nant.project.name}.dll" - doc="${build.dir}/${nant.project.name}.xml" debug="${build.debug}" define="${current.build.defines}"> <sources basedir="${source.dir}"> - <include name="FirebirdSql.Data.Common/**/*.cs"/> + <include name="PostgreSql/**/*.cs"/> </sources> <references> @@ -202,7 +202,6 @@ <arg value="/optimize+" /> </csc> - <!-- build and run FirebirdSql.Data.Firebird.UnitTest assembly --> <call target="build-tests" failonerror="true" /> <if test="${property::exists('run.tests')}"> <call target="run-tests" failonerror="true" /> @@ -221,7 +220,7 @@ <!-- Copy config file to build dir --> <copy - file="${source.dir}/UnitTests/*.config" + file="${source.dir}/UnitTests/App.config" tofile="${build.dir}/${nant.project.name}.UnitTest.dll.config" /> @@ -238,7 +237,7 @@ define="${current.build.defines}"> <sources basedir="${source.dir}"> - <include name="FirebirdSql.Data.Firebird.UnitTest/**/*.cs"/> + <include name="UnitTests/**/*.cs"/> </sources> <references> @@ -246,32 +245,10 @@ <include name="System.Data.dll" /> <include name="System.XML.dll" /> <include name="${nunit.framework.dll}"/> - <include name="${build.dir}/FirebirdSql.Data.Common.dll" /> - <include name="${build.dir}/FirebirdSql.Data.Firebird.dll" /> + <include name="${build.dir}/PostgreSql.Data.PostgreSqlClient.dll" /> </references> <arg value="/optimize+" /> </csc> </target> - - <target name="run-tests" description="Runs the nunit tests"> - <!-- Set build directory --> - <property - name="build.dir" - value="${nant.settings.currentframework}/bin/${project.config}" - /> - - <nunit2> - <formatter - type="Xml" - usefile="true" - extension=".xml" - outputdir="${build.dir}" - /> - <test - assemblyname="${build.dir}/${nant.project.name}.UnitTest.dll" - appconfig="${build.dir}/${nant.project.name}.UnitTest.dll.config" - /> - </nunit2> - </target> </project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <car...@us...> - 2006-03-29 13:21:16
|
Revision: 78 Author: carlosga_fb Date: 2006-03-29 05:21:07 -0800 (Wed, 29 Mar 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=78&view=rev Log Message: ----------- Renamed remotely Added Paths: ----------- trunk/PostgreSqlClient/ Removed Paths: ------------- trunk/pgsqlclient/ Copied: trunk/PostgreSqlClient (from rev 77, trunk/pgsqlclient) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
