adapdev-commits Mailing List for Adapdev.NET (Page 31)
Status: Beta
Brought to you by:
intesar66
Menu
▾
▴
adapdev-commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(26) |
Apr
(59) |
May
(37) |
Jun
(53) |
Jul
(13) |
Aug
(7) |
Sep
(5) |
Oct
(74) |
Nov
(404) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(10) |
Feb
(26) |
Mar
(64) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Trevor L. <tre...@us...> - 2005-04-12 10:23:37
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23402/src/Adapdev.Data/Xml Modified Files: ProviderConfig.xml Log Message: Added Progress Dialog and threaded control for loading tables. Index: ProviderConfig.xml =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml/ProviderConfig.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProviderConfig.xml 11 Apr 2005 11:24:04 -0000 1.2 --- ProviderConfig.xml 12 Apr 2005 10:22:57 -0000 1.3 *************** *** 56,60 **** </connection> ! <connection name="Oracle" type="ORACLE" internalProvider="OLEDB (Microsoft)" supportsServer="true" supportsName="false" supportsUserID="true" supportsPassword="true"> <providers> <provider name="Oracle Connect" type="ORACLE" enabled="true"> --- 56,60 ---- </connection> ! <connection name="Oracle" type="ORACLE" internalProvider="OLEDB (Microsoft)" supportsServer="true" supportsName="true" supportsUserID="true" supportsPassword="true"> <providers> <provider name="Oracle Connect" type="ORACLE" enabled="true"> *************** *** 62,66 **** </provider> <provider name="OLEDB (Microsoft)" type="OLEDB" enabled="true"> ! Provider=msdaora; Data Source={0}; User ID={2}; Password={3}; </provider> <provider name="OLEDB (Oracle)" type="OLEDB" enabled="false"> --- 62,66 ---- </provider> <provider name="OLEDB (Microsoft)" type="OLEDB" enabled="true"> ! Provider=msdaora; Data Source={0}; Database={1}; User ID={2}; Password={3}; </provider> <provider name="OLEDB (Oracle)" type="OLEDB" enabled="false"> |
|
From: Trevor L. <tre...@us...> - 2005-04-12 10:23:12
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/Progress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23402/src/Adapdev.Windows.Forms/Progress Added Files: ProgressWindow.cs ProgressWindow.resx Log Message: Added Progress Dialog and threaded control for loading tables. --- NEW FILE: ProgressWindow.resx --- <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 1.3 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">1.3</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1">this is my long string</data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> [base64 mime encoded serialized .NET Framework object] </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> [base64 mime encoded string representing a byte array form of the .NET Framework object] </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used forserialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <value>1.3</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="progressBar.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="progressBar.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="progressBar.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="txtMessage1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="txtMessage1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="txtMessage1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="cancelButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="cancelButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="cancelButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="morelessButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="morelessButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="morelessButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="imageList.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="imageList.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="imageList.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </data> <data name="imageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> <value> AAEAAAD/////AQAAAAAAAAAMAgAAAFpTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0xLjAuNTAw MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZT eXN0ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMA AAAGDgAAAk1TRnQBSQFMAgEBBAEAAQkBAAEEAQABEAEAARABAAT/AREBEAj/AUIBTQE2BwABNgMAASgD AAFAAwABMAMAAQEBAAEQBgABGP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AMAABlAE1AZQB NQGUATUBlAE1AZQBNQGUATUBlAE1AZQBNQGUATUKAAEgAQEBYAEFAaABBQGgAQUBYAEFASABARQAAUYB AAFoAQABigEAAYoBAAFoAQABRhYAARABAAEYAQABIAEAASABAAEYAQABFBgAAZMBMQGeAWMBfgFbAV0B UwE9AUsBHgFDAR0BQwFeAUMBlAE1BgABgAEFAYABBQFBAQoBwQEOAcEBDgHBAQ4BwQEOAUABCgGgAQUB oAEFDAABaQEAAWkBAAHQAQABFAEBARUBAQEVAQEBFAEBAdABAAFqAQABag4AARwBAAEcAQABMAEAAUAB AAFEAQABRAEAAUQBAAEwAQABHAEAARwUAAFxAS0BOwFbARoBUwH6AU4B+wFKARwBSwH8AUIBHgFDAZQB NQQAAaEBCQHhAQkBwQEOAeEBDgHBAQ4BwAEKAcEBDgHBAQ4B4QEOAeEBDgEAAQoBIAEBCAABiwEAAa0B AAEVAQEBFgEBARUBAQEUAQEBFQEBARUBAQEVAQEBFgEBAa4BAAFGCgABIAEAASgBAAFIAQABSAEAAUQB AAFAAQABRAEAAUQBAAFIAQABSAEAASgBAAEUEgABTgEpAXQBSgFTAUIBVAE+AbgBRgH7AUoBHAFLAT4B QwGUATUCAAGhAQkBAQESAeIBGgHCARIBwQEOAcABCgHBAQoBwQEOAcEBDgHBAQ4BwQEOAeEBDgEAAQoB gAEFBAABiwEAAc8BAAE4AQEBNwEBARUBAQEUAQEBFAEBARQBAQEUAQEBFAEBARUBAQEWAQEBrgEAAWoF AAEgASgBAAEsAQABUAEAAUwBAAFEAQABQAEAAUABAAFEAQABRAEAAUQBAAFEAQABSAEAASgBAAEcDgAB YAF9AQoBHQGtATUBYAF9Aa4BLQEyAToBuAFGAfsBSgE9AUsBlAE1AgABoQEJAeQBJgHjASIBwgEaAcEB DgHlARoB2wFzAf0BdwEsATcBwQEOAcEBDgHBAQ4B4QEOAYABBQQAAYsBAAFaAQEBWQEBATcBAQEVAQEB VgEJAZ4BawG/AXMB+AEhARQBAQEUAQEBFQEBARYBAQFqBQABIAEoAQABWAEAAVQBAAFMAQABRAEgAUgB egF7AbwBfwEFAVUBAAFEAQABRAEAAUQBAAFIAQABHAIAAbQBNQG0ATUBtAE1AZQBMQFxAS0BDQEhAWAB fQFgAX0BYAF9AWABfQFLASkBrgEtAVQBPgHaAU4BXgFTAZQBNQHBAQkBYwEeAQUBLwHjASIBwQESAcEB DgHCARIBcwFTAf8BfwH+AX8BKwEzAcEBDgHBAQ4B4QEOAUEBCgFgAQUBiwEAAfQBAAF9AQEBWQEBARYB AQEVAQEBFQEBAbsBPgH/AX8B/wF7AfgBHQEUAQEBFAEBARUBAQHQAQABaAEAASABLAEAAUQBAAFkAQAB VAEAAUgBAAFEAQABRAEOAWYB/wF/Ad4BfwHkAVQBAAFEAQABRAEAAUgBAAEwAQABGAGUATUBnwFjAT0B UwEcAUsBYAF9AWABfQFgAX0BYAF9AWABfQFgAX0BYAF9AWABfQFTAUIBOwFXAX0BWwGUATUBwQEJAcUB LgEFATMB5AEmAcEBEgHBAQ4BwQEOAcEBDgFxAUsB/wF/Af4BewErATMBwQEOAcEBDgGhAQoBYAEFAYsB AAFaAQEBfQEBAVoBAQEWAQEBFQEBARUBAQEVAQEBmgE2Af8BfwHfAXsB2AEdARQBAQEVAQEB8wEAAWgC AAEgAQABXAEAAWQBAAFYAQABSAEAAUQBAAFEAQABRAHMAWEB/wF/Ad4BfwHjAVQBAAFEAQABRAEAAUAB AAEYAbQBNQG/AWsBXgFbAT0BUwG5AUIBYAF9AWABfQEKARkBzgE5AWABfQFgAX0BrQExAXQBSgFxASkB kwEtAZQBNQEBAQ4BBgE3AQYBNwHZAW8BuQFrAbgBawG5AWsBuAFrAbgBZwH/AX8B/wF/Af4BewFNAT8B wQEOAcEBDgGAAQUBrgEAAZ4BAQGfAQEBXwFXAV8BVwE+AVcBXwFXAT4BUwE+AVcB/wF7Af8BfwHfAXcB OQEmARUBAQEVAQEBaQIAASwBAAFsAQABbAH1AX4B9QF6AdQBegHUAXoB1AF6AdQBegHeAX8B/wF/Ad0B fwFHAVkBAAFEAQABRAEAARwB1AE1Ad8BcwF+AWMBXQFbAdoBSgFgAX0BYAF9AQoBGQGMATEBYAF9AWAB fQHOATkBlAFOAXEBKQFbASIB1wEhASIBEgErAUMBKAE7Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8B fwH/AX8B/wF/AbcBYwHBAQ4BwQEOAaABBQHRAQAB/wEJAb8BAQH/AX8B/wF/Af8BfwH/AX8B/wF/Af8B fwH/AX8B/wF/Af8BfwEcAVMBFQEBARUBAQGKAgABNAFgAXABIAFwAf8BfwH/AX8B/wF/Af8BfwH/AX8B /wF/Af8BfwH/AX8B/wF/AdQBcgEAAUQBAAFEAQABIAHUATUB/wF7AZ4BawF9AWMBYAF9AWABfQFgAX0B YAF9AWABfQFgAX0BYAF9AWABfQH4AV4BkgEpARgBMgIAAUEBDgFNAksBRwFNAUsBTgFPAU4BTwFOAU8B TAFHAXIBVwH/AX8B/wF/AZUBXwHlASYB4gEWAcEBDgGAAQUB0QEAAT8BFgEfAQ4BPgEaAT8BGgE/ARoB PwEaAR8BEgGdATIB/wF/Af8BfwH9AUYBeAEFATcBAQEUAQEBaQIAATQB4wF0AYABcAHjAWwB4wFwAeMB cAHjAXABoQFsAewBdQH/AX8B/wF/AVABbgEgAVQBAAFMAQABQAEAARwBFwE2Af8BfwG/AXMBngFrAX0B YwEbAVMBYAF9AWABfQFgAX0BYAF9AVoBNgFaATYBWgE2AZMBLQQAAUEBDgEsAUMBkwFfAQcBOwEGATcB BwE3AQcBNwFOAUsB/QF3Af8BfwGTAVsB5AEmAeMBHgHiARYBgQEKAYABBQHRAQABHwEOAb8BMgGfAQEB fQEBAZ8BAQGfAQEBPwEaAb8BbwH/AX8BvQE+AVkBAQE4AQEBNwEBAfIBAAFpAgABNAHBAXQBywF5AQAB cAEAAWgBAAFsAQABbAHiAXABmwF/Af8BfwENAW4BAAFYAQABUAEAAUwBAAE4AQABHAEXATYB/wF/Af8B ewHfAXMBngFrAX0BYwFgAX0B2QFKAXEBLQFgAX0OAAHGASoBtwFrAXABUwEFATMBBQEzASoBQwH+AX8B /wF/AZMBWwHkASYB4wEiAcMBGgECARsBAQEKBAABfAEBAR8BSwF/ASIBfAEBAX0BAQHfAQkB/wF7Af8B fwG+AToBWQEBATkBAQE4AQEBOAEBAa4FAAEgAWgBkgF+AUUBdQEAAWABAAFkAUABbAHeAX8B/wF/AQ0B dgEAAVgBAAFUAQABUAEAAVQBAAEsAgABWgE2Af8BfwH/AX8B/wF7Ab8BcwGeAWsBtAEtAbQBLQGTATEQ AAHGASoBTgFHAdoBcwFwAVMBBgE3AQcBNwG3AWcBlQFjAQUBMwHkASoB5AEmAQMBIwGiARoBAQEKBAAB fAEBAT8BFgF/AVsBXwEiAZ8BAQGdAQEBHwFLAf8BPgF8AQEBWwEBAVoBAQFaAQEBFgEBAa4GAAFkAcIB cAH1AXoBZwF9ASABcAFAAWwBkgF+AS4BfgEAAWABAAFcAQABWAEAAVwBAAFIAQABLAIAAXsBOgH/AX8B /wF/Af8BfwH/AX8BXAFnAbQBLQEZASIBtQEpEgABpAEeAXABTwHbAXcBtQFjAU0BSwEqAUMBKAE/ASkB PwEpAT8BJwE3AcQBJgHhAQ0IAAE4AQEBfwEiAZ8BYwH/AT4BHwEWAd8BBQG/AQEBvwEFAb8BBQGfAQEB OQEBAa4KAAFQASUBcQFYAX8BbwF+AQMBeQGBAXgBYAF0AWABdAEgAXABAAFwAQABVAEAASgEAAG8AT4B /wF/Af8BfwH/AX8B/wF/AVwBbwG0AS0BOgEuFgABLAFDASwBQwG1AWMB2QFvAbcBawGUAWMBkgFbAUwB SwHFASoBxQEqDAABHwEOAR8BDgH/AT4BXwFXAR8BSwHfAToBnwEuAR8BEgFaAQEBWgEBDAABgAFwAcIB eAFPAX4B9QF+AZIBfgEuAX4BygF9AaABcAEAAVwBAAFcBgABvAE+AVoBNgFaATYBWgE2AVoBNgFaATYB tAEtHAABxgEmAQoBNwEsAUMBKwE/AegBMgGEASIUAAF8AQEB3wEFAf8BDQH/AQkBnwEBARYBARQAASAB aAFgAXQBwQF4AaEBeAEgAXQBAAFQCgABQgFNAT4HAAE+AwABKAMAAUADAAEwAwABAQEAAQEFAAGAAQEW AAP//wACAAH+AQAB+AEfAfgBHwH4AR8B/gEAAeABBwHgAQcB4AEHAf4BAAHAAQMBwAEDAcABAwH+AQAB gAEBAYABAQGAAQEB/AEAAYABAQGAAQEBgAEBIQABAQcAAQMHAAE/AYABAQGAAQEBgAEBAQABfwGAAQEB gAEBAYABAQEAAX8BwAEDAcABAwHAAQMBAAH/AeABBwHgAQcB4AEHAQEB/wH4AR8B+AEfAfgBHxYACw== </value> </data> <data name="txtMessage2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="txtMessage2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="txtMessage2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="listView.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="listView.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="listView.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="ColumnHeader1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="ColumnHeader1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>(Default)</value> </data> <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>80</value> </data> <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </data> <data name="$this.Name"> <value>ProgressWindow</value> </data> <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> </root> --- NEW FILE: ProgressWindow.cs --- // // This code based on functions from http://www.codeproject.com/cs/miscctrl/progressdialog.asp // Original Author: About Matthew Adams // using System; using System.Windows.Forms; namespace Adapdev.Windows.Forms.Progress { /// <summary> /// Summary description for ProgressWindow. /// </summary> public class ProgressWindow : System.Windows.Forms.Form, IProgressCallback { private System.Windows.Forms.ProgressBar progressBar; private System.ComponentModel.IContainer components; public delegate void SetTextInvoker(String text1, String text2); public delegate void IncrementInvoker( int val ); public delegate void StepToInvoker( int val ); public delegate void RangeInvoker( int minimum, int maximum ); public delegate void MoreLessInvoker( bool state ); public delegate void AddMessageInvoker (ProgressMessageTypes type, string message); private System.Threading.ManualResetEvent initEvent = new System.Threading.ManualResetEvent(false); private System.Threading.ManualResetEvent abortEvent = new System.Threading.ManualResetEvent(false); private System.Windows.Forms.ImageList imageList; private System.Windows.Forms.Button cancelButton; private System.Windows.Forms.Button morelessButton; private bool requiresClose = true; private bool morelessOpen = false; private bool completed = false; private ProgressAutoCloseTypes autoClose = ProgressAutoCloseTypes.AutoClose; private readonly int minWidth = 232; private readonly int openSize; private readonly int closedSize; private int totalErrors = 0; private System.Windows.Forms.Label txtMessage1; private System.Windows.Forms.ListView listView; private System.Windows.Forms.ColumnHeader ColumnHeader1; private System.Windows.Forms.Label txtMessage2; public ProgressWindow() { // // Required for Windows Form Designer support // InitializeComponent(); openSize = this.Height; closedSize = this.Height - (this.listView.Height + 16); DoSetMoreLess(false); } #region Implementation of IProgressCallback /// <summary> /// Call this method from the worker thread to initialize /// the progress meter. /// </summary> /// <param name="minimum">The minimum value in the progress range (e.g. 0)</param> /// <param name="maximum">The maximum value in the progress range (e.g. 100)</param> public void Begin( int minimum, int maximum ) { initEvent.WaitOne(); Invoke( new RangeInvoker( DoBegin ), new object[] { minimum, maximum } ); } /// <summary> /// Call this method from the worker thread to initialize /// the progress meter. /// </summary> /// <param name="minimum">The minimum value in the progress range (e.g. 0)</param> /// <param name="maximum">The maximum value in the progress range (e.g. 100)</param> public void Begin(ProgressAutoCloseTypes autoClose, int minimum, int maximum ) { initEvent.WaitOne(); this.autoClose = autoClose; Invoke( new RangeInvoker( DoBegin ), new object[] { minimum, maximum } ); } /// <summary> /// Call this method from the worker thread to initialize /// the progress callback, without setting the range /// </summary> public void Begin() { initEvent.WaitOne(); Invoke( new MethodInvoker( DoBegin ) ); } /// <summary> /// Call this method from the worker thread to reset the range in the progress callback /// </summary> /// <param name="minimum">The minimum value in the progress range (e.g. 0)</param> /// <param name="maximum">The maximum value in the progress range (e.g. 100)</param> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> public void SetRange( int minimum, int maximum ) { initEvent.WaitOne(); Invoke( new RangeInvoker( DoSetRange ), new object[] { minimum, maximum } ); } /// <summary> /// Call this method to set the Autoclose flag /// </summary> public void SetAutoClose( ProgressAutoCloseTypes autoClose ) { this.autoClose = autoClose; } /// <summary> /// Call this method from the worker thread to update the progress text. /// </summary> /// <param name="text1">The progress heading text to display</param> /// <param name="text2">The progress sub-heading text to display</param> public void SetText( String text1, String text2 ) { Invoke( new SetTextInvoker(DoSetText), new object[] { text1, text2 } ); } public void SetText( String text ) { SetText (null, text); } /// <summary> /// Call this method from the worker thread to increase the progress counter by a specified value. /// </summary> /// <param name="val">The amount by which to increment the progress indicator</param> public void Increment( int val ) { Invoke( new IncrementInvoker( DoIncrement ), new object[] { val } ); } /// <summary> /// Call this method from the worker thread to step the progress meter to a particular value. /// </summary> /// <param name="val"></param> public void StepTo( int val ) { Invoke( new StepToInvoker( DoStepTo ), new object[] { val } ); } /// <summary> /// Call this method from the worker thread to step the progress meter to a particular value. /// </summary> public void AddMessage( string message ) { Invoke( new AddMessageInvoker( DoAddMessage), new object[] { ProgressMessageTypes.Info, message } ); } /// <summary> /// Call this method from the worker thread to step the progress meter to a particular value. /// </summary> public void AddMessage( ProgressMessageTypes type, string message ) { Invoke( new AddMessageInvoker( DoAddMessage), new object[] { type, message } ); } /// <summary> /// Called by the UI to update the UI /// </summary> private void morelessButton_Click(object sender, System.EventArgs e) { Invoke( new MoreLessInvoker(DoSetMoreLess), new object[] { !morelessOpen } ); } private void ProgressWindow_Resize(object sender, System.EventArgs e) { if (this.Height < closedSize) this.Height = closedSize; if (this.Width < minWidth) this.Width = minWidth; listView.Columns[0].Width = listView.Width; } private void cancelButton_Click(object sender, System.EventArgs e) { Invoke( new SetTextInvoker(DoSetText), new object[] { null, "Processing Cancelled!" } ); Invoke( new AddMessageInvoker( DoAddMessage), new object[] { ProgressMessageTypes.Critical, "Processing Cancelled!" } ); End(); } /// <summary> /// If this property is true, then you should abort work /// </summary> public bool IsAborting { get { return abortEvent.WaitOne( 0, false ); } } /// <summary> /// Call this method from the worker thread to finalize the progress meter /// </summary> public void End() { if( requiresClose ) { Invoke( new MethodInvoker( DoEnd ) ); } } #endregion #region Implementation members invoked on the owner thread private void DoSetText( String text1, String text2 ) { if (text1 != null) txtMessage1.Text = text1; txtMessage2.Text = text2; } private void DoIncrement( int val ) { progressBar.Increment( val ); UpdateStatusText(); } private void DoStepTo( int val ) { progressBar.Value = val; UpdateStatusText(); } private void DoBegin( int minimum, int maximum ) { DoBegin(); DoSetRange( minimum, maximum ); } private void DoBegin() { cancelButton.Enabled = true; } private void DoSetRange( int minimum, int maximum ) { progressBar.Minimum = minimum; progressBar.Maximum = maximum; progressBar.Value = minimum; UpdateStatusText(); } private void DoAddMessage( ProgressMessageTypes type, string message ) { ListViewItem li = new ListViewItem(); li.Text = message; switch (type) { case ProgressMessageTypes.Info: li.ImageIndex = 1; break; case ProgressMessageTypes.Warning: li.ImageIndex = 2; totalErrors += 1; break; case ProgressMessageTypes.Critical: li.ImageIndex = 3; totalErrors += 1; break; } listView.Items.Add(li); this.morelessButton.Enabled = !(this.listView.Items.Count == 0); } private void DoSetMoreLess (bool moreless) { morelessOpen = moreless; if (moreless){ this.Height = openSize; this.morelessButton.Text = @"<<< Less"; this.FormBorderStyle = FormBorderStyle.Sizable; this.SizeGripStyle = SizeGripStyle.Show; }else{ this.Height = closedSize; this.morelessButton.Text = @"More >>>"; this.FormBorderStyle = FormBorderStyle.FixedSingle; this.SizeGripStyle = SizeGripStyle.Hide; } this.morelessButton.Enabled = !(this.listView.Items.Count == 0); } private void DoSetCompleted() { UpdateStatusText(); completed = true; this.cancelButton.Text = "Close"; } private void DoEnd() { if (!completed && requiresClose) { switch (autoClose) { case ProgressAutoCloseTypes.AutoClose: Close(); break; case ProgressAutoCloseTypes.WaitOnEnd: Invoke( new MethodInvoker( DoSetCompleted ) ); break; case ProgressAutoCloseTypes.WaitOnError: if (totalErrors == 0) { Close(); } else { Invoke( new MoreLessInvoker(DoSetMoreLess), new object[] { true } ); Invoke( new MethodInvoker( DoSetCompleted ) ); } break; } } else { Close(); } } #endregion #region Overrides /// <summary> /// Handles the form load, and sets an event to ensure that /// intialization is synchronized with the appearance of the form. /// </summary> /// <param name="e"></param> protected override void OnLoad(System.EventArgs e) { base.OnLoad( e ); ControlBox = false; initEvent.Set(); } /// <summary> /// Clean up any resources being used. /// </summary> protected override void Dispose( bool disposing ) { if( disposing ) { if(components != null) { components.Dispose(); } } base.Dispose( disposing ); } /// <summary> /// Handler for 'Close' clicking /// </summary> /// <param name="e"></param> protected override void OnClosing(System.ComponentModel.CancelEventArgs e) { requiresClose = false; AbortWork(); base.OnClosing( e ); } #endregion #region Implementation Utilities /// <summary> /// Utility function that formats and updates the title bar text /// </summary> private void UpdateStatusText() { this.Text = this.txtMessage1.Text.Trim() + String.Format( " - {0}% complete", (progressBar.Value * 100 ) / (progressBar.Maximum - progressBar.Minimum) ); } /// <summary> /// Utility function to terminate the thread /// </summary> private void AbortWork() { abortEvent.Set(); } #endregion #region Windows Form Designer generated code /// <summary> /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// </summary> private void InitializeComponent() { this.components = new System.ComponentModel.Container(); System.Resources.ResourceManager resources = new System.Resources.ResourceManager(typeof(ProgressWindow)); this.progressBar = new System.Windows.Forms.ProgressBar(); this.txtMessage1 = new System.Windows.Forms.Label(); this.cancelButton = new System.Windows.Forms.Button(); this.morelessButton = new System.Windows.Forms.Button(); this.imageList = new System.Windows.Forms.ImageList(this.components); this.txtMessage2 = new System.Windows.Forms.Label(); this.listView = new System.Windows.Forms.ListView(); this.ColumnHeader1 = new System.Windows.Forms.ColumnHeader(); this.SuspendLayout(); // // progressBar // this.progressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.progressBar.Location = new System.Drawing.Point(8, 48); this.progressBar.Name = "progressBar"; this.progressBar.Size = new System.Drawing.Size(326, 16); this.progressBar.TabIndex = 1; // // txtMessage1 // this.txtMessage1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtMessage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0))); this.txtMessage1.Location = new System.Drawing.Point(8, 8); this.txtMessage1.Name = "txtMessage1"; this.txtMessage1.Size = new System.Drawing.Size(326, 16); this.txtMessage1.TabIndex = 0; this.txtMessage1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.cancelButton.Enabled = false; this.cancelButton.Location = new System.Drawing.Point(262, 72); this.cancelButton.Name = "cancelButton"; this.cancelButton.TabIndex = 2; this.cancelButton.Text = "Cancel"; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // morelessButton // this.morelessButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.morelessButton.Location = new System.Drawing.Point(182, 72); this.morelessButton.Name = "morelessButton"; this.morelessButton.TabIndex = 4; this.morelessButton.Text = "More >>>"; this.morelessButton.Click += new System.EventHandler(this.morelessButton_Click); // // imageList // this.imageList.ColorDepth = System.Windows.Forms.ColorDepth.Depth16Bit; this.imageList.ImageSize = new System.Drawing.Size(16, 16); this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream"))); this.imageList.TransparentColor = System.Drawing.Color.Transparent; // // txtMessage2 // this.txtMessage2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.txtMessage2.Location = new System.Drawing.Point(8, 24); this.txtMessage2.Name = "txtMessage2"; this.txtMessage2.Size = new System.Drawing.Size(326, 16); this.txtMessage2.TabIndex = 5; this.txtMessage2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // listView // this.listView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.listView.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.listView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.ColumnHeader1}); this.listView.FullRowSelect = true; this.listView.GridLines = true; this.listView.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.listView.LabelWrap = false; this.listView.LargeImageList = this.imageList; this.listView.Location = new System.Drawing.Point(8, 104); this.listView.MultiSelect = false; this.listView.Name = "listView"; this.listView.Size = new System.Drawing.Size(328, 160); this.listView.SmallImageList = this.imageList; this.listView.StateImageList = this.imageList; this.listView.TabIndex = 6; this.listView.View = System.Windows.Forms.View.SmallIcon; // // ColumnHeader1 // this.ColumnHeader1.Text = "Message"; this.ColumnHeader1.Width = 500; // // ProgressWindow // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); this.ClientSize = new System.Drawing.Size(344, 278); this.ControlBox = false; this.Controls.Add(this.listView); this.Controls.Add(this.txtMessage2); this.Controls.Add(this.morelessButton); this.Controls.Add(this.cancelButton); this.Controls.Add(this.progressBar); this.Controls.Add(this.txtMessage1); this.MaximizeBox = false; this.Name = "ProgressWindow"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "ProgressWindow"; this.Resize += new System.EventHandler(this.ProgressWindow_Resize); this.ResumeLayout(false); } #endregion } } |
|
From: Trevor L. <tre...@us...> - 2005-04-12 10:23:11
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23402/src/Adapdev Modified Files: Adapdev.csproj Added Files: IProgressCallback.cs Log Message: Added Progress Dialog and threaded control for loading tables. Index: Adapdev.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev/Adapdev.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Adapdev.csproj 28 Feb 2005 01:55:33 -0000 1.2 --- Adapdev.csproj 12 Apr 2005 10:22:59 -0000 1.3 *************** *** 146,149 **** --- 146,154 ---- /> <File + RelPath = "IProgressCallback.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "LongLivingMarshalByRefObject.cs" SubType = "Code" --- NEW FILE: IProgressCallback.cs --- // // This code based on functions from http://www.codeproject.com/cs/miscctrl/progressdialog.asp // Original Author: About Matthew Adams // using System; namespace Adapdev { public enum ProgressMessageTypes { Info, Warning, Critical }; public enum ProgressAutoCloseTypes {AutoClose, WaitOnEnd, WaitOnError} /// <summary> /// This defines an interface which can be implemented by UI elements /// which indicate the progress of a long operation. /// (See ProgressWindow for a typical implementation) /// </summary> public interface IProgressCallback { /// <summary> /// Call this method from the worker thread to initialize /// the progress callback. /// </summary> /// <param name="minimum">The minimum value in the progress range (e.g. 0)</param> /// <param name="maximum">The maximum value in the progress range (e.g. 100)</param> void Begin( int minimum, int maximum ); /// <summary> /// Call this method from the worker thread to initialize /// the progress callback. /// </summary> /// <param name="minimum">The minimum value in the progress range (e.g. 0)</param> /// <param name="maximum">The maximum value in the progress range (e.g. 100)</param> /// <param name="autoClose">Specify to automatically close on End or Pause on End</param> void Begin(ProgressAutoCloseTypes autoClose, int minimum, int maximum ); /// <summary> /// Call this method from the worker thread to initialize /// the progress callback, without setting the range /// </summary> void Begin(); /// <summary> /// Call this method to set the AutoClose flag. True mean to autoclose on completion /// (default) and false means to wait when closing. /// </summary> /// <param name="autoClose">Sets the flag</param> void SetAutoClose( ProgressAutoCloseTypes autoClose ); /// <summary> /// Call this method from the worker thread to reset the range in the progress callback /// </summary> /// <param name="minimum">The minimum value in the progress range (e.g. 0)</param> /// <param name="maximum">The maximum value in the progress range (e.g. 100)</param> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> void SetRange( int minimum, int maximum ); /// <summary> /// Call this method from the worker thread to update the progress text. /// </summary> /// <param name="text1">The progress text to display</param> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> void SetText( String text1, String text2 ); void SetText( String text ); /// <summary> /// Call this method to add a message to the list box of messages /// </summary> /// <param name="message"></param> void AddMessage( string message ); void AddMessage( ProgressMessageTypes type, string message ); /// <summary> /// Call this method from the worker thread to increase the progress counter by a specified value. /// </summary> /// <param name="val">The amount by which to increment the progress indicator</param> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> void StepTo( int val ); /// <summary> /// Call this method from the worker thread to step the progress meter to a particular value. /// </summary> /// <param name="val">The value to which to step the meter</param> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> void Increment( int val ); /// <summary> /// If this property is true, then you should abort work /// </summary> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> bool IsAborting { get; } /// <summary> /// Call this method from the worker thread to finalize the progress meter /// </summary> /// <remarks>You must have called one of the Begin() methods prior to this call.</remarks> void End(); } } |
|
From: Trevor L. <tre...@us...> - 2005-04-12 09:50:35
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/Progress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5724/Progress Log Message: Directory /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/Progress added to the repository |
|
From: Trevor L. <tre...@us...> - 2005-04-11 11:24:31
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/src/Adapdev.Data/Xml Modified Files: ProviderConfig.xml Log Message: Added missing Oracle classes plus added more code to support Oracle. Oracle code is still a work in progress. Index: ProviderConfig.xml =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml/ProviderConfig.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ProviderConfig.xml 10 Apr 2005 09:59:22 -0000 1.1 --- ProviderConfig.xml 11 Apr 2005 11:24:04 -0000 1.2 *************** *** 58,65 **** <connection name="Oracle" type="ORACLE" internalProvider="OLEDB (Microsoft)" supportsServer="true" supportsName="false" supportsUserID="true" supportsPassword="true"> <providers> ! <provider name="Oracle Connect" type="ORACLE" enabled="false"> Data Source={0}; User ID={2}; Password={3}; Integrated Security=no; </provider> ! <provider name="OLEDB (Microsoft)" type="OLEDB" enabled="false"> Provider=msdaora; Data Source={0}; User ID={2}; Password={3}; </provider> --- 58,65 ---- <connection name="Oracle" type="ORACLE" internalProvider="OLEDB (Microsoft)" supportsServer="true" supportsName="false" supportsUserID="true" supportsPassword="true"> <providers> ! <provider name="Oracle Connect" type="ORACLE" enabled="true"> Data Source={0}; User ID={2}; Password={3}; Integrated Security=no; </provider> ! <provider name="OLEDB (Microsoft)" type="OLEDB" enabled="true"> Provider=msdaora; Data Source={0}; User ID={2}; Password={3}; </provider> |
|
From: Trevor L. <tre...@us...> - 2005-04-11 11:24:31
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/src/Adapdev.Windows.Forms Modified Files: DatabaseSetting.cs Log Message: Added missing Oracle classes plus added more code to support Oracle. Oracle code is still a work in progress. Index: DatabaseSetting.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseSetting.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DatabaseSetting.cs 10 Apr 2005 09:59:22 -0000 1.2 --- DatabaseSetting.cs 11 Apr 2005 11:24:05 -0000 1.3 *************** *** 81,85 **** public DatabaseSchema GetDatabaseSchema() { ! DatabaseSchema schema = SchemaBuilder.CreateDatabaseSchema(this.OleDbConnectionString, this.DbProviderType); schema.ConnectionString = this.ConnectionString; return schema; --- 81,85 ---- public DatabaseSchema GetDatabaseSchema() { ! DatabaseSchema schema = SchemaBuilder.CreateDatabaseSchema(this.OleDbConnectionString, this.DbType, this.DbProviderType); schema.ConnectionString = this.ConnectionString; return schema; |
|
From: Trevor L. <tre...@us...> - 2005-04-11 11:24:30
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/src/Adapdev.Data/Schema Modified Files: SchemaBuilder.cs TableType.cs TableTypeConverter.cs Log Message: Added missing Oracle classes plus added more code to support Oracle. Oracle code is still a work in progress. Index: TableType.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableType.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TableType.cs 28 Feb 2005 01:31:48 -0000 1.1.1.1 --- TableType.cs 11 Apr 2005 11:24:04 -0000 1.2 *************** *** 21,25 **** /// A view table /// </summary> ! VIEW } } \ No newline at end of file --- 21,29 ---- /// A view table /// </summary> ! VIEW, ! /// <summary> ! /// A alias to a Table ! /// </summary> ! SYNONYM } } \ No newline at end of file Index: TableTypeConverter.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableTypeConverter.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TableTypeConverter.cs 28 Feb 2005 01:31:48 -0000 1.1.1.1 --- TableTypeConverter.cs 11 Apr 2005 11:24:04 -0000 1.2 *************** *** 30,33 **** --- 30,35 ---- case "VIEW": return TableType.VIEW; + case "SYNONYM": + return TableType.SYNONYM; default: throw new Exception("TableType " + tableType + " is not supported."); Index: SchemaBuilder.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SchemaBuilder.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SchemaBuilder.cs 25 Mar 2005 02:14:29 -0000 1.2 --- SchemaBuilder.cs 11 Apr 2005 11:24:04 -0000 1.3 *************** *** 5,8 **** --- 5,10 ---- using System.Data.OleDb; using System.Text; + using Adapdev.Data; + using Adapdev.Data.Sql; /// <summary> *************** *** 20,24 **** public static DatabaseSchema CreateDatabaseSchema(string oledbConnectionString) { ! return SchemaBuilder.CreateDatabaseSchema(oledbConnectionString, DbProviderType.OLEDB); } --- 22,26 ---- public static DatabaseSchema CreateDatabaseSchema(string oledbConnectionString) { ! return SchemaBuilder.CreateDatabaseSchema(oledbConnectionString, Adapdev.Data.DbType.ACCESS, DbProviderType.OLEDB); } *************** *** 29,35 **** /// <param name="providerType">The DbProviderType to set the DatabaseSchema to</param> /// <returns></returns> ! public static DatabaseSchema CreateDatabaseSchema(string oledbConnectionString, string providerType) { ! return SchemaBuilder.CreateDatabaseSchema(oledbConnectionString, DbProviderTypeConverter.Convert(providerType)); } --- 31,37 ---- /// <param name="providerType">The DbProviderType to set the DatabaseSchema to</param> /// <returns></returns> ! public static DatabaseSchema CreateDatabaseSchema(string oledbConnectionString, string databaseType, string providerType) { ! return SchemaBuilder.CreateDatabaseSchema(oledbConnectionString, DbTypeConverter.Convert(databaseType), DbProviderTypeConverter.Convert(providerType)); } *************** *** 40,44 **** /// <param name="providerType">The DbProviderType to set the DatabaseSchema to</param> /// <returns></returns> ! public static DatabaseSchema CreateDatabaseSchema(string oledbConnectionString, DbProviderType providerType) { dbProviderType = providerType; --- 42,46 ---- /// <param name="providerType">The DbProviderType to set the DatabaseSchema to</param> /// <returns></returns> ! public static DatabaseSchema CreateDatabaseSchema(string oledbConnectionString, Adapdev.Data.DbType databaseType, DbProviderType providerType) { dbProviderType = providerType; *************** *** 46,53 **** DataTable schemaTables = SchemaBuilder.GetOleDbSchema(oledbConnectionString, OleDbSchemaGuid.Tables, ""); - DatabaseSchema di = new DatabaseSchema(); if (schemaTables.Rows.Count > 0) { di.Name = schemaTables.Rows[0]["TABLE_CATALOG"].ToString(); if (di.Name == String.Empty) di.Name = "Unknown"; --- 48,55 ---- DataTable schemaTables = SchemaBuilder.GetOleDbSchema(oledbConnectionString, OleDbSchemaGuid.Tables, ""); DatabaseSchema di = new DatabaseSchema(); if (schemaTables.Rows.Count > 0) { + //TODO: Note sure if this is valid. It does not work for Oracle DB's di.Name = schemaTables.Rows[0]["TABLE_CATALOG"].ToString(); if (di.Name == String.Empty) di.Name = "Unknown"; *************** *** 61,65 **** { TableSchema ti = CreateTableSchema(dr); ! CreateColumnSchemas(ti, oledbConnectionString); di.AddTable(ti); } --- 63,67 ---- { TableSchema ti = CreateTableSchema(dr); ! CreateColumnSchemas(ti, oledbConnectionString, databaseType); di.AddTable(ti); } *************** *** 146,171 **** /// <param name="ts">The TableSchema to add the ColumnSchema to</param> /// <param name="oledbConnectionString">The OleDb connectionstring to use</param> ! public static void CreateColumnSchemas(TableSchema ts, string oledbConnectionString) { ! DataTable dt = SchemaBuilder.GetReaderSchema(oledbConnectionString, ts.Name); ! foreach (DataRow dr in dt.Rows) ! { ! ColumnSchema ci = new ColumnSchema(); ! ci.Alias = (string) dr["ColumnName"]; ! ci.AllowNulls = (bool) dr["AllowDBNull"]; ! ci.DataTypeId = (int) dr["ProviderType"]; ! ci.DataType = ProviderInfoManager.GetInstance().GetNameById(dbProviderType, ci.DataTypeId); ! ci.DefaultTestValue = ProviderInfoManager.GetInstance().GetTestDefaultById(SchemaBuilder.dbProviderType, ci.DataTypeId); ! ci.DefaultValue = ProviderInfoManager.GetInstance().GetDefaultById(SchemaBuilder.dbProviderType, ci.DataTypeId); ! ci.IsAutoIncrement = (bool) dr["IsAutoIncrement"]; ! ci.IsForeignKey = false; ! ci.IsPrimaryKey = false; ! ci.IsUnique = (bool) dr["IsUnique"]; ! ci.Length = (int) dr["ColumnSize"]; ! ci.Name = (string) dr["ColumnName"]; ! ci.NetType = dr["DataType"].ToString(); ! ci.Ordinal = (int) dr["ColumnOrdinal"]; ! ci.IsReadOnly = (bool) dr["IsReadOnly"]; ! ts.AddColumn(ci); } } --- 148,174 ---- /// <param name="ts">The TableSchema to add the ColumnSchema to</param> /// <param name="oledbConnectionString">The OleDb connectionstring to use</param> ! public static void CreateColumnSchemas(TableSchema ts, string oledbConnectionString, Adapdev.Data.DbType databaseType) { ! DataTable dt = SchemaBuilder.GetReaderSchema(oledbConnectionString, ts.Name, databaseType); ! if (!(dt == null)) { ! foreach (DataRow dr in dt.Rows) { ! ColumnSchema ci = new ColumnSchema(); ! ci.Alias = (string) dr["ColumnName"]; ! ci.AllowNulls = (bool) dr["AllowDBNull"]; ! ci.DataTypeId = (int) dr["ProviderType"]; ! ci.DataType = ProviderInfoManager.GetInstance().GetNameById(dbProviderType, ci.DataTypeId); ! ci.DefaultTestValue = ProviderInfoManager.GetInstance().GetTestDefaultById(SchemaBuilder.dbProviderType, ci.DataTypeId); ! ci.DefaultValue = ProviderInfoManager.GetInstance().GetDefaultById(SchemaBuilder.dbProviderType, ci.DataTypeId); ! ci.IsAutoIncrement = (bool) dr["IsAutoIncrement"]; ! ci.IsForeignKey = false; ! ci.IsPrimaryKey = false; ! ci.IsUnique = (bool) dr["IsUnique"]; ! ci.Length = (int) dr["ColumnSize"]; ! ci.Name = (string) dr["ColumnName"]; ! ci.NetType = dr["DataType"].ToString(); ! ci.Ordinal = (int) dr["ColumnOrdinal"]; ! ci.IsReadOnly = (bool) dr["IsReadOnly"]; ! ts.AddColumn(ci); ! } } } *************** *** 177,199 **** /// <param name="tableName">The table to grab the schema for</param> /// <returns></returns> ! public static DataTable GetReaderSchema(string oledbConnectionString, string tableName) { ! DataTable schemaTable; ! OleDbConnection cn = new OleDbConnection(); ! OleDbCommand cmd = new OleDbCommand(); ! OleDbDataReader myReader; ! ! cn.ConnectionString = oledbConnectionString; ! cn.Open(); ! cmd.Connection = cn; ! cmd.CommandText = "SELECT * FROM [" + tableName + "]"; ! myReader = cmd.ExecuteReader(CommandBehavior.KeyInfo | CommandBehavior.SchemaOnly); ! schemaTable = myReader.GetSchemaTable(); ! myReader.Close(); ! cn.Close(); return schemaTable; } --- 180,208 ---- /// <param name="tableName">The table to grab the schema for</param> /// <returns></returns> ! public static DataTable GetReaderSchema(string oledbConnectionString, string tableName, Adapdev.Data.DbType databaseType) { ! DataTable schemaTable = null; ! try { ! OleDbConnection cn = new OleDbConnection(); ! OleDbCommand cmd = new OleDbCommand(); ! OleDbDataReader myReader; ! cn.ConnectionString = oledbConnectionString; ! cn.Open(); ! // Please Note: Use the GetPre and GetPostDelimiters here as in the case of ! // Oracle using [ ] around a Column Name is not valid. ! cmd.Connection = cn; ! cmd.CommandText = "SELECT * FROM " + QueryHelper.GetPreDelimeter(databaseType) + tableName + QueryHelper.GetPostDelimeter(databaseType); ! myReader = cmd.ExecuteReader(CommandBehavior.KeyInfo | CommandBehavior.SchemaOnly); ! schemaTable = myReader.GetSchemaTable(); + myReader.Close(); + cn.Close(); + } catch (Exception ex) { + schemaTable = null; + //throw new ApplicationException ("Could not retrieve column information for table " + tableName + "\n\n" + ex.Message, ex); + } return schemaTable; } *************** *** 212,216 **** conn.Open(); - if (filter.Length > 0) { --- 221,224 ---- *************** *** 250,259 **** } ! public static StringBuilder PrintReaderSchema(string oledbConnectionString, string table) { StringBuilder sb = new StringBuilder(); DataTable schemaTable; ! schemaTable = SchemaBuilder.GetReaderSchema(oledbConnectionString, table); sb.Append("\r\n=========== " + table + " Schema =====================\r\n\r\n"); --- 258,267 ---- } ! public static StringBuilder PrintReaderSchema(string oledbConnectionString, string table, Adapdev.Data.DbType databaseType) { StringBuilder sb = new StringBuilder(); DataTable schemaTable; ! schemaTable = SchemaBuilder.GetReaderSchema(oledbConnectionString, table, databaseType); sb.Append("\r\n=========== " + table + " Schema =====================\r\n\r\n"); |
|
From: Trevor L. <tre...@us...> - 2005-04-11 11:24:28
|
Update of /cvsroot/adapdev/Adapdev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/src Modified Files: AdapdevFramework.suo Log Message: Added missing Oracle classes plus added more code to support Oracle. Oracle code is still a work in progress. Index: AdapdevFramework.suo =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/AdapdevFramework.suo,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsNrkj0I and /tmp/cvsi50ybU differ |
|
From: Trevor L. <tre...@us...> - 2005-04-11 11:24:28
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13843/src/Adapdev.Data/Sql Added Files: OracleCriteria.cs OracleDeleteQuery.cs OracleInsertQuery.cs OracleSelectQuery.cs OracleUpdateQuery.cs Log Message: Added missing Oracle classes plus added more code to support Oracle. Oracle code is still a work in progress. --- NEW FILE: OracleDeleteQuery.cs --- namespace Adapdev.Data.Sql { /// <summary> /// Summary description for SqlDeleteQuery. /// </summary> public class OracleDeleteQuery : DeleteQuery { public OracleDeleteQuery() : base(DbType.ORACLE, DbProviderType.ORACLE) { } public OracleDeleteQuery(string tableName) : base(DbType.ORACLE, DbProviderType.ORACLE, tableName) { } } } --- NEW FILE: OracleCriteria.cs --- namespace Adapdev.Data.Sql { using System.Collections; using System.Text; using Adapdev.Text; /// <summary> /// Summary description for ICriteria. /// </summary> public class OracleCriteria : Criteria { public OracleCriteria() : base(DbType.ORACLE, DbProviderType.ORACLE) { } public OracleCriteria(string sql) : base(DbType.ORACLE, DbProviderType.ORACLE, sql) { } } } --- NEW FILE: OracleUpdateQuery.cs --- namespace Adapdev.Data.Sql { /// <summary> /// Summary description for UpdateQuery. /// </summary> public class OracleUpdateQuery : UpdateQuery { public OracleUpdateQuery() : base(DbType.ORACLE, DbProviderType.ORACLE) { } public OracleUpdateQuery(string tableName) : base(DbType.ORACLE, DbProviderType.ORACLE, tableName) { } } } --- NEW FILE: OracleSelectQuery.cs --- namespace Adapdev.Data.Sql { public class OracleSelectQuery : SelectQuery { public OracleSelectQuery() : base(DbType.ORACLE, DbProviderType.ORACLE) { } public OracleSelectQuery(string tableName) : base(DbType.ORACLE, DbProviderType.ORACLE, tableName) { } } } --- NEW FILE: OracleInsertQuery.cs --- namespace Adapdev.Data.Sql { /// <summary> /// Summary description for SqlInsertQuery. /// </summary> public class OracleInsertQuery : InsertQuery { public OracleInsertQuery() : base(DbType.ORACLE, DbProviderType.ORACLE) { } public OracleInsertQuery(string tableName) : base(DbType.ORACLE, DbProviderType.ORACLE, tableName) { } } } |
|
From: Trevor L. <tre...@us...> - 2005-04-10 09:59:48
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/src/Adapdev.Data.Tests Modified Files: SchemaBuilderTest.cs Log Message: 1. Modifications to support the ProviderConfig file for Database/Provider dynamic customisation 2. Added support classes for Oracle 3. Enhanced UI to support dynamic ProviderConfig Index: SchemaBuilderTest.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/SchemaBuilderTest.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SchemaBuilderTest.cs 25 Mar 2005 02:16:30 -0000 1.1 --- SchemaBuilderTest.cs 10 Apr 2005 09:59:05 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- namespace Adapdev.Data.Tests { + using Adapdev.Data; using Adapdev.Data.Schema; *************** *** 29,32 **** --- 30,155 ---- Assert.IsTrue(ds.Tables.Contains("Orders")); } + + [Test] + public void ProviderConfig() { + ProviderConfig pc = new ProviderConfig(); + Assert.AreEqual(5 ,pc.ConnectionTypes.Count, "Should have 5 Connection Types in the ProviderConfig collection"); + Assert.IsTrue(pc.ConnectionTypes.Contains("Microsoft Access"),"Could not find Microsoft Access"); + Assert.IsTrue(pc.ConnectionTypes.Contains("SQL Server"),"Could not find SQL Server"); + Assert.IsTrue(pc.ConnectionTypes.Contains("SQL Server - Trusted"), "Could not find SQL Server - Trusted"); + Assert.IsTrue(pc.ConnectionTypes.Contains("Oracle"), "Could not find Oracle"); + Assert.IsTrue(pc.ConnectionTypes.Contains("Oracle - Trusted"), "Could not find Oracle -Trusted"); + } + + [Test] + public void ConnectionTypes() { + DbConnectionTypes ct = new DbConnectionTypes(); + Assert.AreEqual(0, ct.Count, "Should be zero items"); + ct.Add("test", new DbConnectionType()); + Assert.AreEqual(1, ct.Count, "Should be one item"); + Assert.IsTrue(ct.Contains("test"),"Should contain test"); + ct.Remove("test"); + Assert.AreEqual(0, ct.Count, "Should be zero items after deleting the item"); + + ct.Add(new DbConnectionType("zarniwoop",DbType.SQLSERVER, "OLEDB",true, true, true, true)); + ct.Add(new DbConnectionType("beeblebrox",DbType.SQLSERVER, "OLEDB",true, true, true, true)); + ct.Add(new DbConnectionType("magrathea",DbType.SQLSERVER, "OLEDB",true, true, true, true)); + ct.Add(new DbConnectionType("marvin",DbType.SQLSERVER, "OLEDB",true, true, true, true)); + ct.Add(new DbConnectionType("vogon",DbType.SQLSERVER, "OLEDB",true, true, true, true)); + + Assert.AreEqual("beeblebrox", ct.GetByIndex(0).Name); + Assert.AreEqual("magrathea", ct.GetByIndex(1).Name); + Assert.AreEqual("marvin", ct.GetByIndex(2).Name); + Assert.AreEqual("vogon", ct.GetByIndex(3).Name); + Assert.AreEqual("zarniwoop", ct.GetByIndex(4).Name); + + ct.Clear(); + Assert.AreEqual(0, ct.Count, "Should be zero items after clearing the collection"); + } + + [Test] + public void ConnectionType() { + DbConnectionType ct = new DbConnectionType(); + Assert.IsNotNull(ct); + + ct = new DbConnectionType("TestType",DbType.SQLSERVER, "OLEDB", true, true, true, true); + Assert.IsFalse(ct.SupportsFile); + Assert.IsTrue(ct.SupportsServer); + ct.SupportsServer = false; + Assert.IsTrue(ct.SupportsFile); + Assert.IsFalse(ct.SupportsServer); + + ct.DbType = DbType.ACCESS; + Assert.AreEqual("ACCESS", ct.DbTypeName); + } + + [Test] + [ExpectedException(typeof(ApplicationException))] + public void ConnectionTypeInternalFails() { + DbConnectionType ct = new DbConnectionType("TestType",DbType.SQLSERVER, "OLEDB", true, true, true, true); + Assert.AreEqual("OLEDB", ct.InternalProviderName); + Assert.IsNull(ct.InternalProvider); + } + + [Test] + public void ConnectionProviders() { + DbConnectionProviders cp = new DbConnectionProviders(); + Assert.AreEqual(0, cp.Count, "Should be zero items"); + cp.Add("test", new DbConnectionProvider()); + Assert.AreEqual(1, cp.Count, "Should be one item"); + Assert.IsTrue(cp.Contains("test"),"Should contain test"); + cp.Remove("test"); + Assert.AreEqual(0, cp.Count, "Should be zero items after deleting the item"); + + DbConnectionType ct = new DbConnectionType("TestType",DbType.SQLSERVER,"OLEDB", true, true, true, true); + ct.Providers = cp; + + cp.Add(new DbConnectionProvider("zarniwoop","SQLSERVER", "provider=mssqlserver", ct)); + cp.Add(new DbConnectionProvider("beeblebrox","SQLSERVER", "provider=mssqlserver", ct)); + cp.Add(new DbConnectionProvider("magrathea","SQLSERVER", "provider=mssqlserver", ct)); + cp.Add(new DbConnectionProvider("marvin","SQLSERVER", "provider=mssqlserver", ct)); + cp.Add(new DbConnectionProvider("vogon","SQLSERVER", "provider=mssqlserver", ct)); + + Assert.AreEqual("beeblebrox", cp.GetByIndex(0).Name, "Items out of order"); + Assert.AreEqual("magrathea", cp.GetByIndex(1).Name, "Items out of order"); + Assert.AreEqual("marvin", cp.GetByIndex(2).Name, "Items out of order"); + Assert.AreEqual("vogon", cp.GetByIndex(3).Name, "Items out of order"); + Assert.AreEqual("zarniwoop", cp.GetByIndex(4).Name, "Items out of order"); + + cp.Clear(); + Assert.AreEqual(0, cp.Count, "Should be zero items after clearing the collection"); + } + + [Test] + public void ConnectionProvider() { + + DbConnectionType ct = new DbConnectionType("TestType",DbType.SQLSERVER,"OLEDB", true, true, true, true); + DbConnectionProvider cp = new DbConnectionProvider(); + Assert.IsNotNull(cp); + + cp = new DbConnectionProvider("TestProvider1", "SQLSERVER", "provider=mssqlserver", ct); + ct.Providers.Add(cp); + cp = new DbConnectionProvider("TestProvider2", "OLEDB", "provider=mssqlserver", ct); + ct.Providers.Add(cp); + + Assert.AreEqual(2, ct.Providers.Count, "Should be two providers."); + + cp.DbType = DbType.ACCESS; + Assert.AreEqual("ACCESS", cp.DbTypeName); + cp.ProviderType = DbProviderType.OLEDB; + Assert.AreEqual("OLEDB", cp.ProviderTypeName); + + ct.InternalProviderName = "TestProvider2"; + Assert.AreEqual("TestProvider2", ct.InternalProvider.Name, "Internal Provider should be 'TestProvider2'"); + + Assert.IsNotNull(cp.Parent,"Parent should not be Null. Should be 'TestType'"); + Assert.IsNotNull(cp.Parent.InternalProvider,"Internal provider should be defined"); + Assert.AreEqual(cp.Parent.InternalProvider.ConnectionString("TestServer"), cp.ConnectionString("TestServer")); + + cp = new DbConnectionProvider("TestProvider","OLEDB", "{0},{1},{2},{3}", ct); + Assert.AreEqual("A,B,C,D", cp.ConnectionString("A","B","C","D")); + } + + } } |
|
From: Trevor L. <tre...@us...> - 2005-04-10 09:59:40
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/src/Adapdev.Data/Xml Modified Files: ProviderInfo.xml Added Files: ProviderConfig.cs ProviderConfig.xml ProviderConfig.xsd ProviderConfig.xsx Log Message: 1. Modifications to support the ProviderConfig file for Database/Provider dynamic customisation 2. Added support classes for Oracle 3. Enhanced UI to support dynamic ProviderConfig --- NEW FILE: ProviderConfig.xsd --- <?xml version="1.0"?> <xs:schema id="adapdev" targetNamespace="http://tempuri.org/ProviderConfig.xsd" xmlns:mstns="http://tempuri.org/ProviderConfig.xsd" xmlns="http://tempuri.org/ProviderConfig.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" attributeFormDefault="qualified" elementFormDefault="qualified"> <xs:element name="adapdev" msdata:IsDataSet="true" msdata:Locale="en-NZ" msdata:EnforceConstraints="False"> <xs:complexType> <xs:choice maxOccurs="unbounded"> <xs:element name="connections"> <xs:complexType> <xs:sequence> <xs:element name="connection" minOccurs="0" maxOccurs="unbounded"> <xs:complexType> <xs:sequence> <xs:element name="providers" minOccurs="0" maxOccurs="unbounded"> <xs:complexType> <xs:sequence> <xs:element name="provider" nillable="true" minOccurs="0" maxOccurs="unbounded"> <xs:complexType> <xs:simpleContent msdata:ColumnName="provider_Text" msdata:Ordinal="1"> <xs:extension base="xs:string"> <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="type" form="unqualified" type="xs:string" use="required"/> <xs:attribute name="allowEmptyParameters" form="unqualified" type="xs:Boolean" use="optional"/> <xs:attribute name="enabled" type="xs:Boolean" use="optional"/> <xs:attribute name="fileMask" type="xs:Boolean" use="optional"/> </xs:extension> </xs:simpleContent> </xs:complexType> </xs:element> </xs:sequence> </xs:complexType> </xs:element> </xs:sequence> <xs:attribute name="name" form="unqualified" type="xs:string" use="required"/> <xs:attribute name="type" form="unqualified" type="xs:string" use="required"/> <xs:attribute name="internalProvider" type="xs:string" use="required"/> <xs:attribute name="supportsServer" form="unqualified" type="xs:Boolean" /> <xs:attribute name="supportsName" form="unqualified" type="xs:Boolean" /> <xs:attribute name="supportsUserID" form="unqualified" type="xs:Boolean" /> <xs:attribute name="supportsPassword" form="unqualified" type="xs:Boolean" /> </xs:complexType> </xs:element> </xs:sequence> </xs:complexType> </xs:element> </xs:choice> </xs:complexType> </xs:element> </xs:schema> --- NEW FILE: ProviderConfig.xml --- <?xml version="1.0" encoding="utf-8"?> <adapdev xmlns="http://tempuri.org/ProviderConfig.xsd"> <connections> <!-- You MUST specify a OLEDB connecion type as a minimum for a provider and specifiy it in the internalProvider attribute. Defining a connection string, use the following field replacement tokens: {0} Server Name or file location {1} Data Source or Initial Catalog Name {2} User Name or UserID to connect as {3} Password Note: When specifying a Driver={name} you must specify using {{ eg: Driver={{SQL Server}} --> <connection name="SQL Server" type="SQLSERVER" internalProvider="OLEDB" supportsServer="true" supportsName="true" supportsUserID="true" supportsPassword="true"> <providers> <provider name="Sql Connect" type="SQLSERVER" allowEmptyParameters="true"> Data Source={0}; Initial Catalog={1}; User ID={2}; Password={3}; Trusted_Connection=false; </provider> <provider name="OLEDB" type="OLEDB"> Provider=sqloledb;Data Source={0}; Initial Catalog={1}; User ID={2}; Password={3}; </provider> <provider name="ODBC" type="ODBC" enabled="false"> Driver={{SQL Server}};Server={0}; Database={1}; Uid={2}; Pwd={3}; </provider> </providers> </connection> <connection name="SQL Server - Trusted" type="SQLSERVER" internalProvider="OLEDB" supportsServer="true" supportsName="true" supportsUserID="false" supportsPassword="false"> <providers> <provider name="Sql Connect" type="SQLSERVER"> Data Source={0}; Initial Catalog={1}; Integrated Security=SSPI; </provider> <provider name="OLEDB" type="OLEDB"> Provider=sqloledb;Data Source={0}; Initial Catalog={1}; Integrated Security=SSPI </provider> <provider name="ODBC" type="ODBC" enabled="false"> Driver={{SQL Server}};Server={0}; Database={1}; Trusted_Connection=yes; </provider> </providers> </connection> <connection name="Microsoft Access" type="ACCESS" internalProvider="OLEDB" supportsServer="false" supportsName="false" supportsUserID="true" supportsPassword="true"> <providers> <provider name="ODBC" type="ODBC" enabled="false"> Driver={{Microsoft Access Driver (*.mdb)}}; Dbq={0}; Uid={2}; Pwd={3}; </provider> <provider name="OLEDB" type="OLEDB" fileMask="Access Database (*.mdb)|*.mdb"> Provider=Microsoft.Jet.OLEDB.4.0; Data Source={0}; User ID={2}; Password={3}; </provider> <provider name="OLEDB (DNS)" type="OLEDB" fileMask="File Data Sources (*.dsn)|*.dsn"> DSN={0};Uid={2};Pwd={3}; </provider> </providers> </connection> <connection name="Oracle" type="ORACLE" internalProvider="OLEDB (Microsoft)" supportsServer="true" supportsName="false" supportsUserID="true" supportsPassword="true"> <providers> <provider name="Oracle Connect" type="ORACLE" enabled="false"> Data Source={0}; User ID={2}; Password={3}; Integrated Security=no; </provider> <provider name="OLEDB (Microsoft)" type="OLEDB" enabled="false"> Provider=msdaora; Data Source={0}; User ID={2}; Password={3}; </provider> <provider name="OLEDB (Oracle)" type="OLEDB" enabled="false"> Provider=OraOLEDB; Data Source={0}; User ID={2}; Password={3}; </provider> <provider name="ODBC" type="ODBC" enabled="false"> Driver={{Microsoft ODBC for Oracle}}; Server={0}; Uid={2}; Pwd={3} </provider> </providers> </connection> <connection name="Oracle - Trusted" type="ORACLE" internalProvider="OLEDB (Oracle)" supportsServer="true" supportsName="false" supportsUserID="false" supportsPassword="false"> <providers> <provider name="Oracle Connect" type="ORACLE" enabled="false"> Data Source={0}; Integrated Security=yes; </provider> <provider name="OLEDB (Oracle)" type="OLEDB" enabled="false"> Provider=OraOLEDB; Data Source={0}; OSAuthent=1; </provider> </providers> </connection> </connections> </adapdev> --- NEW FILE: ProviderConfig.xsx --- <?xml version="1.0" encoding="utf-8"?> <!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.--> <XSDDesignerLayout layoutVersion="2" viewPortLeft="0" viewPortTop="0" zoom="100"> <connections_XmlElement left="317" top="254" width="5292" height="2963" selected="0" zOrder="1" index="0" expanded="1"> <connection_XmlElement left="317" top="3725" width="5292" height="2963" selected="0" zOrder="2" index="0" expanded="1"> <providers_XmlElement left="317" top="7196" width="5292" height="2963" selected="0" zOrder="5" index="0" expanded="1"> <provider_XmlElement left="317" top="10667" width="5292" height="2963" selected="0" zOrder="8" index="0" expanded="1" /> </providers_XmlElement> </connection_XmlElement> </connections_XmlElement> </XSDDesignerLayout> --- NEW FILE: ProviderConfig.cs --- using System; using System.Reflection; using System.Xml; using System.IO; using System.Text.RegularExpressions; namespace Adapdev.Data { /// <summary> /// DBConnectionManager manages the loading of the ADAPDEV.XML file into the DBConnection* classes /// </summary> public class ProviderConfig { private DbConnectionTypes _connectionTypes = null; public ProviderConfig() { _connectionTypes = LoadConfig (FindConfigFile()); } public ProviderConfig( string config) { _connectionTypes = LoadConfig (config); } // Provides Get Access the the COnnection Types Instance public DbConnectionTypes ConnectionTypes { get { return _connectionTypes; } } /// <summary> /// Loads a config file into a XMLDocument and populates a DBConnectionTypes collection of the /// database connection details found in the config file. /// </summary> /// <param name="config">The name (and path) of a config file containing <connection> elements</param> /// <returns>A Collection of Connection Types</returns> private DbConnectionTypes LoadConfig ( string config ) { DbConnectionTypes _connectionTypes = null; // Load the config file into a XML Document instance try { XmlTextReader reader = new XmlTextReader(config); XmlDocument document = new XmlDocument(); try { document.Load(reader); } catch (Exception ex) { throw new ApplicationException(String.Format("Could not load the ProviderConfig.xml configuration file: {0}\n{1}", config, ex.Message)); } XmlNodeReader nodeReader = new XmlNodeReader(document); _connectionTypes = LoadNodes (nodeReader); } catch (Exception ex) { throw new ApplicationException(String.Format("Could not reference the ProviderConfig.xml configuration file: {0}\n{1}", config, ex.Message)); } return _connectionTypes; } /// <summary> /// Load the Connection Type infromation from the XML Stream /// </summary> /// <param name="reader">A Node Reader Node</param> /// <returns>A Collection of Connection Types</returns> private DbConnectionTypes LoadNodes (XmlNodeReader reader) { DbConnectionTypes _connectionTypes = new DbConnectionTypes(); try { reader.MoveToContent(); while (reader.Read()) { switch (reader.NodeType) { case XmlNodeType.Element: if (reader.Name == "connection") { DbConnectionType _connectionType = new DbConnectionType(); if (reader.MoveToFirstAttribute()) { do { switch (reader.Name.ToLower()) { case "name": _connectionType.Name = reader.Value; break; case "type": _connectionType.DbTypeName = reader.Value; break; case "internalprovider": _connectionType.InternalProviderName = reader.Value; break; case "supportsserver": _connectionType.SupportsServer = Convert.ToBoolean(reader.Value); break; case "supportsname": _connectionType.SupportsName = Convert.ToBoolean(reader.Value); break; case "supportsuserid": _connectionType.SupportsUserID = Convert.ToBoolean(reader.Value); break; case "supportspassword": _connectionType.SupportsPassword = Convert.ToBoolean(reader.Value); break; default: break; } } while (reader.MoveToNextAttribute()); } // Read the child <provider> elements for this connection reader.Read(); LoadProviders(_connectionType, _connectionType.Providers, reader.ReadOuterXml()); // Ensure that the connection object has a name. If none was provider, // set the connection name to the database name. if (_connectionType.Name.Equals("")) { _connectionType.Name = _connectionType.DbTypeName; } // Ensure the connection name is unique in the collection int index = 0; while (_connectionTypes.Contains(_connectionType.Name) && index < 100) { _connectionType.Name = _connectionType.Name + Convert.ToString(index++); } if (index > 99) throw new ApplicationException("Internal error occured building a unique Connection Name."); _connectionTypes.Add(_connectionType); } break; } } } catch (Exception ex) { throw new ApplicationException(String.Format("Invalid ProviderConfig.xml (Providers) Configuration File (statement: {0})\n{1}",reader.ToString(),ex.Message)); } return _connectionTypes; } /// <summary> /// Load a "providers" section from the Config File /// </summary> /// <param name="providers"></param> /// <param name="providersXML"></param> private void LoadProviders(DbConnectionType connection, DbConnectionProviders providers, string providersXML) { XmlTextReader reader = new XmlTextReader(new StringReader(providersXML)); DbConnectionProvider _connectionProvider = null; try { while (reader.Read()) { switch (reader.NodeType) { case XmlNodeType.Element: if (reader.Name == "provider") { _connectionProvider = new DbConnectionProvider(); if (reader.MoveToFirstAttribute()) { do { switch (reader.Name.ToLower()) { case "name": _connectionProvider.Name = reader.Value; break; case "type": _connectionProvider.ProviderTypeName = reader.Value; break; case "filemask": _connectionProvider.FileMask = reader.Value; break; case "allowEmptyParameters": _connectionProvider.AllowEmptyParameters = Convert.ToBoolean(reader.Value); break; case "enabled": _connectionProvider.Enabled = Convert.ToBoolean(reader.Value); break; default: break; } } while (reader.MoveToNextAttribute()); // Store the Parent so this instance can reference the parent _connectionProvider.Parent = connection; // Ensure that the provider object has a name. If none was provider, // set the provider name to the database name. if (_connectionProvider.Name.Equals("")) { _connectionProvider.Name = _connectionProvider.DbTypeName; } // Ensure the Provider name is unique in the collection int index = 0; while (providers.Contains(_connectionProvider.Name) && index < 100) { _connectionProvider.Name = _connectionProvider.Name + Convert.ToString(index++); } if (index > 99) throw new ApplicationException("Internal error occured building a unique Provider Name."); } } break; case XmlNodeType.Text: if (_connectionProvider != null) { string connectionTemplate = Regex.Replace(reader.Value, @"[\r\t\n]", ""); _connectionProvider.Template = connectionTemplate.Trim(); } break; case XmlNodeType.EndElement: if (_connectionProvider != null) { providers.Add(_connectionProvider); } _connectionProvider = null; break; } } } catch (Exception ex) { throw new ApplicationException(String.Format("Invalid ProviderConfig.xml (Provider) Configuration File (statement: {0})\n{1}",reader.ToString(),ex.Message)); } finally { _connectionProvider = null; } } /// <summary> /// Determine the location and allow overriding of the ConfigFile /// </summary> /// <returns></returns> public static string FindConfigFile () { string configFile = String.Empty; string possibleConfig = String.Empty; // Look in the current application folder for the file if (configFile == String.Empty) { possibleConfig = AppDomain.CurrentDomain.BaseDirectory + @"ProviderConfig.XML"; if (System.IO.File.Exists(possibleConfig)) { configFile = possibleConfig; } } // If not found there, then override with a hardcoded default // TODO: Allow this to be overriden with the commandline if (configFile == String.Empty) { possibleConfig = @"..\..\..\..\..\Adapdev\src\Adapdev.Data\Xml\ProviderConfig.xml"; if (System.IO.File.Exists(possibleConfig)) { configFile = possibleConfig; } } if (configFile == String.Empty) { throw new ApplicationException(String.Format("Could not find the ProviderConfig.xml configuration file.\n It should exist in {0}", AppDomain.CurrentDomain.BaseDirectory)); } return configFile; } } } Index: ProviderInfo.xml =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Xml/ProviderInfo.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ProviderInfo.xml 28 Feb 2005 01:31:50 -0000 1.1.1.1 --- ProviderInfo.xml 10 Apr 2005 09:59:22 -0000 1.2 *************** *** 614,617 **** --- 614,887 ---- </ProviderInfo> <ProviderInfo Name="oracle"> + <Type> + <Id>1</Id> + <Name>CHAR</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>2</Id> + <Name>NCHAR</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>3</Id> + <Name>VARCHAR2</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>4</Id> + <Name>NVARCHAR2</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>5</Id> + <Name>VARCHAR</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>6</Id> + <Name>NVARCHAR</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>7</Id> + <Name>LONG</Name> + <Object>Int32</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default></Default> + <TestDefault></TestDefault> + </Type> + <Type> + <Id>8</Id> + <Name>NUMBER</Name> + <Object>Decimal</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0.00</TestDefault> + </Type> + <Type> + <Id>9</Id> + <Name>DATE</Name> + <Object>DateTime</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>DateTime.Now</Default> + <TestDefault>DateTime.Now</TestDefault> + </Type> + <Type> + <Id>10</Id> + <Name>TIMESTAMP</Name> + <Object>DateTime</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>DateTime.Now</Default> + <TestDefault>DateTime.Now</TestDefault> + </Type> + <Type> + <Id>11</Id> + <Name>TIMESTAMP WITH LOCAL TIME ZONE</Name> + <Object>DateTime</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>DateTime.Now</Default> + <TestDefault>DateTime.Now</TestDefault> + </Type> + <Type> + <Id>12</Id> + <Name>TIMESTAMP WITH TIME ZONE</Name> + <Object>DateTime</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>DateTime.Now</Default> + <TestDefault>DateTime.Now</TestDefault> + </Type> + <Type> + <Id>13</Id> + <Name>INTERVAL DAY TO SECOND</Name> + <Object>TimeSpan</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>TimeSpan.Zero</Default> + <TestDefault>TimeSpan.Zero</TestDefault> + </Type> + <Type> + <Id>14</Id> + <Name>INTERVAL YEAR TO MONTH</Name> + <Object>TimeSpan</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>TimeSpan.Zero</Default> + <TestDefault>TimeSpan.Zero</TestDefault> + </Type> + <Type> + <Id>15</Id> + <Name>RAW</Name> + <Object>Byte[]</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>null</Default> + <TestDefault>null</TestDefault> + </Type> + <Type> + <Id>16</Id> + <Name>LONGRAW</Name> + <Object>Byte[]</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>null</Default> + <TestDefault>null</TestDefault> + </Type> + <Type> + <Id>17</Id> + <Name>BFILE</Name> + <Object>OracleBFile</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>null</Default> + <TestDefault>null</TestDefault> + </Type> + <Type> + <Id>18</Id> + <Name>BLOB</Name> + <Object>OracleLob</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>null</Default> + <TestDefault>null</TestDefault> + </Type> + <Type> + <Id>19</Id> + <Name>BYTE</Name> + <Object>Byte</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>20</Id> + <Name>CLOB</Name> + <Object>OracleLob</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>null</Default> + <TestDefault>null</TestDefault> + </Type> + <Type> + <Id>21</Id> + <Name>DOUBLE</Name> + <Object>Double</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>22</Id> + <Name>FLOAT</Name> + <Object>Single</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>23</Id> + <Name>INT16</Name> + <Object>Int16</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>24</Id> + <Name>INT32</Name> + <Object>Int32</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>25</Id> + <Name>LONGVARCHAR</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"test"</TestDefault> + </Type> + <Type> + <Id>26</Id> + <Name>NCLOB</Name> + <Object>OracleLob</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>null</Default> + <TestDefault>null</TestDefault> + </Type> + <Type> + <Id>27</Id> + <Name>ROWID</Name> + <Object>String</Object> + <Prefix>'</Prefix> + <Postfix>'</Postfix> + <Default>""</Default> + <TestDefault>"rowid"</TestDefault> + </Type> + <Type> + <Id>28</Id> + <Name>SBYTE</Name> + <Object>SByte</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>29</Id> + <Name>UINT16</Name> + <Object>UInt16</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> + <Type> + <Id>30</Id> + <Name>UINT32</Name> + <Object>UInt32</Object> + <Prefix></Prefix> + <Postfix></Postfix> + <Default>0</Default> + <TestDefault>0</TestDefault> + </Type> </ProviderInfo> <ProviderInfo Name="dbtype_oledb"> |
|
From: Trevor L. <tre...@us...> - 2005-04-10 09:59:40
|
Update of /cvsroot/adapdev/Adapdev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/src Modified Files: AdapdevFramework.suo Log Message: 1. Modifications to support the ProviderConfig file for Database/Provider dynamic customisation 2. Added support classes for Oracle 3. Enhanced UI to support dynamic ProviderConfig Index: AdapdevFramework.suo =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/AdapdevFramework.suo,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsYjpP9U and /tmp/cvsbjcQUx differ |
|
From: Trevor L. <tre...@us...> - 2005-04-10 09:59:37
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/src/Adapdev.Data/Sql Modified Files: CriteriaFactory.cs DialectConstants.cs QueryFactory.cs QueryHelper.cs Log Message: 1. Modifications to support the ProviderConfig file for Database/Provider dynamic customisation 2. Added support classes for Oracle 3. Enhanced UI to support dynamic ProviderConfig Index: QueryFactory.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/QueryFactory.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** QueryFactory.cs 28 Feb 2005 01:31:48 -0000 1.1.1.1 --- QueryFactory.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 32,35 **** --- 32,37 ---- case DbType.SQLSERVER: return new SqlUpdateQuery(); + case DbType.ORACLE: + return new OracleUpdateQuery(); default: throw new System.NotImplementedException("DbType " + db + " not supported currently."); *************** *** 57,60 **** --- 59,64 ---- case DbType.SQLSERVER: return new SqlSelectQuery(); + case DbType.ORACLE: + return new OracleSelectQuery(); default: throw new System.NotImplementedException("DbType " + db + " not supported currently."); *************** *** 89,92 **** --- 93,98 ---- case DbType.SQLSERVER: return new SqlDeleteQuery(); + case DbType.ORACLE: + return new OracleDeleteQuery(); default: throw new System.NotImplementedException("DbType " + db + " not supported currently."); *************** *** 121,124 **** --- 127,132 ---- case DbType.SQLSERVER: return new SqlInsertQuery(); + case DbType.ORACLE: + return new OracleInsertQuery(); default: throw new System.NotImplementedException("DbType " + db + " not supported currently."); Index: QueryHelper.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/QueryHelper.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** QueryHelper.cs 28 Feb 2005 01:31:48 -0000 1.1.1.1 --- QueryHelper.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 55,58 **** --- 55,60 ---- case Adapdev.Data.DbType.SQLSERVER: return DialectConstants.SQLSERVER_DATE; + case Adapdev.Data.DbType.ORACLE: + return DialectConstants.ORACLE_DATE; default: throw new Exception("DbType " + type + " not supported currently."); *************** *** 73,76 **** --- 75,80 ---- case Adapdev.Data.DbType.SQLSERVER: return DialectConstants.SQLSERVER_PREDELIM; + case Adapdev.Data.DbType.ORACLE: + return DialectConstants.ORACLE_PREDELIM; default: throw new Exception("DbType " + type + " not supported currently."); *************** *** 91,94 **** --- 95,100 ---- case Adapdev.Data.DbType.SQLSERVER: return DialectConstants.SQLSERVER_POSTDELIM; + case Adapdev.Data.DbType.ORACLE: + return DialectConstants.ORACLE_POSTDELIM; default: throw new Exception("DbType " + type + " not supported currently."); *************** *** 109,112 **** --- 115,120 ---- case Adapdev.Data.DbType.SQLSERVER: return DialectConstants.SQLSERVER_STRING; + case Adapdev.Data.DbType.ORACLE: + return DialectConstants.ORACLE_STRING; default: throw new Exception("DbType " + type + " not supported currently."); *************** *** 127,130 **** --- 135,141 ---- columnName = StringUtil.RemoveSpaces(columnName); return "@" + columnName; + case DbProviderType.ORACLE: + columnName = StringUtil.RemoveSpaces(columnName); + return columnName; case DbProviderType.OLEDB: return "?"; Index: DialectConstants.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/DialectConstants.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DialectConstants.cs 28 Feb 2005 01:31:48 -0000 1.1.1.1 --- DialectConstants.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 15,18 **** --- 15,23 ---- public const char SQLSERVER_DATE = '\''; public const char SQLSERVER_STRING = '\''; + + public const char ORACLE_PREDELIM = ' '; + public const char ORACLE_POSTDELIM = ' '; + public const char ORACLE_DATE = '\''; + public const char ORACLE_STRING = '\''; } } \ No newline at end of file Index: CriteriaFactory.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Sql/CriteriaFactory.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CriteriaFactory.cs 28 Feb 2005 01:31:48 -0000 1.1.1.1 --- CriteriaFactory.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 16,19 **** --- 16,21 ---- case DbType.SQLSERVER: return new SqlServerCriteria(); + case DbType.ORACLE: + return new OracleCriteria(); default: throw new Exception("DbType " + type + " not supported currently."); |
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/src/Adapdev.Windows.Forms Modified Files: DatabaseSetting.cs DatabaseWizard.cs DatabaseWizard.resx DatabaseWizardForm.cs DatabaseWizardForm.resx Log Message: 1. Modifications to support the ProviderConfig file for Database/Provider dynamic customisation 2. Added support classes for Oracle 3. Enhanced UI to support dynamic ProviderConfig Index: DatabaseSetting.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseSetting.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseSetting.cs 28 Feb 2005 01:32:43 -0000 1.1.1.1 --- DatabaseSetting.cs 10 Apr 2005 09:59:22 -0000 1.2 *************** *** 1,4 **** ! namespace Adapdev.Windows.Forms ! { using System; using Adapdev.Data; --- 1,3 ---- ! namespace Adapdev.Windows.Forms { using System; using Adapdev.Data; *************** *** 6,148 **** [Serializable] ! public class DatabaseSetting ! { private string connectionName; ! public string ConnectionName ! { get { return this.connectionName; } set { this.connectionName = value; } } ! private string userName; ! ! public string UserName ! { ! get ! { ! return userName; ! } ! set ! { ! userName = value; ! } } ! private string password; ! ! public string Password ! { ! get ! { ! return password; ! } ! set ! { ! password = value; ! } } ! private string databaseName; ! ! public string DatabaseName ! { ! get ! { ! return databaseName; ! } ! set ! { ! databaseName = value; ! } } ! private string databaseLocation; ! ! public string DatabaseLocation ! { ! get ! { ! return databaseLocation; ! } ! set ! { ! databaseLocation = value; ! } } ! private string connectionType; ! ! public string ConnectionType ! { ! get ! { ! return connectionType; ! } ! set ! { ! connectionType = value; ! } } ! private string connectionString; ! ! public string ConnectionString ! { ! get ! { ! return connectionString; ! } ! set ! { ! connectionString = value; ! } } ! private string oleDbConnectionString; ! ! public string OleDbConnectionString ! { ! get ! { ! return oleDbConnectionString; ! } ! set ! { ! oleDbConnectionString = value; ! } } ! private DbType dbType; ! ! public DbType DbType ! { ! get ! { ! return dbType; ! } ! set ! { ! dbType = value; ! } } ! private DbProviderType dbProviderType; ! public DbProviderType DbProviderType ! { ! get ! { ! return dbProviderType; ! } ! set ! { ! dbProviderType = value; ! } } ! public DatabaseSchema GetDatabaseSchema() ! { DatabaseSchema schema = SchemaBuilder.CreateDatabaseSchema(this.OleDbConnectionString, this.DbProviderType); schema.ConnectionString = this.ConnectionString; --- 5,84 ---- [Serializable] ! public class DatabaseSetting { ! private string connectionName; + private string userName; + private string password; + private string databaseName; + private string databaseLocation; + private string connectionType; + private string connectionString; + private string oleDbConnectionString; + private string refConnection; + private string refProvider; + private DbType dbType; + private DbProviderType dbProviderType; ! public string ConnectionName { get { return this.connectionName; } set { this.connectionName = value; } } ! public string UserName { ! get { return userName; } ! set { userName = value; } } ! public string Password { ! get { return password; } ! set { password = value; } } ! public string DatabaseName { ! get { return databaseName; } ! set { databaseName = value; } } ! public string DatabaseLocation { ! get { return databaseLocation; } ! set { databaseLocation = value; } } ! public string ConnectionType { ! get { return connectionType; } ! set { connectionType = value; } } ! public string ConnectionString { ! get { return connectionString; } ! set { connectionString = value; } } ! public string OleDbConnectionString { ! get { return oleDbConnectionString; } ! set { oleDbConnectionString = value; } } ! public DbType DbType { ! get { return dbType; } ! set { dbType = value; } } ! public DbProviderType DbProviderType { ! get { return dbProviderType; } ! set { dbProviderType = value; } ! } ! public string ConnectionRef { ! get { return refConnection; } ! set { refConnection = value; } } + public string ProviderRef { + get { return refProvider; } + set { refProvider = value; } + } ! public DatabaseSchema GetDatabaseSchema() { DatabaseSchema schema = SchemaBuilder.CreateDatabaseSchema(this.OleDbConnectionString, this.DbProviderType); schema.ConnectionString = this.ConnectionString; Index: DatabaseWizardForm.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseWizardForm.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseWizardForm.cs 28 Feb 2005 01:32:45 -0000 1.1.1.1 --- DatabaseWizardForm.cs 10 Apr 2005 09:59:22 -0000 1.2 *************** *** 83,87 **** // this.databaseWizard1.ConnectionName = ""; - this.databaseWizard1.ConnectionType = "SqlServer"; this.databaseWizard1.DbLocation = ""; this.databaseWizard1.DbName = ""; --- 83,86 ---- *************** *** 95,99 **** // btnSave // ! this.btnSave.Location = new System.Drawing.Point(200, 240); this.btnSave.Name = "btnSave"; this.btnSave.TabIndex = 1; --- 94,98 ---- // btnSave // ! this.btnSave.Location = new System.Drawing.Point(336, 248); this.btnSave.Name = "btnSave"; this.btnSave.TabIndex = 1; *************** *** 103,107 **** // btnCancel // ! this.btnCancel.Location = new System.Drawing.Point(296, 240); this.btnCancel.Name = "btnCancel"; this.btnCancel.TabIndex = 2; --- 102,106 ---- // btnCancel // ! this.btnCancel.Location = new System.Drawing.Point(416, 248); this.btnCancel.Name = "btnCancel"; this.btnCancel.TabIndex = 2; *************** *** 112,116 **** // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); ! this.ClientSize = new System.Drawing.Size(496, 278); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); --- 111,115 ---- // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); ! this.ClientSize = new System.Drawing.Size(504, 278); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); Index: DatabaseWizard.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseWizard.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseWizard.cs 28 Feb 2005 01:32:44 -0000 1.1.1.1 --- DatabaseWizard.cs 10 Apr 2005 09:59:22 -0000 1.2 *************** *** 1,29 **** using System; using System.Collections; - using System.ComponentModel; - using System.Drawing; using System.Data; using System.Windows.Forms; using Adapdev.Data; ! namespace Adapdev.Windows.Forms ! { [...1309 lines suppressed...] ! this.lblName.Enabled = state; ! if (!state) this.tbName.Text = ""; } ! private void SetPromptUsernameState ( bool state ) { ! this.tbUsername.Enabled = state; ! this.lblUsername.Enabled = state; ! if (!state) this.tbUsername.Text = ""; ! } ! ! private void SetPromptPasswordState ( bool state ) { ! this.tbPassword.Enabled = state; ! this.lblPassword.Enabled = state; ! if (!state) this.tbPassword.Text = ""; } + + #endregion + } } Index: DatabaseWizard.resx =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseWizard.resx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseWizard.resx 28 Feb 2005 01:32:45 -0000 1.1.1.1 --- DatabaseWizard.resx 10 Apr 2005 09:59:22 -0000 1.2 *************** *** 98,216 **** <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> ! <data name="gbConnectionType.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="gbConnectionType.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>8, 8</value> ! </data> ! <data name="gbConnectionType.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="gbConnectionType.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> </data> ! <data name="gbConnectionType.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> </data> ! <data name="gbConnectionType.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbAccess.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="rbAccess.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="rbAccess.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbAccessDSN.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="rbAccessDSN.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbAccessDSN.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServer.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="rbSqlServer.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServer.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServerTrustedOleDb.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="rbSqlServerTrustedOleDb.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServerTrustedOleDb.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServerTrusted.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="rbSqlServerTrusted.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServerTrusted.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="rbSqlServerOleDb.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> </data> ! <data name="rbSqlServerOleDb.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="rbSqlServerOleDb.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="btnOpenFile.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="btnOpenFile.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="btnOpenFile.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="tbConnectionName.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbConnectionName.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="tbConnectionName.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> ! </data> ! <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="label3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="label3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="label3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> --- 98,261 ---- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> ! <data name="openFileDialog1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="openFileDialog1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="openFileDialog1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>17, 17</value> </data> ! <data name="tbConnectionString.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbConnectionString.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="tbConnectionString.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="lblConnection.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="lblConnection.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="lblConnection.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnNewDatabase.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="btnNewDatabase.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnNewDatabase.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnTestConnection.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="btnTestConnection.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnTestConnection.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="imageList1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="imageList1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="imageList1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>147, 17</value> </data> ! <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> ! <value> ! AAEAAAD/////AQAAAAAAAAAMAgAAAFpTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0xLjAuNTAw ! MC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZT ! eXN0ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMA ! AAAqDwAAAk1TRnQBSQFMAgEBBAEAAQkBAAEEAQABEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgD ! AAFAAwABMAMAAQEBAAEYBgABJP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/ ! AP8A/wD/AEIAAQIBcwGoAQIBcwGoAQIBcwGoAQIBcwGoAQIBcwGoAQIBcwGoIQABAwEMAaEBAwEMAaFa ! AAZ+BgAGfhgAAQgBfAGuAS4BpQHKASsBvwHoASQBwQHtAVMB3QH0AToBuwHeARQBiAG3AQIBcwGoCQAB ! DgGDAbIBDgGDAbIBDgGDAbIBDgGDAbIBDgGDAbIBDgGDAbIBAwEMAaEBBAEUAbgBBQEaAcwBAwEMAaEb ! AAELAYEBrgELAYEBrgELAYEBrgELAYEBrgELAYEBrgELAYEBrhsADIgDfgO/A4gGfgOSA4gDfhUAAQIB ! cwGoAWQB5gH3ASQBzgH5ASQBzgH5AWAB5gH4AWkB5QH3ASkBnwHGAQIBcwGoBgABCAGNAboBSgHXAfIB ! NQHZAfsBNQHZAfsBgQHkAf0BgQHkAf0BKgFHAagBBAEZAckBCwEoAdwBBgEeAdEBBQEaAcwBAwEMAaEV ! AAEKAY0BuwE+AckB7AEnAdYB/AE2AdkB/AFrAegB/AGMAfAB/AFKAcIB4gELAYIBrxUAA4gDtAOvA7QD ! yAN+A68DtAaIAZ8BjQGfA4gDfgYAAQIBcwGoAQIBcwGoAQIBcwGoAQIBcwGnAQcBbwGhAQIBcwGoAV0B ! 5wH5ASQBzgH5ASEBzAH4AV0B5wH5AWkB5QH3ASMBmgHDAQIBcwGoAwABCAGNAboBiwH2Af0BSQHiAfwB ! NQHZAfsBNQHZAfsBgQHkAf0BNAFNAZ4BCwEoAdwBMgFgAfgB8AH8Af4BEQEyAeMBBgEeAdEBBQEaAcwB ! AwEMAaEPAAEKAY0BuwGKAfQB/QFXAeMB/AEnAdYB/AE2AdkB/AFrAegB/AGMAfAB/AFKAcIB4gELAZYB ! xQELAYEBrg8AA4gD1gPAA68DtAPIA9YDdgOvA7QBmQGRAZkGfgYAAQgBfAGuAS4BpQHKASsBvwHoASQB ! wQHtAToBuwHeAR8BkAG8AQIBcwGoAWAB5gH4ASQBzgH5ASwB0AH4AXMB7QH6AWkB5QH3ASkBnwHGAQIB ! cwGoAwABCAGNAboBiwH2Af0BSQHiAfwBNQHZAfsBNQHZAfsBKgFHAagBFgE4AeQBOQFlAfQB8AH8Af4B ! 0QHxAf4BpwGRAf0BCwEoAdwBBgEeAdEBBQEaAcwBAwEMAaEMAAEKAY0BuwGKAfQB/QFXAeMB/AEnAdYB ! /AE2AdkB/AFrAegB/AGMAfAB/AFKAcIB4gELAZYBxQELAYEBrg8AA4gD1gPAA68DtAPAA9YDdgOvA8AD ! tAOIA34GAAECAXMBqAFkAeYB9wEkAc4B+QEhAcwB+AFTAd0B9AE0AaoBzQECAXMBqAGmAesB9AGcAe0B ! 9gGmAesB9AGmAesB9AGmAesB9AGIAfEB+QECAXMBqAMAAQgBjQG6AYsB9gH9AUkB4gH8ATUB2QH7ATUB ! 2QH7AR0BNQGvATkBZQH0AS8BXQH6ATkBZQH0AS8BXQH6AfAB/AH+ASwBWAH4AQsBKAHcAQYBHgHRAQUB ! GgHMAQMBDAGhCQABCgGNAbsBigH0Af0BVwHjAfwBJwHWAfwBNgHZAfwBawHoAfwBjAHwAfwBSgHCAeIB ! CwGWAcUBCwGBAa4PAAOIA9YDwAOvA7QDyAN+A68DwAmvA4gDfgMAAQIBcwGoAV0B5wH5ASQBzgH5ASAB ! yAH2AVMB3QH0AS4BpQHKAQIBcwGoATwBswHVAR8BkAG8AQgBfAGuAQgBfAGuASMBlgHAAS4BpQHKAQIB ! cwGoAwABCAGNAboBrwH1Af0BtQHzAf0ByQHvAf4B5gH5Af4BOQFnAeMBOgFmAegBOQFlAfQBLwFdAfoB ! KAFSAfQBpwGRAf0B8AH8Af4BpwGRAf0BEQEyAeMBBAEUAbgBAwEMAaEJAAEKAY0BuwGSAfUB/AGCAfEB ! /QF0Ae8B/gF8AfEB/QGSAfUB/AGiAfoB/QFkAeUB+wELAZYBxQELAYEBrg8AA4gJ4AHvAe0C7wHtAe8D ! fgPIA7QGfgavA34DAAECAXMBqAFgAeYB+AEkAc4B+QEsAdAB+AFpAeUB9wE0AaoBzQECAXMBqAE8AbMB ! 1QEkAcEB7QEhAcwB+AFYAeMB9wE1AbwB4gEUAYgBtwECAXMBqAMAAQgBjQG6AbkB8wH+AS4BvgHiARYB ! pQHQAQ8BnwHMARYBpQHQASoBRwGoAToBZgHoATkBZQH0AS8BXQH6ASgBUgH0ATkBZQH0AZUBtQH9ASoB ! RwGoAQMBDAGhDAABCgGNAbsBvAHzAfQBRAG/AeEBCwGWAcUBCwGWAcUBCwGWAcUBRAG/AeEBDAGSAb8B ! pAHQAdEBCwGBAa4PAAOIA+ADrwaSAZkBkQGZAZ8BjQGfA4gDfgOIAwAGfgYAAQIBcwGoAaYB6wH0AZwB ! 7QH2AaYB6wH0AaYB6wH0A58BAgFzAagBXQHnAfkBJAHOAfkBIQHMAfgBXQHnAfkBaQHlAfcBIwGaAcMB ! AgFzAagDAAEIAY0BugFXAcwB5AFJAeIB/AE1AdkB+wE1AdkB+wGBAeQB/QGBAeQB/QEqAUcBqAE6AWYB ! 6AE5AWUB9AEvAV0B+gEoAVIB9AELASgB3AEDAQwBoQ8AAQoBjQG7AUoBwgHiAVcB4wH8AScB1gH8ATYB ! 2QH8AWsB6AH8AYwB8AH8AUoBwgHiAQsBggGvAQsBgQGuDwADiAO0A78GtAPIA9YDrwaIDwABAgFzAagB ! PAGzAdUBHwGQAbwBCAF8Aa4BBgFxAaIBCgFuAaIBAgFzAagBXQHnAfkBJAHOAfkBIQHMAfgBXQHnAfkB ! aQHlAfcBIwGaAcMBAgFzAagDAAEIAY0BugGLAfYB/QFJAeIB/AE1AdkB+wE1AdkB+wGBAeQB/QGBAeQB ! /QFXAcwB5AEqAUcBqAE6AWYB6AE5AWUB9AEWATgB5AEDAQwBoRIAAQoBjQG7AYoB9AH9AVcB4wH8AScB ! 1gH8ATYB2QH8AWsB6AH8AYwB8AH8AUoBwgHiAQsBlgHFAQsBgQGuDwADiAPWA78DrwO0BsgDtAOSA4gP ! AAECAXMBqAE8AbMB1QEkAcEB7QEgAcgB9gFTAd0B9AEjAZYBwAECAXMBqAGmAesB9AGRAfAB+AF+AfAB ! +gF+AfAB+gF+AfAB+gFEAdcB9AECAXMBqAMAAQgBjQG6AYsB9gH9AUkB4gH8ATUB2QH7ATUB2QH7AYEB ! 5AH9AYEB5AH9AVcBzAHkAQ4BnQHLAR0BNQGvAR0BNQGvAQMBDAGhFQABCgGNAbsBigH0Af0BVwHjAfwB ! JwHWAfwBNgHZAfwBawHoAfwBjAHwAfwBSgHCAeIBCwGWAcUBCwGBAa4PAAOIA9YDvwOvA7QDyAPWA68D ! kgOIDwABAgFzAagBXQHnAfkBJAHOAfkBIAHIAfYBUwHdAfQBNAGqAc0BAgFzAagBpgHrAfQBpgHrAfQB ! owHsAfUBiAHxAfkBiAHxAfkBZAHmAfcBAgFzAagDAAEIAY0BugGLAfYB/QFJAeIB/AE1AdkB+wE1AdkB ! +wGBAeQB/QGBAeQB/QFXAcwB5AEOAZ0BywEOAYMBshsAAQoBjQG7AYoB9AH9AVcB4wH8AScB1gH8ATYB ! 2QH8AWsB6AH8AYwB8AH8AUoBwgHiAQsBlgHFAQsBgQGuDwADiAPWA78DrwO0A8AD1gO0A5IDiA8AAQIB ! cwGoAV0B5wH5ASQBzgH5ASEBzAH4AVgB4wH3AT8BtwHZAQ8BbAGmAQIBcwGnAQIBcwGoAQIBcwGoAQIB ! cwGoAQIBcwGoAQIBcwGoBgABCAGNAboBkgH2Af0BiAH2Af0BiAH2Af0BiAH2Af0BlgH1Af0BngH0Af0B ! RwHaAfYBDwGfAcwBDgGDAbIbAAEKAY0BuwGSAfUB/AGCAfEB/QF0Ae8B/gF8AfEB/QGSAfUB/AGiAfoB ! /QFkAeUB+wELAZYBxQELAYEBrg8AA4gD1gnIA9kD1gO/A5IDiA8AAQIBcwGoAaYB6wH0AZEB8AH4AX4B ! 8AH6AX4B8AH6AX4B8AH6AToBuwHeAQcBbwGhFQABCAGNAboB8AH8Af4B8AH8Af4B2AH0Af4BtQHzAf0B ! rwH1Af0BrwH1Af0BqAH0Af0BiAH2Af0BDgGDAbIbAAEKAY0BuwHMAf0B/gHMAf0B/gHMAf0B/gG0AfsB ! /QG0AfsB/QGvAfsB/QGvAfsB/QF0Ae8B/gELAYEBrg8AA4gB7wHtAu8B7QLvAe0B7wbZA+AD2QPIA4gP ! AAECAXMBqAGmAesB9AGmAesB9AGjAewB9QGIAfEB+QGIAfEB+QFkAeYB9wECAXMBpxgAAQkBkQG/Ae8B ! +wH9AeYB+QH+AckB7wH+Aa8B9QH9AagB9AH9AZkB9QH9AQ0BhAGxIQABDAGSAb8BzAH9Af4BzAH9Af4B ! xgH9Af4BrwH7Af0BogH6Af0BnQH4Af0BDAGFAbEVAAOSAe8B7QLvAe0B7wbgBtkDiBUAAQIBcwGnAQIB ! cwGoAQIBcwGoAQIBcwGoAQIBcwGoAQIBcwGoHgABCAGNAboBCAGNAboBCAGNAboBCAGNAboBCAGNAboB ! CAGNAbonAAEKAY0BuwEKAY0BuwEKAY0BuwEKAY0BuwEKAY0BuwEKAY0BuxsABogDkgOIA5IDiBIAAUIB ! TQE+BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD//8AAgAB/wEDAf8BnwP/AZkB/gEBAcAB ! DwH4AR8B8AEAAf4BAQGAAQcB8AEPAeABAAHAAQEBAAEDAeABBwHAAQEBgAEBAQABAQHgAQcBwAEBAYAB ! AQIAAeABBwHAAQABgAEBAgAB4AEHAcABAAGAAQEBAAEBAeABBwHAAQkBgAEBAQABAwHgAQcBwAEPAYAB ! AQEAAQcB4AEHAcABDwGAAQEBAAEPAeABBwHAAQ8BgAEBAQABPwHgAQcBwAEPAYABAwEAAT8B4AEHAcAB ! DwGAAX8BAAE/AeABBwHAAQ8BgAF/AYABfwHwAQ8B4AEfAcAB/wHAAf8B+AEfAfABPws= ! </value> </data> ! <data name="groupBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="groupBox1.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>8, 8</value> </data> ! <data name="groupBox1.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> </data> ! <data name="groupBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="groupBox1.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> </data> ! <data name="groupBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbLocation.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbLocation.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="tbLocation.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnOpenFile.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="btnOpenFile.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnOpenFile.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> *************** *** 278,335 **** <value>Private</value> </data> ! <data name="tbLocation.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbLocation.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="tbLocation.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="openFileDialog1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="openFileDialog1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="openFileDialog1.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>17, 17</value> </data> ! <data name="tbConnectionString.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbConnectionString.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="tbConnectionString.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="lblConnection.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="lblConnection.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="lblConnection.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnNewDatabase.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="btnNewDatabase.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>Private</value> </data> ! <data name="btnNewDatabase.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnTestConnection.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> ! </data> ! <data name="btnTestConnection.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="btnTestConnection.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> --- 323,389 ---- <value>Private</value> </data> ! <data name="groupBox2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="groupBox2.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>8, 8</value> ! </data> ! <data name="groupBox2.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="groupBox2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="groupBox2.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> </data> ! <data name="groupBox2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbConnectionName.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tbConnectionName.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>False</value> </data> ! <data name="tbConnectionName.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="groupBox3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="groupBox3.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> ! <value>8, 8</value> ! </data> ! <data name="groupBox3.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> ! </data> ! <data name="groupBox3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> </data> ! <data name="groupBox3.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> ! <value>True</value> </data> ! <data name="groupBox3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tvConnectionTypes.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> ! <data name="tvConnectionTypes.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="tvConnectionTypes.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>False</value> + </data> <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>False</value> *************** *** 353,362 **** <value>False</value> </data> - <data name="$this.Name"> - <value>DatabaseWizard</value> - </data> <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> --- 407,416 ---- <value>False</value> </data> <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>Private</value> </data> + <data name="$this.Name"> + <value>DatabaseWizard</value> + </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> Index: DatabaseWizardForm.resx =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseWizardForm.resx,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseWizardForm.resx 28 Feb 2005 01:32:45 -0000 1.1.1.1 --- DatabaseWizardForm.resx 10 Apr 2005 09:59:22 -0000 1.2 *************** *** 137,146 **** <value>False</value> </data> - <data name="$this.Name"> - <value>DatabaseWizardForm</value> - </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> --- 137,146 ---- <value>False</value> </data> <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>8, 8</value> </data> + <data name="$this.Name"> + <value>DatabaseWizardForm</value> + </data> <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> |
|
From: Trevor L. <tre...@us...> - 2005-04-10 09:59:35
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/src/Adapdev.Data Modified Files: Adapdev.Data.csproj CommandTextViewer.cs ConnectionStringBuilder.cs DbProviderFactory.cs DbProviderTypeConverter.cs DbTypeConverter.cs Added Files: DbConnectionProvider.cs DbConnectionProviders.cs DbConnectionType.cs DbConnectionTypes.cs Log Message: 1. Modifications to support the ProviderConfig file for Database/Provider dynamic customisation 2. Added support classes for Oracle 3. Enhanced UI to support dynamic ProviderConfig --- NEW FILE: DbConnectionProvider.cs --- using System; using System.Collections; namespace Adapdev.Data { /// <summary> /// The ConnectionType class is a static class designed to provide a wrapper around the various types /// of connections supported by the connection Wizard. /// </summary> public class DbConnectionProvider { // Private Instance Variables private string _name = string.Empty; private string _template = string.Empty; private string _fileMask = string.Empty; private DbProviderType _type = DbProviderType.ODBC; private DbConnectionType _parent = null; private bool _enabled = true; private bool _emptyParm = false; public DbConnectionProvider() { } public DbConnectionProvider( string name, string type, string template, DbConnectionType parent) { Name = name; Template = template; ProviderTypeName = type; Parent = parent; } /// <summary> /// Functions to return a connection string for "this" Provider /// </summary> public string ConnectionString(string server) { return BuildConnectionString(this.Template, server, "", "", ""); } public string ConnectionString(string server, string database) { return BuildConnectionString(this.Template, server, database, "", ""); } public string ConnectionString(string server, string userid, string password) { return BuildConnectionString(this.Template, server, "", userid, password); } public string ConnectionString(string server, string database, string userid, string password) { return BuildConnectionString(this.Template, server, database, userid, password); } /// <summary> /// Functions to return a connection string for the "Internally used" Provider /// </summary> public string InternalProviderString(string server) { return BuildConnectionString(this.InternalProvider.Template, server, "", "", ""); } public string InternalProviderString(string server, string database) { return BuildConnectionString(this.InternalProvider.Template, server, database, "", ""); } public string InternalProviderString(string server, string userid, string password) { return BuildConnectionString(this.InternalProvider.Template, server, "", userid, password); } public string InternalProviderString(string server, string database, string userid, string password) { return BuildConnectionString(this.InternalProvider.Template, server, database, userid, password); } /// <summary> /// Returns a Connection String formatted based on the inputs /// </summary> /// <param name="server">If specified, the server location or server name</param> /// <param name="database">If specified the Name of the database or Initial Catalog</param> /// <param name="userid">If specified the UserID</param> /// <param name="password">If Specified the Password</param> /// <returns></returns> private string BuildConnectionString (string template, string server, string database, string userid, string password) { // Format the string based on the template from the configuration file string connectionString = String.Format(template, server, database, userid, password); // We need to remove any blank entries from the connection string. For example, if no UserID is // specified, rathern than having a connection string of UserID=; we remove the text between ; and =; if (!_emptyParm) { int stripTo = connectionString.IndexOf("=;"); while (stripTo > 0) { int stripFrom = connectionString.Substring(0, stripTo - 1).LastIndexOf(";"); if (stripFrom > 0) { connectionString = connectionString.Substring(0, stripFrom + 1).Trim() + (stripTo == 0 ? "" : connectionString.Substring(stripTo + 2)).Trim(); } else { connectionString = connectionString.Substring(stripTo + 2).Trim(); } stripTo = connectionString.IndexOf("=;"); } } return connectionString; } /// <summary> /// Get or Sets the Name of this Connection Object /// </summary> public string Name { get { return _name; } set { _name = value; } } /// <summary> /// True if this Provider is enabled, False if it is Disabled /// </summary> public bool Enabled { get { return _enabled; } set { _enabled = value; } } /// <summary> /// Gets or Sets the default File Mask for this provider (if a filebase provider) /// </summary> public string FileMask { get { return _parent.SupportsFile ? _fileMask : ""; } set { _fileMask = value; } } /// <summary> /// Determines if empty parameters are allowed in the connection string. /// If set to False, then empty parameters are cleaned and removed from the /// connection string when built. /// </summary> public bool AllowEmptyParameters { get { return _emptyParm; } set { _emptyParm = value; } } /// <summary> /// Gets or Sets the string used to generate the Connection String /// </summary> public string Template { get { return _template; } set { _template = value; } } /// <summary> /// Gets or sets the Provider of this Connection Type /// </summary> public DbProviderType ProviderType { get { return _type; } set { _type = value; } } /// <summary> /// Gets ort sets the Provider Type by Name /// </summary> public string ProviderTypeName { set { _type = DbProviderTypeConverter.Convert(value); } get { return DbProviderTypeConverter.Convert(_type); } } /// <summary> /// Property to Set/Get the enum of this Connection type /// </summary> public DbType DbType { get { return _parent.DbType; } set { _parent.DbType = value;} } /// <summary> /// Gets or Sets the DbType by Name rather than enum /// </summary> public string DbTypeName { get { return _parent.DbTypeName; } set { _parent.DbTypeName = value; } } /// <summary> /// Returns the OLEDB Version of this Objects Connection Reference /// </summary> public DbConnectionProvider InternalProvider { get { if (this._name.Equals(_parent.InternalProviderName)) return this; return this._parent.InternalProvider; } } /// <summary> /// Gets who the Parent is for this Provider /// </summary> public DbConnectionType Parent { get { return _parent; } set { _parent = value; } } } } Index: DbTypeConverter.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbTypeConverter.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DbTypeConverter.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- DbTypeConverter.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 27,30 **** } } } ! } \ No newline at end of file --- 27,48 ---- } } + + public static string Convert(DbType t) { + switch (t) { + case DbType.ACCESS: + return "ACCESS"; + case DbType.DB2: + return "DB2"; + case DbType.MYSQL: + return "MYSQL"; + case DbType.ORACLE: + return "ORACLE"; + case DbType.SQLSERVER: + return "SQLSERVER"; + default: + throw new Exception("DbType " + t.ToString() + " not found."); + } + } + } ! } Index: DbProviderTypeConverter.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbProviderTypeConverter.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DbProviderTypeConverter.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- DbProviderTypeConverter.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 8,12 **** public class DbProviderTypeConverter { - public static DbProviderType Convert(string s) { --- 8,11 ---- *************** *** 30,33 **** --- 29,53 ---- } } + + public static string Convert(DbProviderType t) { + + switch (t) { + case DbProviderType.ODBC: + return "ODBC"; + case DbProviderType.OLEDB: + return "OLEDB"; + case DbProviderType.ORACLE: + return "ORACLE"; + case DbProviderType.SQLSERVER: + return "SQLSERVER"; + case DbProviderType.MYSQL: + return "MYSQL"; + case DbProviderType.DB2: + return "DB2"; + default: + throw new Exception("DbProviderType " + t.ToString() + " not found."); + } + } + } } \ No newline at end of file --- NEW FILE: DbConnectionProviders.cs --- using System; using System.Collections; namespace Adapdev.Data { /// <summary> /// Represents a strongly-typed collection of key-and-value pairs that are /// sorted by the keys and are accessible by key and by index. /// </summary> /// <seealso cref="System.Collections.SortedList"/> [Serializable] public class DbConnectionProviders : IDictionary, ICloneable { #region Member Variables private const int DEFAULT_CAPACITY = 16; private string[] keys; private DbConnectionProvider[] values; private int count; [NonSerialized] [...1333 lines suppressed...] throw new ArgumentException("The value must be of type: " + typeof(DbConnectionProvider).FullName, "value"); return list.IndexOfValue((DbConnectionProvider)value); } public virtual int IndexOf(DbConnectionProvider value) { return list.IndexOfValue(value); } public virtual void Remove(object key) { throw new NotSupportedException("Cannot modify a read-only list."); } public virtual void RemoveAt(int index) { throw new NotSupportedException("Cannot modify a read-only list."); } } #endregion } } --- NEW FILE: DbConnectionType.cs --- using System; using System.Collections; namespace Adapdev.Data { /// <summary> /// Summary description for DBConnectionType. /// </summary> public class DbConnectionType { private string _name = ""; private string _internalProvider = ""; private DbType _dbType; private DbConnectionProviders _dbProviders; private bool _supportsServer = true; private bool _supportsName = true; private bool _supportsUserID = true; private bool _supportsPassword = true; public DbConnectionType() { _dbProviders = new DbConnectionProviders(); } public DbConnectionType( string name, DbType dbType, string provider, bool supportsServer, bool supportsName, bool supportsUserID, bool supportsPassword) : this() { Name = name; InternalProviderName= provider; DbType = dbType; SupportsServer = supportsServer; SupportsName = supportsName; SupportsUserID = supportsUserID; SupportsPassword = supportsPassword; } /// <summary> /// Property to get/set the Name of this Connection Type /// </summary> public string Name { get { return _name; } set {_name = value; } } /// <summary> /// Gets or Sets the DbType by Name rather than enum /// </summary> public string DbTypeName { get { return DbTypeConverter.Convert(_dbType); } set { _dbType = DbTypeConverter.Convert(value); } } /// <summary> /// Property to Set/Get the enum of this Connection type /// </summary> public DbType DbType { get { return _dbType; } set { _dbType = value;} } /// <summary> /// Returns a reference to the collection of available providers /// </summary> public DbConnectionProviders Providers { get { return _dbProviders;} set { _dbProviders = value;} } /// <summary> /// Allows Setting/Getting the InternalProvider which is a reference to the /// name of a Provider instance from the ProvidersCollection of the Provider /// instance which allows access to table information (normally a OLEDB connection) /// </summary> public string InternalProviderName { get {return _internalProvider; } set {_internalProvider = value;} } public DbConnectionProvider InternalProvider { get{ if (_internalProvider.Equals("") || !_dbProviders.ContainsKey(_internalProvider)) { throw new ApplicationException(String.Format("No Internal Provider defined for {0}.",this._name)); } return _dbProviders[_internalProvider]; } } /// <summary> /// Returns a provider object for a OLEDB connection type /// </summary> public DbConnectionProvider OLEDBConnection { get { if ((_internalProvider.Equals("")) || !_dbProviders.ContainsKey(_internalProvider)) { throw new ApplicationException(String.Format("No Internal Provider defined for {0}", _name)); } else { try { DbConnectionProvider provider = _dbProviders[_internalProvider]; return provider; } catch (Exception ex) { throw new ApplicationException(String.Format("Could not find the internal provider {0} for {1}\n{2}", _internalProvider, _name, ex.Message)); } } } } /// <summary> /// Returns true if this connection type supports a SERVER Name /// </summary> public bool SupportsServer { get { return _supportsServer; } set { _supportsServer = value; } } /// <summary> /// Returns true if this connection type supports a Name or Initial Catalog /// </summary> public bool SupportsName { get { return _supportsName; } set { _supportsName = value; } } /// <summary> /// Returns true if this connection type supports a UserID (Trusted do not) /// </summary> public bool SupportsUserID { get { return _supportsUserID; } set { _supportsUserID = value; } } /// <summary> /// Returns true if this connection type supports a Password /// </summary> public bool SupportsPassword { get { return _supportsPassword; } set { _supportsPassword = value; } } /// <summary> /// Returns true if this connection type supports a File DNS specifier. If Server is false /// then this connection type is a file based type. /// </summary> public bool SupportsFile { get { return !_supportsServer; } set { _supportsServer = !value; } } } } Index: DbProviderFactory.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbProviderFactory.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DbProviderFactory.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- DbProviderFactory.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 6,9 **** --- 6,10 ---- using System.Data.OleDb; using System.Data.SqlClient; + using System.Data.OracleClient; /// <summary> *************** *** 25,28 **** --- 26,31 ---- case DbProviderType.SQLSERVER: return new SqlCommand(); + case DbProviderType.ORACLE: + return new OracleCommand(); default: return new OleDbCommand(); *************** *** 45,48 **** --- 48,53 ---- case DbProviderType.SQLSERVER: return new SqlConnection(); + case DbProviderType.ORACLE: + return new OracleConnection(); default: return new OleDbConnection(); *************** *** 59,71 **** { case DbProviderType.SQLSERVER: ! SqlDataAdapter da = new SqlDataAdapter(); ! da.SelectCommand = (SqlCommand) command; command.Connection = connection; ! return da; default: ! OleDbDataAdapter oda = new OleDbDataAdapter(); ! oda.SelectCommand = (OleDbCommand) command; command.Connection = connection; ! return oda; } } --- 64,81 ---- { case DbProviderType.SQLSERVER: ! SqlDataAdapter sqlda = new SqlDataAdapter(); ! sqlda.SelectCommand = (SqlCommand) command; command.Connection = connection; ! return sqlda; ! case DbProviderType.ORACLE: ! OracleDataAdapter orada = new OracleDataAdapter(); ! orada.SelectCommand = (OracleCommand) command; ! command.Connection = connection; ! return orada; default: ! OleDbDataAdapter oleda = new OleDbDataAdapter(); ! oleda.SelectCommand = (OleDbCommand) command; command.Connection = connection; ! return oleda; } } Index: CommandTextViewer.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/CommandTextViewer.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** CommandTextViewer.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- CommandTextViewer.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 21,27 **** public static string Parse(IDbCommand cmd, DbProviderType providerType) { ! if (providerType == DbProviderType.OLEDB) return ParseOleDbCommand(cmd); ! else if (providerType == DbProviderType.SQLSERVER) return ParseSqlCommand(cmd); ! else throw new NotImplementedException(providerType.ToString() + " is not currently supported."); } --- 21,37 ---- public static string Parse(IDbCommand cmd, DbProviderType providerType) { ! if (providerType == DbProviderType.OLEDB) ! { ! return ParseOleDbCommand(cmd); ! } ! else if (providerType == DbProviderType.SQLSERVER) ! { ! return ParseSqlCommand(cmd); ! } ! else if (providerType == DbProviderType.ORACLE) { ! return ParseOracleCommand(cmd); ! } ! else ! throw new NotImplementedException(providerType.ToString() + " is not currently supported."); } *************** *** 172,175 **** --- 182,243 ---- } + /// <summary> + /// This is a worker method, which takes an OracleCommand and builds the sql text, + /// with the parameter values added into it. + /// </summary> + /// <param name="cmd">The command.</param> + /// <returns>A sql string with all of the parameter values filled in.</returns> + public static string ParseOracleCommand(IDbCommand cmd) { + string cmds = cmd.CommandText.ToString().Trim(); + + if (cmd.CommandType == CommandType.Text) { + for (int i = 0; i < cmd.Parameters.Count; i++) { + string pvalue = ""; + + string pname = ((IDataParameter) cmd.Parameters[i]).ParameterName; + if (((IDataParameter) cmd.Parameters[i]).Value == null) { + pvalue = DBNull.Value.ToString(); + } + else { + pvalue = ((IDataParameter) cmd.Parameters[i]).Value.ToString(); + } + string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString(); + + string prefix = dp.GetPrefixByName("oracle", ptype); + string newValue = prefix + pvalue + prefix; + + cmds = cmds.Replace(pname, newValue); + } + } + else if (cmd.CommandType == CommandType.StoredProcedure) { + StringBuilder sb = new StringBuilder(); + sb.Append("CREATE OR REPLACE"); + sb.Append(cmds); + for (int i = 0; i < cmd.Parameters.Count; i++) { + string pvalue = ""; + + string pname = ((IDataParameter) cmd.Parameters[i]).ParameterName; + if (((IDataParameter) cmd.Parameters[i]).Value == null) { + pvalue = DBNull.Value.ToString(); + } + else { + pvalue = ((IDataParameter) cmd.Parameters[i]).Value.ToString(); + } + string ptype = ((IDataParameter) cmd.Parameters[i]).DbType.ToString(); + + string prefix = dp.GetPrefixByName("oracle", ptype); + string newValue = prefix + pvalue + prefix; + string comma = ","; + + if (i >= cmd.Parameters.Count - 1) { + comma = ""; + } + sb.Append(" " + newValue + comma); + } + cmds = sb.ToString(); + } + return cmds; + } + } } \ No newline at end of file Index: Adapdev.Data.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Adapdev.Data.csproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Adapdev.Data.csproj 25 Mar 2005 02:14:29 -0000 1.3 --- Adapdev.Data.csproj 10 Apr 2005 09:59:06 -0000 1.4 *************** *** 85,88 **** --- 85,93 ---- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> + <Reference + Name = "System.Data.OracleClient" + AssemblyName = "System.Data.OracleClient" + HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.OracleClient.dll" + /> </References> </Build> *************** *** 121,124 **** --- 126,149 ---- /> <File + RelPath = "DbConnectionProvider.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "DbConnectionProviders.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "DbConnectionType.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "DbConnectionTypes.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "DbConstants.cs" SubType = "Code" *************** *** 361,364 **** --- 386,414 ---- /> <File + RelPath = "Sql\OracleCriteria.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "Sql\OracleDeleteQuery.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "Sql\OracleInsertQuery.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "Sql\OracleSelectQuery.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "Sql\OracleUpdateQuery.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Sql\QueryConstants.cs" SubType = "Code" *************** *** 411,414 **** --- 461,482 ---- /> <File + RelPath = "Xml\ProviderConfig.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "Xml\ProviderConfig.xml" + BuildAction = "Content" + /> + <File + RelPath = "Xml\ProviderConfig.xsd" + BuildAction = "Content" + /> + <File + RelPath = "Xml\ProviderConfig.xsx" + DependentUpon = "ProviderConfig.xsd" + BuildAction = "None" + /> + <File RelPath = "Xml\ProviderInfo.cs" SubType = "code" Index: ConnectionStringBuilder.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/ConnectionStringBuilder.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ConnectionStringBuilder.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- ConnectionStringBuilder.cs 10 Apr 2005 09:59:21 -0000 1.2 *************** *** 1,4 **** ! namespace Adapdev.Data ! { using System; --- 1,3 ---- ! namespace Adapdev.Data { using System; *************** *** 6,13 **** /// Utility class to build connection strings /// </summary> ! public class ConnectionStringBuilder ! { ! private ConnectionStringBuilder() ! { } --- 5,23 ---- /// Utility class to build connection strings /// </summary> ! public class ConnectionStringBuilder { ! private static ProviderConfig _databases = new ProviderConfig(); ! ! private ConnectionStringBuilder() {} ! ! private ConnectionStringBuilder( string config ) { ! _databases = new ProviderConfig( config ); // Build using a override config file ! } ! ! /// <summary> ! /// Getter - Provides access to the Databases (DbConnectionTypes) collection of available ! /// database types, which in turn has available providers. ! /// </summary> ! public DbConnectionTypes Databases { ! get { return _databases.ConnectionTypes; } } *************** *** 18,24 **** /// <param name="filePath">The file path to the database</param> /// <returns></returns> ! public static string BuildAccess(DbProviderType type, string filePath) ! { ! return BuildAccess(type, filePath, "", ""); } --- 28,33 ---- /// <param name="filePath">The file path to the database</param> /// <returns></returns> ! public static string BuildAccess( DbProviderType type, string filePath ) { ! return _databases.ConnectionTypes[ "ACCESS" ].Providers[ "OLEDB" ].ConnectionString( filePath ); } *************** *** 31,45 **** /// <param name="userid">The database userid</param> /// <returns></returns> ! public static string BuildAccess(DbProviderType type, string filePath, string userid, string password) ! { ! switch (type) ! { ! case DbProviderType.OLEDB: ! return String.Format(@"Provider=Microsoft.Jet.OLEDB.4.0;Data Source={0};User Id={1};Password={2};", filePath, userid, password); ! case DbProviderType.ODBC: ! return String.Format(@"Driver={Microsoft Access Driver (*.mdb)};Dbq={0};Uid={1};Pwd={2};", filePath, userid, password); ! default: ! throw new ArgumentException(type.ToString() + " is not supported for this method. Please use DbType.OLEDB or DbType.ODBC"); ! } } --- 40,45 ---- /// <param name="userid">The database userid</param> /// <returns></returns> ! public static string BuildAccess( DbProviderType type, string filePath, string userid, string password ) { ! return _databases.ConnectionTypes[ "ACCESS" ].Providers[ "OLEDB" ].ConnectionString( filePath, userid, password ); } *************** *** 51,57 **** /// <param name="password">The userid</param> /// <returns></returns> ! public static string BuildDSN(string symbolicName, string userid, string password) ! { ! return String.Format("DSN={0};Uid={1};Pwd={2};", symbolicName, userid, password); } --- 51,56 ---- /// <param name="password">The userid</param> /// <returns></returns> ! public static string BuildDSN( string symbolicName, string userid, string password ) { ! return _databases.ConnectionTypes[ "ACCESS" ].Providers[ "OLEDB (DNS)" ].ConnectionString( symbolicName, userid, password ); } *************** *** 65,80 **** /// <param name="password">The password</param> /// <returns></returns> ! public static string BuildSqlServer(DbProviderType type, string server, string database, string userid, string password) ! { ! switch (type) ! { ! case DbProviderType.ODBC: ! return String.Format("Driver={SQL Server};Server={0};Database={1};Uid={2};Pwd={3};", server, database, userid, password); ! case DbProviderType.OLEDB: ! return String.Format("Provider=sqloledb;Data Source={0};Initial Catalog={1};User Id={2};Password={3};", server, database, userid, password); ! case DbProviderType.SQLSERVER: ! return String.Format("Data Source={0};Initial Catalog={1};User Id={2};Password={3};", server, database, userid, password); ! default: ! throw new Exception(type.ToString() + " is not supported. Please use DbType.ODBC, DbType.OLEDB or DbType.SQLSERVER"); } } --- 64,77 ---- /// <param name="password">The password</param> /// <returns></returns> ! public static string BuildSqlServer( DbProviderType type, string server, string database, string userid, string password ) { ! switch (type) { ! case DbProviderType.ODBC: ! return _databases.ConnectionTypes[ "SQL Server" ].Providers[ "ODBC" ].ConnectionString( server, database, userid, password ); ! case DbProviderType.OLEDB: ! return _databases.ConnectionTypes[ "SQL Server" ].Providers[ "OLEDB" ].ConnectionString( server, database, userid, password ); ! case DbProviderType.SQLSERVER: ! return _databases.ConnectionTypes[ "SQL Server" ].Providers[ "Sql Connect" ].ConnectionString( server, database, userid, password ); ! default: ! throw new Exception( type.ToString() + " is not supported. Please use DbType.ODBC, DbType.OLEDB or DbType.SQLSERVER" ); } } *************** *** 87,102 **** /// <param name="database">The database</param> /// <returns></returns> ! public static string BuildSqlServerTrusted(DbProviderType type, string server, string database) ! { ! switch (type) ! { ! case DbProviderType.ODBC: ! return String.Format("Driver={SQL Server};Server={0};Database={1};Trusted_Connection=yes;", server, database); ! case DbProviderType.OLEDB: ! return String.Format("Provider=sqloledb;Data Source={0};Initial Catalog={1};Integrated Security=SSPI;", server, database); ! case DbProviderType.SQLSERVER: ! return String.Format("Data Source={0};Initial Catalog={1};Integrated Security=SSPI;", server, database); ! default: ! throw new Exception(type.ToString() + " is not supported. Please use DbType.ODBC, DbType.OLEDB or DbType.SQLSERVER"); } } --- 84,97 ---- /// <param name="database">The database</param> /// <returns></returns> ! public static string BuildSqlServerTrusted( DbProviderType type, string server, string database ) { ! switch (type) { ! case DbProviderType.ODBC: ! return _databases.ConnectionTypes[ "SQL Server - Trusted" ].Providers[ "ODBC" ].ConnectionString( server, database ); ! case DbProviderType.OLEDB: ! return _databases.ConnectionTypes[ "SQL Server - Trusted" ].Providers[ "OLEDB" ].ConnectionString( server, database ); ! case DbProviderType.SQLSERVER: ! return _databases.ConnectionTypes[ "SQL Server - Trusted" ].Providers[ "Sql Connect" ].ConnectionString( server, database ); ! default: ! throw new Exception( type.ToString() + " is not supported. Please use DbType.ODBC, DbType.OLEDB or DbType.SQLSERVER" ); } } --- NEW FILE: DbConnectionTypes.cs --- using System; using System.Collections; namespace Adapdev.Data { /// <summary> /// Represents a strongly-typed collection of key-and-value pairs that are /// sorted by the keys and are accessible by key and by index. /// </summary> /// <seealso cref="System.Collections.SortedList"/> [Serializable] public class DbConnectionTypes : IDictionary, ICloneable { #region Member Variables private const int DEFAULT_CAPACITY = 16; private string[] keys; private DbConnectionType[] values; private int count; [NonSerialized] [...1333 lines suppressed...] throw new ArgumentException("The value must be of type: " + typeof(DbConnectionType).FullName, "value"); return list.IndexOfValue((DbConnectionType)value); } public virtual int IndexOf(DbConnectionType value) { return list.IndexOfValue(value); } public virtual void Remove(object key) { throw new NotSupportedException("Cannot modify a read-only list."); } public virtual void RemoveAt(int index) { throw new NotSupportedException("Cannot modify a read-only list."); } } #endregion } } |
|
From: Sean M. <int...@us...> - 2005-04-10 03:40:08
|
Update of /cvsroot/adapdev/Adapdev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25745/src Modified Files: AdapdevAssemblyInfo.cs Log Message: Index: AdapdevAssemblyInfo.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/AdapdevAssemblyInfo.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** AdapdevAssemblyInfo.cs 28 Feb 2005 01:31:34 -0000 1.1.1.1 --- AdapdevAssemblyInfo.cs 10 Apr 2005 03:39:58 -0000 1.2 *************** *** 27,31 **** // by using the '*' as shown below: ! [assembly: AssemblyVersion("0.8.0.0")] // --- 27,31 ---- // by using the '*' as shown below: ! [assembly: AssemblyVersion("0.8.1.0")] // |
|
From: Sean M. <int...@us...> - 2005-03-25 02:16:38
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11268/src/Adapdev.Data/Schema Added Files: ForeignKeyAssociation.cs ProcedureSchema.cs Log Message: --- NEW FILE: ProcedureSchema.cs --- namespace Adapdev.Data.Schema { /// <summary> /// Represents the schema for a database procedure /// </summary> public class ProcedureSchema { protected ParameterSchemaDictionary parameters = new ParameterSchemaDictionary(); /// <summary> /// The name of the procedure /// </summary> public string Name; /// <summary> /// Adds a ParameterSchema /// </summary> /// <param name="p"></param> public void AddParameter(ParameterSchema p) { parameters[p.Name] = p; } /// <summary> /// Removes a ParameterSchema /// </summary> /// <param name="name">The name of the ParameterSchema to remove</param> public void RemoveParameter(string name) { parameters.Remove(name); } /// <summary> /// Retrieves a ParameterSchema /// </summary> /// <param name="name">The name of the ParameterSchema to retrieve</param> /// <returns></returns> public ParameterSchema GetParameter(string name) { return parameters[name]; } /// <summary> /// Returns a collection of parameters /// </summary> /// <returns></returns> public ParameterSchemaDictionary Parameters { get{return parameters;} set{this.parameters = value;} } } } --- NEW FILE: ForeignKeyAssociation.cs --- using System; namespace Adapdev.Data.Schema { using Adapdev.Text; /// <summary> /// Summary description for ForeignKeyAssociation. /// </summary> public class ForeignKeyAssociation { private ColumnSchema _foreignColumn = null; private TableSchema _foreignTable = null; private ColumnSchema _columnSchema = null; public ColumnSchema ForeignColumn { get { return _foreignColumn; } set { _foreignColumn = value; } } public ColumnSchema Column { get { return _columnSchema; } set { _columnSchema = value; } } public TableSchema ForeignTable { get { return _foreignTable; } set { _foreignTable = value; } } public ForeignKeyAssociation(ColumnSchema columnSchema, ColumnSchema foreignColumn, TableSchema foreignTable) { this._columnSchema = columnSchema; this._foreignColumn = foreignColumn; this._foreignTable = foreignTable; } public override string ToString() { return StringUtil.ToString(this); } } } |
|
From: Sean M. <int...@us...> - 2005-03-25 02:16:38
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11268/src/Adapdev.Data.Tests Added Files: SchemaBuilderTest.cs Log Message: --- NEW FILE: SchemaBuilderTest.cs --- using System; using NUnit.Framework; namespace Adapdev.Data.Tests { using Adapdev.Data.Schema; /// <summary> /// Summary description for SchemaBuilderTest. /// </summary> /// [TestFixture] public class SchemaBuilderTest { private string _connectionString = "Provider=sqloledb;Data Source=localhost;Initial Catalog=northwind;User Id=sa;Password=;"; [Test,Ignore("")] public void PrintForeignKeys() { Console.WriteLine(SchemaBuilder.PrintOleDbSchema(this._connectionString, System.Data.OleDb.OleDbSchemaGuid.Foreign_Keys).ToString()); } [Test] public void BuildSchema() { DatabaseSchema ds = SchemaBuilder.CreateDatabaseSchema(this._connectionString); Assert.AreEqual(29, ds.Tables.Count, "Northwind should have 29 tables / views."); Assert.IsTrue(ds.Tables.Contains("Orders")); } } } |
|
From: Sean M. <int...@us...> - 2005-03-25 02:14:38
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9855/src/Adapdev.Data/Schema Modified Files: ColumnSchema.cs DatabaseSchema.cs SchemaBuilder.cs TableSchema.cs TableSchemaCollection.cs Log Message: Index: DatabaseSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/DatabaseSchema.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseSchema.cs 28 Feb 2005 01:31:47 -0000 1.1.1.1 --- DatabaseSchema.cs 25 Mar 2005 02:14:29 -0000 1.2 *************** *** 102,108 **** /// </summary> /// <returns></returns> ! public TableSchemaDictionary GetTables() { ! return this.tables; } --- 102,109 ---- /// </summary> /// <returns></returns> ! public TableSchemaDictionary Tables { ! get{return this.tables;} ! set{this.tables = value;} } *************** *** 111,127 **** /// </summary> /// <returns>SortedList</returns> ! public SortedList GetSortedTables() { ! SortedList sl = new SortedList(); ! foreach (TableSchema t in this.tables.Values) { ! sl.Add(t.Name, t); } - return sl; } public override string ToString() { ! return Environment.NewLine + StringUtil.ToString(this) + Environment.NewLine + this.GetTables().ToString(); } --- 112,131 ---- /// </summary> /// <returns>SortedList</returns> ! public SortedList SortedTables { ! get { ! SortedList sl = new SortedList(); ! foreach (TableSchema t in this.tables.Values) ! { ! sl.Add(t.Name, t); ! } ! return sl; } } public override string ToString() { ! return Environment.NewLine + StringUtil.ToString(this) + Environment.NewLine + this.Tables.ToString(); } Index: TableSchemaCollection.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableSchemaCollection.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** TableSchemaCollection.cs 28 Feb 2005 01:31:47 -0000 1.1.1.1 --- TableSchemaCollection.cs 25 Mar 2005 02:14:29 -0000 1.2 *************** *** 6,9 **** --- 6,12 ---- namespace Adapdev.Data.Schema { + using System.Text; + using Adapdev.Text; + [Serializable()] public class TableSchemaCollection : CollectionBase Index: TableSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/TableSchema.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TableSchema.cs 17 Mar 2005 12:50:11 -0000 1.2 --- TableSchema.cs 25 Mar 2005 02:14:29 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- protected string _alias = String.Empty; protected ColumnSchemaDictionary columns = new ColumnSchemaDictionary(); + protected DatabaseSchema parent = null; /// <summary> *************** *** 58,64 **** /// </summary> /// <returns></returns> ! public ColumnSchemaDictionary GetColumns() { ! return this.columns; } --- 59,66 ---- /// </summary> /// <returns></returns> ! public ColumnSchemaDictionary Columns { ! get{return this.columns;} ! set{this.columns = value;} } *************** *** 67,78 **** /// </summary> /// <returns></returns> ! public ColumnSchemaDictionary GetPrimaryKeys() { ! ColumnSchemaDictionary pks = new ColumnSchemaDictionary(); ! foreach(ColumnSchema c in this.columns.Values) { ! if(c.IsPrimaryKey)pks[c.Name] = c; } - return pks; } --- 69,83 ---- /// </summary> /// <returns></returns> ! public ColumnSchemaDictionary PrimaryKeys { ! get { ! ColumnSchemaDictionary pks = new ColumnSchemaDictionary(); ! foreach(ColumnSchema c in this.columns.Values) ! { ! if(c.IsPrimaryKey)pks[c.Name] = c; ! } ! return pks; } } *************** *** 81,92 **** /// </summary> /// <returns></returns> ! public ColumnSchemaDictionary GetForeignKeys() { ! ColumnSchemaDictionary fks = new ColumnSchemaDictionary(); ! foreach(ColumnSchema c in this.columns.Values) { ! if(c.IsForeignKey)fks[c.Name] = c; } - return fks; } --- 86,100 ---- /// </summary> /// <returns></returns> ! public ColumnSchemaDictionary ForeignKeys { ! get { ! ColumnSchemaDictionary fks = new ColumnSchemaDictionary(); ! foreach(ColumnSchema c in this.columns.Values) ! { ! if(c.IsForeignKey)fks[c.Name] = c; ! } ! return fks; } } *************** *** 95,106 **** /// </summary> /// <returns></returns> ! public int GetPrimaryKeyCount() { ! int i = 0; ! foreach (ColumnSchema c in columns.Values) { ! if(c.IsPrimaryKey)i++; ! } ! return i; } --- 103,117 ---- /// </summary> /// <returns></returns> ! public int PrimaryKeyCount { ! get { ! int i = 0; ! foreach (ColumnSchema c in columns.Values) ! { ! if(c.IsPrimaryKey)i++; ! } ! return i; ! } } *************** *** 109,120 **** /// </summary> /// <returns></returns> ! public int GetForeignKeyCount() { ! int i = 0; ! foreach (ColumnSchema c in columns.Values) { ! if(c.IsForeignKey)i++; } - return i; } --- 120,134 ---- /// </summary> /// <returns></returns> ! public int ForeignKeyCount { ! get { ! int i = 0; ! foreach (ColumnSchema c in columns.Values) ! { ! if(c.IsForeignKey)i++; ! } ! return i; } } *************** *** 131,135 **** public ColumnSchema GetPrimaryKey(int index) { ! ArrayList al = new ArrayList(this.GetPrimaryKeys().Values); return ((ColumnSchema) al[index]); } --- 145,149 ---- public ColumnSchema GetPrimaryKey(int index) { ! ArrayList al = new ArrayList(this.PrimaryKeys.Values); return ((ColumnSchema) al[index]); } *************** *** 147,151 **** public ColumnSchema GetForeignKey(int index) { ! ArrayList al = new ArrayList(this.GetForeignKeys().Values); return ((ColumnSchema) al[index]); } --- 161,165 ---- public ColumnSchema GetForeignKey(int index) { ! ArrayList al = new ArrayList(this.ForeignKeys.Values); return ((ColumnSchema) al[index]); } *************** *** 155,166 **** /// </summary> /// <returns></returns> ! public SortedList GetOrdinalColumns() { ! SortedList sl = new SortedList(); ! foreach (ColumnSchema c in this.columns.Values) { ! sl[c.Ordinal] = c; } - return sl; } --- 169,183 ---- /// </summary> /// <returns></returns> ! public SortedList OrdinalColumns { ! get { ! SortedList sl = new SortedList(); ! foreach (ColumnSchema c in this.columns.Values) ! { ! sl[c.Ordinal] = c; ! } ! return sl; } } *************** *** 169,180 **** /// </summary> /// <returns></returns> ! public SortedList GetSortedColumns() { ! SortedList sl = new SortedList(); ! foreach (ColumnSchema c in this.columns.Values) { ! sl.Add(c.Name, c); } - return sl; } --- 186,200 ---- /// </summary> /// <returns></returns> ! public SortedList SortedColumns { ! get { ! SortedList sl = new SortedList(); ! foreach (ColumnSchema c in this.columns.Values) ! { ! sl.Add(c.Name, c); ! } ! return sl; } } *************** *** 225,229 **** get { ! if(this.GetForeignKeyCount() > 0) return true; else return false; } --- 245,249 ---- get { ! if(this.ForeignKeyCount > 0) return true; else return false; } *************** *** 234,238 **** get { ! if(this.GetPrimaryKeyCount() > 0) return true; else return false; } --- 254,258 ---- get { ! if(this.PrimaryKeyCount > 0) return true; else return false; } *************** *** 241,245 **** public override string ToString() { ! return Environment.NewLine + StringUtil.ToString(this) + Environment.NewLine + this.GetColumns().ToString(); } --- 261,265 ---- public override string ToString() { ! return Environment.NewLine + StringUtil.ToString(this) + Environment.NewLine + this.Columns.ToString(); } Index: SchemaBuilder.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/SchemaBuilder.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SchemaBuilder.cs 28 Feb 2005 01:31:47 -0000 1.1.1.1 --- SchemaBuilder.cs 25 Mar 2005 02:14:29 -0000 1.2 *************** *** 54,57 **** --- 54,58 ---- } + // Build the base schema information foreach (DataRow dr in schemaTables.Rows) { *************** *** 65,68 **** --- 66,70 ---- } + // Get the primary key information DataTable pkeys = SchemaBuilder.GetOleDbSchema(oledbConnectionString, OleDbSchemaGuid.Primary_Keys, ""); foreach (DataRow dr in pkeys.Rows) *************** *** 82,85 **** --- 84,88 ---- } + // Get the foreign key information DataTable fkeys = SchemaBuilder.GetOleDbSchema(oledbConnectionString, OleDbSchemaGuid.Foreign_Keys, ""); foreach (DataRow dr in fkeys.Rows) *************** *** 94,99 **** ci.IsForeignKey = true; tif.AddColumn(ci); ! ci.ForeignKeyTables.Add(di.GetTable(fkTable)); } } --- 97,128 ---- ci.IsForeignKey = true; tif.AddColumn(ci); + } + } + } ! // Get the foreign key associations ! foreach (DataRow dr in fkeys.Rows) ! { ! // Get the name of the primary key table ! string pkTable = dr["PK_TABLE_NAME"].ToString(); ! // Get the name of the foreign key table ! string fkTable = dr["FK_TABLE_NAME"].ToString(); ! // Get the name of the foreign key column ! string fkColumn = dr["FK_COLUMN_NAME"].ToString(); ! ! // Get the table containing the primary key ! TableSchema tif = di[pkTable]; ! // Get the table containing the foreign key ! TableSchema fk = di[fkTable]; ! if (tif != null) ! { ! // Get the primary key ! ColumnSchema ci = tif[dr["PK_COLUMN_NAME"].ToString()]; ! // Get the foreign key ! ColumnSchema cf = fk[fkColumn]; ! if (ci != null) ! { ! // Add the association to the table and column containing the foreign key ! ci.ForeignKeyTables.Add(new ForeignKeyAssociation(ci, cf ,fk)); } } Index: ColumnSchema.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Schema/ColumnSchema.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ColumnSchema.cs 17 Mar 2005 12:50:11 -0000 1.2 --- ColumnSchema.cs 25 Mar 2005 02:14:29 -0000 1.3 *************** *** 28,32 **** private string _defaultValue = String.Empty; private string _defaultTestValue = String.Empty; ! private TableSchemaCollection _fkReferences = new TableSchemaCollection(); /// <summary> --- 28,33 ---- private string _defaultValue = String.Empty; private string _defaultTestValue = String.Empty; ! private ArrayList _fkReferences = new ArrayList(); ! private TableSchema _parent = null; /// <summary> *************** *** 198,202 **** /// </summary> /// <value></value> ! public TableSchemaCollection ForeignKeyTables { get{ return this._fkReferences;} --- 199,203 ---- /// </summary> /// <value></value> ! public ArrayList ForeignKeyTables { get{ return this._fkReferences;} |
|
From: Sean M. <int...@us...> - 2005-03-25 02:14:37
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9855/src/Adapdev.Windows.Forms Modified Files: DatabaseExplorer.cs Log Message: Index: DatabaseExplorer.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms/DatabaseExplorer.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DatabaseExplorer.cs 28 Feb 2005 01:32:43 -0000 1.1.1.1 --- DatabaseExplorer.cs 25 Mar 2005 02:14:29 -0000 1.2 *************** *** 252,256 **** DatabaseSchema schema = setting.GetDatabaseSchema(); ! foreach(TableSchema ts in schema.GetSortedTables().Values) { --- 252,256 ---- DatabaseSchema schema = setting.GetDatabaseSchema(); ! foreach(TableSchema ts in schema.SortedTables.Values) { *************** *** 275,279 **** protected void LoadColumns(TreeNode node, TableSchema ts) { ! foreach(ColumnSchema cs in ts.GetSortedColumns().Values) { TreeNode tn = new TreeNode(cs.Name, 4, 4); --- 275,279 ---- protected void LoadColumns(TreeNode node, TableSchema ts) { ! foreach(ColumnSchema cs in ts.SortedColumns.Values) { TreeNode tn = new TreeNode(cs.Name, 4, 4); |
|
From: Sean M. <int...@us...> - 2005-03-25 02:14:37
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9855/src/Adapdev.Data Modified Files: Adapdev.Data.csproj Log Message: Index: Adapdev.Data.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Adapdev.Data.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Adapdev.Data.csproj 28 Feb 2005 01:54:38 -0000 1.2 --- Adapdev.Data.csproj 25 Mar 2005 02:14:29 -0000 1.3 *************** *** 221,224 **** --- 221,229 ---- /> <File + RelPath = "Schema\ForeignKeyAssociation.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Schema\ParameterSchema.cs" SubType = "Code" *************** *** 231,235 **** /> <File ! RelPath = "Schema\ProcedureInfo.cs" SubType = "Code" BuildAction = "Compile" --- 236,240 ---- /> <File ! RelPath = "Schema\ProcedureSchema.cs" SubType = "Code" BuildAction = "Compile" |
|
From: Sean M. <int...@us...> - 2005-03-25 02:14:37
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.CodeGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9855/src/Adapdev.CodeGen Modified Files: NVelocityTableCodeTemplate.cs Log Message: Index: NVelocityTableCodeTemplate.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.CodeGen/NVelocityTableCodeTemplate.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NVelocityTableCodeTemplate.cs 17 Mar 2005 12:50:09 -0000 1.2 --- NVelocityTableCodeTemplate.cs 25 Mar 2005 02:14:28 -0000 1.3 *************** *** 129,138 **** ISelectQuery query = QueryFactory.CreateSelectQuery(di.DatabaseType, di.DatabaseProviderType); query.SetTable(ts.Name); ! foreach (ColumnSchema ci in ts.GetOrdinalColumns().Values) { if(ci.IsActive)query.Add(ci.Name); } ! ArrayList pks = new ArrayList(ts.GetPrimaryKeys().Values); ColumnSchema pk = (ColumnSchema) pks[0]; --- 129,138 ---- ISelectQuery query = QueryFactory.CreateSelectQuery(di.DatabaseType, di.DatabaseProviderType); query.SetTable(ts.Name); ! foreach (ColumnSchema ci in ts.OrdinalColumns.Values) { if(ci.IsActive)query.Add(ci.Name); } ! ArrayList pks = new ArrayList(ts.PrimaryKeys.Values); ColumnSchema pk = (ColumnSchema) pks[0]; *************** *** 167,171 **** query.SetTable(ts.Name); ! foreach (ColumnSchema ci in ts.GetSortedColumns().Values) { if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name); --- 167,171 ---- query.SetTable(ts.Name); ! foreach (ColumnSchema ci in ts.SortedColumns.Values) { if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name); *************** *** 193,202 **** query.SetTable(ts.Name); ! foreach (ColumnSchema ci in ts.GetSortedColumns().Values) { if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name); } ! ArrayList pks = new ArrayList(ts.GetPrimaryKeys().Values); ICriteria criteria = query.CreateCriteria(); --- 193,202 ---- query.SetTable(ts.Name); ! foreach (ColumnSchema ci in ts.SortedColumns.Values) { if (!ci.IsAutoIncrement && ci.IsActive) query.Add(ci.Name); } ! ArrayList pks = new ArrayList(ts.PrimaryKeys.Values); ICriteria criteria = query.CreateCriteria(); *************** *** 236,240 **** query.SetTable(ts.Name); ! ArrayList pks = new ArrayList(ts.GetPrimaryKeys().Values); ColumnSchema pk = (ColumnSchema) pks[0]; --- 236,240 ---- query.SetTable(ts.Name); ! ArrayList pks = new ArrayList(ts.PrimaryKeys.Values); ColumnSchema pk = (ColumnSchema) pks[0]; *************** *** 271,275 **** query.SetTable(ts.Name); ! foreach (ColumnSchema ci2 in ts.GetOrdinalColumns().Values) { if(ci2.IsActive)query.Add(ci2.Name); --- 271,275 ---- query.SetTable(ts.Name); ! foreach (ColumnSchema ci2 in ts.OrdinalColumns.Values) { if(ci2.IsActive)query.Add(ci2.Name); *************** *** 343,347 **** // Get all columns that aren't autoincrement ! foreach(ColumnSchema cs in ts.GetSortedColumns().Values) { if(!cs.IsAutoIncrement && cs.IsActive)al.Add(cs); --- 343,347 ---- // Get all columns that aren't autoincrement ! foreach(ColumnSchema cs in ts.SortedColumns.Values) { if(!cs.IsAutoIncrement && cs.IsActive)al.Add(cs); *************** *** 369,377 **** int i = 1; StringBuilder sb = new StringBuilder(); ! foreach (ColumnSchema columnSchema in ts.GetSortedColumns().Values) { if(columnSchema.IsActive) { ! if(i < ts.GetSortedColumns().Count) { sb.Append(this.GetParameterName(columnSchema.Name) + " " + columnSchema.DataType.ToLower() + "," + Environment.NewLine); --- 369,377 ---- int i = 1; StringBuilder sb = new StringBuilder(); ! foreach (ColumnSchema columnSchema in ts.SortedColumns.Values) { if(columnSchema.IsActive) { ! if(i < ts.SortedColumns.Count) { sb.Append(this.GetParameterName(columnSchema.Name) + " " + columnSchema.DataType.ToLower() + "," + Environment.NewLine); |
|
From: Sean M. <int...@us...> - 2005-03-25 02:14:37
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9855/src/Adapdev.Data.Tests Modified Files: Adapdev.Data.Tests.csproj Log Message: Index: Adapdev.Data.Tests.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data.Tests/Adapdev.Data.Tests.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Adapdev.Data.Tests.csproj 28 Feb 2005 01:54:38 -0000 1.2 --- Adapdev.Data.Tests.csproj 25 Mar 2005 02:14:28 -0000 1.3 *************** *** 90,93 **** --- 90,98 ---- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> + <Reference + Name = "Adapdev" + Project = "{CC30A321-2569-4B1F-8E1A-781B5509B56D}" + Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" + /> </References> </Build> *************** *** 100,103 **** --- 105,113 ---- BuildAction = "Compile" /> + <File + RelPath = "SchemaBuilderTest.cs" + SubType = "Code" + BuildAction = "Compile" + /> </Include> </Files> |
|
From: Sean M. <int...@us...> - 2005-03-19 05:17:25
|
Update of /cvsroot/adapdev/Adapdev/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4438/src Modified Files: AdapdevFramework.suo Log Message: Index: AdapdevFramework.suo =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/AdapdevFramework.suo,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvs3yRJVi and /tmp/cvs2eT3d0 differ |
|
From: Sean M. <int...@us...> - 2005-03-19 05:17:06
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Windows.Forms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4438/src/Adapdev.Windows.Forms Removed Files: Adapdev.Windows.Forms.csproj.user Log Message: --- Adapdev.Windows.Forms.csproj.user DELETED --- |
