[pgsqlclient-checkins] SF.net SVN: pgsqlclient: [173] trunk/PostgreSqlClient/source/PostgreSql/Data
Status: Inactive
Brought to you by:
carlosga_fb
From: <car...@us...> - 2006-06-19 21:30:54
|
Revision: 173 Author: carlosga_fb Date: 2006-06-19 14:30:30 -0700 (Mon, 19 Jun 2006) ViewCVS: http://svn.sourceforge.net/pgsqlclient/?rev=173&view=rev Log Message: ----------- Changes on internal data type handling ( not finished ) Modified Paths: -------------- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgCheckConstraints.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeys.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexes.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/PgSequences.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTriggers.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViews.cs Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/MetaData.xml 2006-06-19 21:30:30 UTC (rev 173) @@ -640,7 +640,7 @@ </DataSourceInformation> <DataTypes> <TypeName>int2</TypeName> - <ProviderDbType>12</ProviderDbType> + <ProviderDbType>14</ProviderDbType> <ColumnSize>2</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -665,7 +665,7 @@ </DataTypes> <DataTypes> <TypeName>int4</TypeName> - <ProviderDbType>13</ProviderDbType> + <ProviderDbType>15</ProviderDbType> <ColumnSize>4</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -690,7 +690,7 @@ </DataTypes> <DataTypes> <TypeName>int8</TypeName> - <ProviderDbType>14</ProviderDbType> + <ProviderDbType>16</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -715,7 +715,7 @@ </DataTypes> <DataTypes> <TypeName>decimal</TypeName> - <ProviderDbType>9</ProviderDbType> + <ProviderDbType>11</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters>precision, scale</CreateParameters> @@ -740,7 +740,7 @@ </DataTypes> <DataTypes> <TypeName>numeric</TypeName> - <ProviderDbType>18</ProviderDbType> + <ProviderDbType>20</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters>precision, scale</CreateParameters> @@ -765,7 +765,7 @@ </DataTypes> <DataTypes> <TypeName>float4</TypeName> - <ProviderDbType>11</ProviderDbType> + <ProviderDbType>13</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -790,7 +790,7 @@ </DataTypes> <DataTypes> <TypeName>float8</TypeName> - <ProviderDbType>10</ProviderDbType> + <ProviderDbType>12</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -815,7 +815,7 @@ </DataTypes> <DataTypes> <TypeName>currency</TypeName> - <ProviderDbType>7</ProviderDbType> + <ProviderDbType>9</ProviderDbType> <ColumnSize>4</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -840,7 +840,7 @@ </DataTypes> <DataTypes> <TypeName>char</TypeName> - <ProviderDbType>5</ProviderDbType> + <ProviderDbType>7</ProviderDbType> <ColumnSize>2147483647</ColumnSize> <CreateFormat /> <CreateParameters>length</CreateParameters> @@ -865,7 +865,7 @@ </DataTypes> <DataTypes> <TypeName>varchar</TypeName> - <ProviderDbType>28</ProviderDbType> + <ProviderDbType>30</ProviderDbType> <ColumnSize>2147483647</ColumnSize> <CreateFormat /> <CreateParameters>length</CreateParameters> @@ -890,7 +890,7 @@ </DataTypes> <DataTypes> <TypeName>refcursor</TypeName> - <ProviderDbType>22</ProviderDbType> + <ProviderDbType>24</ProviderDbType> <ColumnSize>0</ColumnSize> <CreateFormat /> <CreateParameters></CreateParameters> @@ -915,7 +915,7 @@ </DataTypes> <DataTypes> <TypeName>text</TypeName> - <ProviderDbType>23</ProviderDbType> + <ProviderDbType>25</ProviderDbType> <ColumnSize>2147483647</ColumnSize> <CreateFormat /> <CreateParameters>length</CreateParameters> @@ -965,7 +965,7 @@ </DataTypes> <DataTypes> <TypeName>date</TypeName> - <ProviderDbType>8</ProviderDbType> + <ProviderDbType>10</ProviderDbType> <ColumnSize>4</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -990,7 +990,7 @@ </DataTypes> <DataTypes> <TypeName>time</TypeName> - <ProviderDbType>24</ProviderDbType> + <ProviderDbType>26</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -1015,7 +1015,7 @@ </DataTypes> <DataTypes> <TypeName>timetz</TypeName> - <ProviderDbType>25</ProviderDbType> + <ProviderDbType>27</ProviderDbType> <ColumnSize>12</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -1040,7 +1040,7 @@ </DataTypes> <DataTypes> <TypeName>timestamp</TypeName> - <ProviderDbType>26</ProviderDbType> + <ProviderDbType>28</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -1065,7 +1065,7 @@ </DataTypes> <DataTypes> <TypeName>timestamptz</TypeName> - <ProviderDbType>27</ProviderDbType> + <ProviderDbType>29</ProviderDbType> <ColumnSize>8</ColumnSize> <CreateFormat /> <CreateParameters/> @@ -1090,7 +1090,7 @@ </DataTypes> <DataTypes> <TypeName>interval</TypeName> - <ProviderDbType>15</ProviderDbType> + <ProviderDbType>17</ProviderDbType> <ColumnSize>12</ColumnSize> <CreateFormat /> <CreateParameters/> Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgCheckConstraints.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgCheckConstraints.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgCheckConstraints.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgCheckConstraints : PgSchema { + #region \xB7 Constructors \xB7 + + public PgCheckConstraints(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgColumns.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -24,6 +24,15 @@ { internal class PgColumns : PgSchema { + #region \xB7 Constructors \xB7 + + public PgColumns(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) @@ -138,9 +147,9 @@ break; default: - if (PgDatabase.DataTypes.IndexOf(column["DATA_TYPE"].ToString()) != -1) + if (this.Connection.InternalConnection.Database.DataTypes.IndexOf(column["DATA_TYPE"].ToString()) != -1) { - column["COLUMN_SIZE"] = PgDatabase.DataTypes[column["DATA_TYPE"].ToString()].Size; + column["COLUMN_SIZE"] = this.Connection.InternalConnection.Database.DataTypes[column["DATA_TYPE"].ToString()].Size; } break; } Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeyColumns.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -23,6 +23,15 @@ { internal class PgForeignKeyColumns : PgSchema { + #region \xB7 Constructors \xB7 + + public PgForeignKeyColumns(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeys.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeys.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgForeignKeys.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgForeignKeys : PgSchema { + #region \xB7 Constructors \xB7 + + public PgForeignKeys(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctionParameters.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -23,6 +23,15 @@ { internal class PgFunctionParameters : PgSchema { + #region \xB7 Constructors \xB7 + + public PgFunctionParameters(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgFunctions.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgFunctions : PgSchema { + #region \xB7 Constructors \xB7 + + public PgFunctions(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexColumns.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexColumns.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal sealed class PgIndexColumns : PgSchema { + #region \xB7 Constructors \xB7 + + public PgIndexColumns(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexes.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexes.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgIndexes.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal sealed class PgIndexes : PgSchema { + #region \xB7 Constructors \xB7 + + public PgIndexes(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgPrimaryKeys.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -17,13 +17,21 @@ using System; using System.Data; - using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal sealed class PgPrimaryKeys : PgSchema { + #region \xB7 Constructors \xB7 + + public PgPrimaryKeys(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchema.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -25,11 +25,27 @@ namespace PostgreSql.Data.Schema { internal abstract class PgSchema - { - #region \xB7 Constructors \xB7 + { + #region \xB7 Fields \xB7 - public PgSchema() + private PgConnection connection; + + #endregion + + #region \xB7 Protected Properties \xB7 + + public PgConnection Connection + { + get { return this.connection; } + } + + #endregion + + #region \xB7 Constructors \xB7 + + public PgSchema(PgConnection connection) { + this.connection = connection; } #endregion @@ -42,7 +58,7 @@ #region \xB7 Methods \xB7 - public DataTable GetSchema(PgConnection connection, string collectionName, string[] restrictions) + public DataTable GetSchema(string collectionName, string[] restrictions) { DataTable dataTable = null; PgDataAdapter adapter = null; Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSchemaFactory.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -95,67 +95,67 @@ switch (collectionName.Trim().ToLower()) { case "checkconstraints": - schema = new PgCheckConstraints(); + schema = new PgCheckConstraints(connection); break; case "columns": - schema = new PgColumns(); + schema = new PgColumns(connection); break; case "indexes": - schema = new PgIndexes(); + schema = new PgIndexes(connection); break; case "indexcolumns": - schema = new PgIndexColumns(); + schema = new PgIndexColumns(connection); break; case "functions": - schema = new PgFunctions(); + schema = new PgFunctions(connection); break; case "functionparameters": - schema = new PgFunctionParameters(); + schema = new PgFunctionParameters(connection); break; case "foreignkeys": - schema = new PgForeignKeys(); + schema = new PgForeignKeys(connection); break; case "foreignkeycolumns": - schema = new PgForeignKeyColumns(); + schema = new PgForeignKeyColumns(connection); break; case "primarykeys": - schema = new PgPrimaryKeys(); + schema = new PgPrimaryKeys(connection); break; case "sequences": - schema = new PgSequences(); + schema = new PgSequences(connection); break; case "tables": - schema = new PgTables(); + schema = new PgTables(connection); break; case "triggers": - schema = new PgTriggers(); + schema = new PgTriggers(connection); break; case "uniquekeys": - schema = new PgUniqueKeys(); + schema = new PgUniqueKeys(connection); break; case "views": - schema = new PgViews(); + schema = new PgViews(connection); break; case "viewcolumns": - schema = new PgViewColumns(); + schema = new PgViewColumns(connection); break; } - return schema.GetSchema(connection, collectionName, restrictions); + return schema.GetSchema(collectionName, restrictions); } private static DataTable SqlCommandCollection(PgConnection connection, string collectionName, string sql, string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgSequences.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgSequences : PgSchema { + #region \xB7 Constructors \xB7 + + public PgSequences(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTables.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgTables : PgSchema { + #region \xB7 Constructors \xB7 + + public PgTables(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTriggers.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTriggers.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgTriggers.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,11 +16,21 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgTriggers : PgSchema { + #region \xB7 Constructors \xB7 + + public PgTriggers(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgUniqueKeys.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -17,13 +17,21 @@ using System; using System.Data; - using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal sealed class PgUniqueKeys : PgSchema { + #region \xB7 Constructors \xB7 + + public PgUniqueKeys(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Protected Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViewColumns.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -23,6 +23,15 @@ { internal class PgViewColumns : PgSchema { + #region \xB7 Constructors \xB7 + + public PgViewColumns(PgConnection connection) + : base(connection) + { + } + + #endregion + #region \xB7 Methods \xB7 protected override string BuildSql(string[] restrictions) Modified: trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViews.cs =================================================================== --- trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViews.cs 2006-06-19 21:29:24 UTC (rev 172) +++ trunk/PostgreSqlClient/source/PostgreSql/Data/Schema/PgViews.cs 2006-06-19 21:30:30 UTC (rev 173) @@ -16,14 +16,24 @@ */ using System; +using PostgreSql.Data.PostgreSqlClient; namespace PostgreSql.Data.Schema { internal class PgViews : PgSchema - { - #region \xB7 Protected Methods \xB7 + { + #region \xB7 Constructors \xB7 - protected override string BuildSql(string[] restrictions) + public PgViews(PgConnection connection) + : base(connection) + { + } + + #endregion + + #region \xB7 Protected Methods \xB7 + + protected override string BuildSql(string[] restrictions) { string sql = "SELECT " + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |