[Adapdev-commits] Adapdev/src/Adapdev.Data Adapdev.Data.csproj,1.4,1.5 DbConnectionProvider.cs,1.1,1
Status: Beta
Brought to you by:
intesar66
Menu
▾
▴
[Adapdev-commits] Adapdev/src/Adapdev.Data Adapdev.Data.csproj,1.4,1.5 DbConnectionProvider.cs,1.1,1.2 DbConnectionType.cs,1.1,1.2 DbConnectionTypes.cs,1.1,1.2 DbProviderType.cs,1.1.1.1,1.2 DbProviderTypeConverter.cs,1.2,1.3 DbType.cs,1.1.1.1,1.2 DbTypeConverter.cs,1.2,1.3
|
From: Trevor L. <tre...@us...> - 2005-04-13 04:23:52
|
Update of /cvsroot/adapdev/Adapdev/src/Adapdev.Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7596/src/Adapdev.Data Modified Files: Adapdev.Data.csproj DbConnectionProvider.cs DbConnectionType.cs DbConnectionTypes.cs DbProviderType.cs DbProviderTypeConverter.cs DbType.cs DbTypeConverter.cs Log Message: Index: DbConnectionProvider.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbConnectionProvider.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DbConnectionProvider.cs 10 Apr 2005 09:59:21 -0000 1.1 --- DbConnectionProvider.cs 13 Apr 2005 04:23:37 -0000 1.2 *************** *** 175,179 **** /// </summary> public DbConnectionType Parent { ! get { return _parent; } set { _parent = value; } } --- 175,184 ---- /// </summary> public DbConnectionType Parent { ! get { ! if (_parent == null) ! return DbConnectionTypes.UnknownConnectionType(); ! else ! return _parent; ! } set { _parent = value; } } Index: DbProviderType.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbProviderType.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DbProviderType.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- DbProviderType.cs 13 Apr 2005 04:23:41 -0000 1.2 *************** *** 3,6 **** --- 3,7 ---- public enum DbProviderType { + UNKNOWN, DB2, MYSQL, Index: DbTypeConverter.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbTypeConverter.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DbTypeConverter.cs 10 Apr 2005 09:59:21 -0000 1.2 --- DbTypeConverter.cs 13 Apr 2005 04:23:41 -0000 1.3 *************** *** 12,15 **** --- 12,17 ---- switch (s.Trim().ToLower()) { + case "unknown": + return DbType.UNKNOWN; case "access": return DbType.ACCESS; *************** *** 30,33 **** --- 32,37 ---- public static string Convert(DbType t) { switch (t) { + case DbType.UNKNOWN: + return "UNKNOWN"; case DbType.ACCESS: return "ACCESS"; Index: DbProviderTypeConverter.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbProviderTypeConverter.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DbProviderTypeConverter.cs 10 Apr 2005 09:59:21 -0000 1.2 --- DbProviderTypeConverter.cs 13 Apr 2005 04:23:41 -0000 1.3 *************** *** 12,15 **** --- 12,17 ---- switch (s.Trim().ToLower()) { + case "unknown": + return DbProviderType.UNKNOWN; case "db2": return DbProviderType.DB2; *************** *** 33,36 **** --- 35,40 ---- switch (t) { + case DbProviderType.UNKNOWN: + return "UNKNOWN"; case DbProviderType.ODBC: return "ODBC"; Index: DbConnectionType.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbConnectionType.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DbConnectionType.cs 10 Apr 2005 09:59:21 -0000 1.1 --- DbConnectionType.cs 13 Apr 2005 04:23:37 -0000 1.2 *************** *** 13,32 **** 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; } --- 13,57 ---- private DbConnectionProviders _dbProviders; ! private readonly string _defaultFile = "File Location"; ! private readonly string _defaultServer = "Server"; ! private readonly string _defaultName = "Database Name"; ! private readonly string _defaultUserID = "User ID"; ! private readonly string _defaultPassword= "Password"; ! private readonly string _defaultFilter = "Filter"; ! ! private string _promptFile = string.Empty; ! private string _promptServer = string.Empty; ! private string _promptName = string.Empty; ! private string _promptUserID = string.Empty; ! private string _promptPassword = string.Empty; ! private string _promptFilter = string.Empty; ! ! private bool _supportsServer = false; ! private bool _supportsName = false; ! private bool _supportsUserID = false; ! private bool _supportsPassword = false; ! private bool _supportsFilter = false; public DbConnectionType() { _dbProviders = new DbConnectionProviders(); } ! ! public DbConnectionType( string name, DbType dbType, DbProviderType provider) : this(name, dbType, DbProviderTypeConverter.Convert(provider)) { } ! ! public DbConnectionType( string name, DbType dbType, string provider) : this() { Name = name; InternalProviderName= provider; DbType = dbType; ! } ! ! public DbConnectionType( string name, DbType dbType, string provider, bool supportsServer, bool supportsName, bool supportsUserID, bool supportsPassword, bool supportsFilter) : this() { ! Name = name; ! InternalProviderName= provider; ! DbType = dbType; ! _supportsServer = supportsServer; ! _supportsName = supportsName; ! _supportsUserID = supportsUserID; ! _supportsPassword = supportsPassword; ! _supportsFilter = supportsFilter; } *************** *** 108,111 **** --- 133,141 ---- } + public string PromptServer { + get { return (_promptServer == string.Empty ? _defaultServer : _promptServer).Trim() + ":"; } + set { _promptServer = value; } + } + /// <summary> /// Returns true if this connection type supports a Name or Initial Catalog *************** *** 116,119 **** --- 146,154 ---- } + public string PromptName { + get { return (_promptName == string.Empty ? _defaultName : _promptName).Trim() + ":"; } + set { _promptName = value; } + } + /// <summary> /// Returns true if this connection type supports a UserID (Trusted do not) *************** *** 124,127 **** --- 159,167 ---- } + public string PromptUserID { + get { return (_promptUserID == string.Empty ? _defaultUserID : _promptUserID).Trim() + ":"; } + set { _promptUserID = value; } + } + /// <summary> /// Returns true if this connection type supports a Password *************** *** 132,135 **** --- 172,193 ---- } + public string PromptPassword { + get { return (_promptPassword == string.Empty ? _defaultPassword : _promptPassword).Trim() + ":"; } + set { _promptPassword = value; } + } + + /// <summary> + /// Returns true if this connection type supports a Password + /// </summary> + public bool SupportsFilter { + get { return _supportsFilter; } + set { _supportsFilter = value; } + } + + public string PromptFilter { + get { return (_promptFilter == string.Empty ? _defaultFilter : _promptFilter).Trim() + ":"; } + set { _promptFilter = value; } + } + /// <summary> /// Returns true if this connection type supports a File DNS specifier. If Server is false *************** *** 140,143 **** --- 198,206 ---- set { _supportsServer = !value; } } + + public string PromptFile { + get { return (_promptFile == string.Empty ? _defaultFile : _promptFile).Trim() + ":"; } + set { _promptFile = value; } + } } } Index: DbType.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbType.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** DbType.cs 28 Feb 2005 01:31:46 -0000 1.1.1.1 --- DbType.cs 13 Apr 2005 04:23:41 -0000 1.2 *************** *** 6,9 **** --- 6,10 ---- public enum DbType { + UNKNOWN, ACCESS, SQLSERVER, Index: Adapdev.Data.csproj =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/Adapdev.Data.csproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Adapdev.Data.csproj 10 Apr 2005 09:59:06 -0000 1.4 --- Adapdev.Data.csproj 13 Apr 2005 04:23:37 -0000 1.5 *************** *** 111,114 **** --- 111,119 ---- /> <File + RelPath = "BinaryDataTable.resx" + DependentUpon = "BinaryDataTable.cs" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "CommandTextViewer.cs" SubType = "Code" *************** *** 462,469 **** <File RelPath = "Xml\ProviderConfig.cs" ! SubType = "Code" BuildAction = "Compile" /> <File RelPath = "Xml\ProviderConfig.xml" BuildAction = "Content" --- 467,479 ---- <File RelPath = "Xml\ProviderConfig.cs" ! SubType = "code" BuildAction = "Compile" /> <File + RelPath = "Xml\ProviderConfig.resx" + DependentUpon = "ProviderConfig.cs" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "Xml\ProviderConfig.xml" BuildAction = "Content" Index: DbConnectionTypes.cs =================================================================== RCS file: /cvsroot/adapdev/Adapdev/src/Adapdev.Data/DbConnectionTypes.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DbConnectionTypes.cs 10 Apr 2005 09:59:21 -0000 1.1 --- DbConnectionTypes.cs 13 Apr 2005 04:23:37 -0000 1.2 *************** *** 10,13 **** --- 10,14 ---- [Serializable] public class DbConnectionTypes : IDictionary, ICloneable { + #region Member Variables private const int DEFAULT_CAPACITY = 16; *************** *** 1369,1372 **** --- 1370,1379 ---- } #endregion + + #region Miscellaneous + public static DbConnectionType UnknownConnectionType () { + return new DbConnectionType("UnKnown", DbType.UNKNOWN, DbProviderType.UNKNOWN); + } + #endregion } } |
