@@ -1,2 +1,19 @@ -copyright notices +[Amplify] new BSD +Copyright (c) 2008, Michael Herndon, Amptools.Net +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +Neither the name of Amptools.Net nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +[Inflector.Net] +Inflector.Net was ported by andrewpeters from rail's active record. +http://andrewpeters.net/inflectornet/ \ No newline at end of file docs/copyrights.txt @@ -28,7 +28,7 @@ namespace Amplify public class Amp_Specification : Spec { - [It, Should(" have static properties ")] + [It, Should("have static properties ")] public void GetProperties() { IAmp amp = Amp.Get(); @@ -36,7 +36,7 @@ namespace Amplify amp.Properties.ShouldNotBeNull(); } - [It, Should(" determine what development mode you are in")] + [It, Should("determine what development mode you are in")] public void CheckMode() { Amp amp = new Amp(); src/Amplify.Tests/Amp.cs @@ -28,7 +28,7 @@ namespace Amplify.Data public class AdapterAdoStatements_Specification : Spec { - [It, Should(" should throw an exeption when BeginTransactin is called without a connection. ")] + [It, Should("should throw an exeption when BeginTransactin is called without a connection. ")] public void BeginTransactionAndThrowException() { new Gallio.Action(() => src/Amplify.Tests/Data/Adapter.AdoStatements.cs @@ -28,7 +28,7 @@ namespace Amplify.Data public class AdapterDatabaseStatements_Specification : Spec { - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void InvokeConstructor() { //Adapter obj = new Adapter(); src/Amplify.Tests/Data/Adapter.DatabaseStatements.cs @@ -28,14 +28,14 @@ namespace Amplify.Data public class AdapterQuoting_Specification : Spec { - [It, Should(" quote a string value and remove single quotes. ")] + [It, Should("quote a string value and remove single quotes. ")] public void QuoteString() { Adapter adapter = new TestAdapter(); adapter.Quote("test").ShouldBe("'test'"); } - [It, Should(" quote an object's value appropiately. ")] + [It, Should("quote an object's value appropiately. ")] public void QuoteValue() { Adapter adapter = new TestAdapter(); @@ -51,32 +51,32 @@ namespace Amplify.Data adapter.Quote("1.01", DbType.Float).ShouldBe("1.01"); } - [It, Should(" throw an exception for binary values because it should be parameterized. ")] + [It, Should("throw an exception for binary values because it should be parameterized. ")] public void QuoteValueThrowsExceptionForBinaryValues() { - new Gallio.Action(() => - { + new Gallio.Action(() => { Adapter adapter = new TestAdapter(); adapter.Quote(new byte[] { 0x01, 0x02 }); - - }).ShouldThrow<ArgumentException>("passing in a byte array value should throw an argument exception"); + }) + .ShouldThrow<ArgumentException>( + "passing in a byte array value should throw an argument exception"); } - [It, Should(" quote the column name. ")] + [It, Should("quote the column name. ")] public void QuoteColumnName() { Adapter adapter = new TestAdapter(); adapter.QuoteColumnName("name").ShouldBe("name"); } - [It, Should(" quote the table name. ")] + [It, Should("quote the table name. ")] public void QuoteTableName() { Adapter adapter = new TestAdapter(); adapter.QuoteTableName("person").ShouldBe("person"); } - [It, Should(" quote the datetime value in a mysql format.")] + [It, Should("quote the datetime value in a mysql format.")] public void QuoteDate() { Adapter adapter = new TestAdapter(); src/Amplify.Tests/Data/Adapter.Quoting.cs @@ -28,7 +28,7 @@ namespace Amplify.Data public class Adapter_Specification : Spec { - [It, Should(" have a factory method that gets the default adapter. ")] + [It, Should("have a factory method that gets the default adapter. ")] public void Get() { // this test assumes that you have connection strings in the configuration. @@ -37,7 +37,7 @@ namespace Amplify.Data adapter.ShouldBe(Adapter.Get()); } - [It, Should(" add an adapter to current list of adapters ")] + [It, Should("add an adapter to current list of adapters ")] public void Add() { Adapter.Add("current", "system.data.sqlclient", "fakeconnectionstring"); @@ -46,7 +46,7 @@ namespace Amplify.Data adapter.ConnectionString.ShouldBe("fakeconnectionstring"); } - [It, Should(" throw an exception when trying to obtain an adapter with a bad key ")] + [It, Should("throw an exception when trying to obtain an adapter with a bad key ")] public void TryToGetInvalidKey() { ArgumentException ex = null; src/Amplify.Tests/Data/Adapter.cs @@ -29,7 +29,7 @@ namespace Amplify.Data.Adapters public class MysqlAdapter_Specification : Spec { - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void InvokeConstructor() { MySqlAdapter obj = new MySqlAdapter(); src/Amplify.Tests/Data/Adapters/MysqlAdapter.cs @@ -28,7 +28,7 @@ namespace Amplify.Data.Adapters public class SqlAdapter_Specification : Spec { - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void InvokeConstructor() { SqlAdapter obj = new SqlAdapter(); src/Amplify.Tests/Data/Adapters/SqlAdapter.cs @@ -28,7 +28,7 @@ namespace Amplify.Data.Adapters public class SqlCeAdapter_Specification : Spec { - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void InvokeConstructor() { SqlCeAdapter obj = new SqlCeAdapter(); src/Amplify.Tests/Data/Adapters/SqlCeAdapter.cs @@ -28,7 +28,7 @@ namespace Amplify.Data.Adapters public class SqliteAdapter_Specification : Spec { - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void InvokeConstructor() { SqliteAdapter obj = new SqliteAdapter(); src/Amplify.Tests/Data/Adapters/SqliteAdapter.cs @@ -46,28 +46,28 @@ namespace Amplify } - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void InvokeConstructor() { Hash obj = new Hash(); obj.ShouldNotBeNull(); } - [It, Should(" have a constructor that takes an equality comparer.")] + [It, Should("have a constructor that takes an equality comparer.")] public void InvokeConstructorWithComparer() { Hash obj = new Hash(new StringComparer()); obj.ShouldNotBeNull(); } - [It, Should(" have an constructor that takes an object of IDictionary<object, object> ")] + [It, Should("have an constructor that takes an object of IDictionary<object, object> ")] public void InvokeConstructorWithObjects() { Hash obj = new Hash(new Dictionary<object, object>()); obj.ShouldNotBeNull(); } - [It, Should(" be able to serializable ")] + [It, Should("be able to serializable ")] public void Serialize() { Hash obj = new Hash(new KV("Key", "Value")); @@ -85,7 +85,7 @@ namespace Amplify } } - [It, Should(" call static new with no arguments. ")] + [It, Should("call static new with no arguments. ")] public void InvokeNewWithNoArgs() { Hash obj = Hash.New(); @@ -93,7 +93,7 @@ namespace Amplify obj.Count.ShouldBe(0); } - [It, Should(" call static new with a Dictionary<object, object>.")] + [It, Should("call static new with a Dictionary<object, object>.")] public void InvokeNewWithObjectDictionary() { Hash obj = Hash.New(new Dictionary<object, object>() { }); @@ -101,7 +101,7 @@ namespace Amplify obj.Count.ShouldBe(0); } - [It, Should(" call static new with a Dictionary<string, object>. ")] + [It, Should("call static new with a Dictionary<string, object>. ")] public void InvokeNewWithStringDictionary() { Hash obj = Hash.New(new Dictionary<string, object>() { }); @@ -109,7 +109,7 @@ namespace Amplify obj.Count.ShouldBe(0); } - [It, Should(" be able to add key pair values ")] + [It, Should("be able to add key pair values ")] public void AddKeyPairs() { Hash obj = new Hash() { { "test", 1 }, { "1", "yeah" } }; src/Amplify.Tests/Hash.cs @@ -38,7 +38,7 @@ namespace Amplify } } - [It, Should(" has an execute method. ")] + [It, Should("has an execute method. ")] public void InvokeExecute() { Command command = new Command(); src/Amplify.Tests/ICommand.cs @@ -39,7 +39,7 @@ namespace Amplify } } - [It, Should(" be able to set internal properties and retrieve them. ")] + [It, Should("be able to set internal properties and retrieve them. ")] public void SetAndRetrieve() { IDecoratedObject obj = new Decorated(); src/Amplify.Tests/IDecoratedObject.cs @@ -44,7 +44,7 @@ namespace Amplify } - [It, Should(" delete a stored value or object. ")] + [It, Should("delete a stored value or object. ")] public void Delete() { IDeleteable obj = new Deletable() { Value = "test" }; src/Amplify.Tests/IDeleteable.cs @@ -51,7 +51,7 @@ namespace Amplify } - [It, Should(" have a public default constructor. ")] + [It, Should("have a public default constructor. ")] public void CompareIdentities() { IUniqueIdentifier<Guid> item = (IUniqueIdentifier<Guid>) new Unique(); src/Amplify.Tests/IUniqueIdentifier.cs @@ -28,7 +28,7 @@ namespace Amplify public class KV_Specification : Spec { - [It, Should(" have a public default constructor, that forces to create a key, value. ")] + [It, Should("have a public default constructor, that forces to create a key, value. ")] public void InvokeConstructor() { KV obj = new KV("key", "value"); src/Amplify.Tests/KV.cs @@ -54,14 +54,14 @@ namespace Amplify StringUtil.IsMatch("TEST this app", "test", RegexOptions.IgnoreCase).ShouldBeTrue(); } - [It, Should(" convert the string to an integer. ")] + [It, Should("convert the string to an integer. ")] public void ToInt() { StringUtil.ToInt("123").ShouldBe(123); StringUtil.ToInt("hi").ShouldBe(int.MinValue); } - [It, Should(" conver the string to a date. ")] + [It, Should("conver the string to a date. ")] public void ToDateTime() { DateTime date = StringUtil.ToDateTime("12/08/2009 10:12:00 AM"); @@ -76,7 +76,7 @@ namespace Amplify } - [It, Should(" convert the string to the date. ")] + [It, Should("convert the string to the date. ")] public void ToDate() { DateTime date = StringUtil.ToDate("12/08/2009 10:12:00 AM"); @@ -85,7 +85,7 @@ namespace Amplify date.Year.ShouldBe(2009); } - [It, Should(" convert the datetime string to a timespan. ")] + [It, Should("convert the datetime string to a timespan. ")] public void ToTime() { TimeSpan span = StringUtil.ToTime("12/08/2009 10:12:00 AM"); @@ -93,20 +93,20 @@ namespace Amplify span.Minutes.ShouldBe(12); } - [It, Should(" trim the string, using a string delimiter. ")] + [It, Should("trim the string, using a string delimiter. ")] public void Trim() { StringUtil.Trim("huh", "h").ShouldBe("u"); } - [It, Should(" trim the start of the string, using a string delimiter. ")] + [It, Should("trim the start of the string, using a string delimiter. ")] public void TrimStart() { StringUtil.TrimStart("huh,", ",").ShouldBe("huh,"); StringUtil.TrimStart("huh,", "h").ShouldBe("uh,"); } - [It, Should(" trim the end of the string, using a string delimiter. ")] + [It, Should("trim the end of the string, using a string delimiter. ")] public void TrimEnd() { StringUtil.TrimEnd("huh,", ",").ShouldBe("huh"); @@ -116,14 +116,14 @@ namespace Amplify - [It, Should(" split the string, using a string delimiter. ")] + [It, Should("split the string, using a string delimiter. ")] public void Split() { StringUtil.Split("test, value1, value2", ", ").Contains("test").ShouldBeTrue(); } - [It, Should(" iterate over the string and apply a handler to each segment. " )] + [It, Should("iterate over the string and apply a handler to each segment. " )] public void Each() { string values = ""; src/Amplify.Tests/StringUtil.cs @@ -15,7 +15,7 @@ using System.Text; [SuppressMessage("Microsoft.Design", "CA1050", Justification = "Amp should be a singleton accessable without forcing a namespace to be specified")] public class Amp : IAmp { - private static Amp amp; + private static IAmp amp; private Amplify.Hash properties; @@ -33,13 +33,26 @@ public class Amp : IAmp } } + public string EnvironmentMode { get; set; } + /// <summary> /// Gets or sets a value indicating whether this instance is in test. /// </summary> /// <value> /// <c>true</c> if this instance is in test; otherwise, <c>false</c>. /// </value> - public bool IsInTest { get; set; } + public bool IsInTest + { + get + { + return this.EnvironmentMode == "test"; + } + set + { + if (value) + this.EnvironmentMode = "test"; + } + } /// <summary> /// Gets or sets a value indicating whether this instance is in development. @@ -47,7 +60,18 @@ public class Amp : IAmp /// <value> /// <c>true</c> if this instance is in development; otherwise, <c>false</c>. /// </value> - public bool IsInDevelopment { get; set; } + public bool IsInDevelopment + { + get + { + return this.EnvironmentMode == "development"; + } + set + { + if (value) + this.EnvironmentMode = "development"; + } + } /// <summary> /// Gets or sets a value indicating whether this instance is in staging. @@ -55,7 +79,18 @@ public class Amp : IAmp /// <value> /// <c>true</c> if this instance is in staging; otherwise, <c>false</c>. /// </value> - public bool IsInStaging { get; set; } + public bool IsInStaging + { + get + { + return this.EnvironmentMode == "staging"; + } + set + { + if (value) + this.EnvironmentMode = "staging"; + } + } /// <summary> /// Gets or sets a value indicating whether this instance is in production. @@ -66,17 +101,14 @@ public class Amp : IAmp public bool IsInProduction { get - { - return !this.IsInTest && !this.IsInDevelopment && !this.IsInStaging; + { + return string.IsNullOrEmpty(this.EnvironmentMode) || + this.EnvironmentMode == "production"; } set { if (value) - { - this.IsInTest = false; - this.IsInDevelopment = false; - this.IsInStaging = false; - } + this.EnvironmentMode = "production"; } } @@ -93,7 +125,12 @@ public class Amp : IAmp public static IAmp Get() { if (amp == null) - amp = new Amp(); + Set(new Amp()); return amp; } + + public static void Set(IAmp amp) + { + Amp.amp = amp; + } } src/Amplify/Amp.cs @@ -26,6 +26,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <RunCodeAnalysis>true</RunCodeAnalysis> + <CodeAnalysisRules>-Microsoft.Globalization#CA1308</CodeAnalysisRules> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> src/Amplify/Amplify.csproj @@ -20,36 +20,52 @@ namespace Amplify.Data [ThreadStatic] private static object transaction; - protected object Transaction + /// <summary> + /// Gets or sets the connection string. + /// </summary> + /// <value>The connection string.</value> + public string ConnectionString { get; set; } + + /// <summary> + /// Gets or sets the transaction. + /// </summary> + /// <value>The transaction.</value> + protected static object Transaction { get { return transaction; } set { transaction = value; } } - protected IDbConnection Connection - { - get { return staticConnection; } - set - { - if (value == null) - { - if (staticConnection != null) - { - staticConnection.Dispose(); - staticConnection = null; - } - else - { - staticConnection = value; - } - } - } - } + /// <summary> + /// Gets or sets the connection. + /// </summary> + /// <value>The connection.</value> + protected static IDbConnection Connection + { + get { return staticConnection; } + set + { + if (value == null) + { + if (staticConnection != null) + { + staticConnection.Dispose(); + staticConnection = null; + } + else + { + staticConnection = value; + } + } + } + } - //protected IDbConnection Connect(); - + /// <summary> + /// Begins the transaction. + /// </summary> + /// <param name="isolationLevel">The isolation level.</param> public virtual void BeginTransaction(IsolationLevel isolationLevel) { if (Transaction == null) src/Amplify/Data/Adapter.AdoStatements.cs @@ -19,7 +19,7 @@ namespace Amplify.Data /// </summary> /// <param name="value">The value.</param> /// <returns></returns> - public string Quote(object value) + public virtual string Quote(object value) { return this.Quote(value, DbType.None); } @@ -31,26 +31,23 @@ namespace Amplify.Data /// <param name="dbType">Type of the db.</param> /// <returns></returns> [SuppressMessageAttribute("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "pointless")] - public string Quote(object value, DbType dbType) + public virtual string Quote(object value, DbType dbType) { if (value == null || (value is string && value.ToString().Trim().ToLowerInvariant() == "null")) return "NULL"; - switch (value.GetType().ToString().ToLower()) + switch (value.GetType().ToString().ToLowerInvariant()) { case "system.string": case "system.char[]": - if (dbType != DbType.None) + if (dbType != DbType.None && new List<DbType>() { DbType.Integer, DbType.Float }.Contains(dbType)) { - if (new List<DbType>() { DbType.Integer, DbType.Float }.Contains(dbType)) - { - object temp = (dbType == DbType.Integer) ? - Convert.ToInt32(value, CultureInfo.InvariantCulture) : - Convert.ToSingle(value, CultureInfo.InvariantCulture); - return temp.ToString(); - } + object temp = (dbType == DbType.Integer) ? + Convert.ToInt32(value, CultureInfo.InvariantCulture) : + Convert.ToSingle(value, CultureInfo.InvariantCulture); + return temp.ToString(); } - return string.Format("'{0}'", QuoteString(value.ToString())); + return this.SingleQuote(this.QuoteString(value.ToString())); case "system.byte[]": throw new ArgumentException("All binary values must be passed into an sql parameter"); case "system.boolean": @@ -59,12 +56,17 @@ namespace Amplify.Data else return (Convert.ToBoolean(value, CultureInfo.InvariantCulture)) ? "1" : "0"; case "system.datetime": - return string.Format("'{0}'", QuoteDate((DateTime)value)); + return this.SingleQuote(this.QuoteDate((DateTime)value)); default: - return string.Format("'{0}'", QuoteString(value.ToString())); + return SingleQuote(this.QuoteString(value.ToString())); } } + protected virtual string SingleQuote(object value) + { + return string.Format(CultureInfo.CurrentCulture, "'{0}'", value); + } + /// <summary> /// Quotes the string. /// </summary> @@ -120,7 +122,7 @@ namespace Amplify.Data /// <returns></returns> protected virtual string QuoteDate(DateTime value) { - return value.ToString("yyyy-MM-dd HH:mm:ss"); + return value.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture); } } } src/Amplify/Data/Adapter.Quoting.cs @@ -4,7 +4,6 @@ // </copyright> //----------------------------------------------------------------------- - namespace Amplify.Data { using System; @@ -22,13 +21,10 @@ namespace Amplify.Data public abstract partial class Adapter { private static Dictionary<string, Adapter> adapters; + private static Dictionary<string, Type> adapterTypes; private static string defaultAdapter; - /// <summary> - /// Gets or sets the connection string. - /// </summary> - /// <value>The connection string.</value> - public string ConnectionString { get; set; } + /// <summary> /// Gets the default adapter. @@ -42,19 +38,32 @@ namespace Amplify.Data { IAmp o = Amp.Get(); - if (o.IsInDevelopment) - defaultAdapter = "development"; - if (o.IsInTest) - defaultAdapter = "test"; - if (o.IsInStaging) - defaultAdapter = "staging"; - else + if (o.IsInProduction) defaultAdapter = "production"; + else + defaultAdapter = o.EnvironmentMode; } return defaultAdapter; } } + /// <summary> + /// Gets the adapter types. + /// </summary> + /// <value>The adapter types.</value> + protected static Dictionary<string, Type> AdapterTypes + { + get { + if (adapterTypes == null) + { + adapterTypes = new Dictionary<string, Type>(); + InitializeDefaultAdapterTypes(); + } + return adapterTypes; + } + } + + /// <summary> /// Gets the adapters. /// </summary> @@ -69,6 +78,37 @@ namespace Amplify.Data } } + private static void InitializeDefaultAdapterTypes() + { + Type sqlAdapter = typeof(Adapters.SqlAdapter); + adapterTypes.Add("System.Data.SqlClient", sqlAdapter); + adapterTypes.Add("mssql", sqlAdapter); + adapterTypes.Add("sqlclient", sqlAdapter); +#if SQLCE + Type sqlCeAdapter = typeof(Adapters.SqlAdapter); + adapterTypes.Add("System.Data.SqlServerCe", sqlCeAdapter); + adapterTypes.Add("mssqlce", sqlCeAdapter); + adapterTypes.Add("sqlceclient", sqlCeAdapter); + adapterTypes.Add("sqlce", sqlCeAdapter); + adapterTypes.Add("sqlcompactedition", sqlCeAdapter); +#endif + +#if MYSQL + Type mysqlAdapter = typeof(Adapters.MySqlAdapter); + adapterTypes.Add("MySql.Data.MySqlClient", mysqlAdapter); + adapterTypes.Add("mysql", mysqlAdapter); + adapterTypes.Add("mysqlclient", mysqlAdapter); +#endif + +#if SQLITE + Type sqliteAdapter = typeof(Adapters.SqliteAdapter); + adapterTypes.Add("System.Data.Sqlite", sqliteAdapter); + adapterTypes.Add("sqlite", sqliteAdapter); + adapterTypes.Add("sqliteclient", sqliteAdapter); +#endif + } + + /// <summary> /// Gets this instance. /// </summary> @@ -83,25 +123,25 @@ namespace Amplify.Data /// </summary> /// <param name="key">The key.</param> /// <returns>returns An Adapter</returns> - public static Adapter Get(string key) + public static Adapter Get(string name) { - return Get(key, true); + return Get(name, true); } /// <summary> /// Gets the instance specified by the key. /// </summary> - /// <param name="key">The key.</param> + /// <param name="name">The name, often the same as the connection string name.</param> /// <param name="useSuffix">if set to <c>true</c> [use suffix].</param> /// <returns>An Adapter</returns> - public static Adapter Get(string key, bool useSuffix) + public static Adapter Get(string name, bool useSuffix) { string actualKey; - if (string.IsNullOrEmpty(key)) + if (string.IsNullOrEmpty(name)) actualKey = DefaultAdapter; else - actualKey = useSuffix ? string.Format(CultureInfo.InvariantCulture, "{0}_{1}", key, DefaultAdapter) : key; + actualKey = useSuffix ? string.Format(CultureInfo.InvariantCulture, "{0}_{1}", name, DefaultAdapter) : name; if (!Adapters.ContainsKey(actualKey)) { ConnectionStringSettings settings = ConfigurationManager.ConnectionStrings[actualKey]; @@ -121,7 +161,7 @@ namespace Amplify.Data /// Adds a new instance of an adapter by the connection string. /// </summary> /// <param name="settings">The settings.</param> - /// <returns></returns> + /// <returns><see cref="Amplify.Adapter"/></returns> public static Adapter Add(System.Configuration.ConnectionStringSettings settings) { return Add(settings.Name, settings.ProviderName, settings.ConnectionString); @@ -130,43 +170,51 @@ namespace Amplify.Data /// <summary> /// Adds a new instance of an adapter with a keyed lookup. /// </summary> - /// <param name="key">The key.</param> + /// <param name="name">The name/key to look up later when you retrieve the adapter.</param> /// <param name="providerName">Name of the provider.</param> /// <param name="connectionString">The connection string.</param> - /// <returns></returns> + /// <returns><see cref="Amplify.Adapter"/></returns> + /// <exception cref="System.ArgumentException"> + /// throws if the name already is already stored with an associated + /// adapter. + /// </exception> + /// <exception cref="System.InvalidOperationException"> + /// throws if you try to add an adapter type that has not been registered + /// in the Adapter.AdapterTypes + /// </exception> [SuppressMessageAttribute("Microsoft.Globalization", "CA1308")] - public static Adapter Add(string key, string providerName, string connectionString) + public static Adapter Add(string name, string providerName, string connectionString) { + if(Adapter.Adapters.ContainsKey(name)) + throw new ArgumentException( + string.Format( + CultureInfo.CurrentCulture, + Resources.Exception_AdapterNameAlreadyExists, + name)); + Adapter adapter = null; - switch (providerName.ToLowerInvariant()) - { - case "system.data.sqlclient": - case "mssql": - case "sqlclient": - adapter = new Adapters.SqlAdapter(); - break; - case "system.data.sqlserverce": - // adapter = new SqlClientCe.SqlAdapter(connectionString); - break; -#if MYSQL - case "system.data.mysql": - case "sun.data.mysql": - case "mysqlclient": - case "mysql": - adapter = new Adapters.MySqlAdapter(); - break; -#endif - default: - throw new ArgumentException( - string.Format( - CultureInfo.CurrentCulture, - Resources.Exception_DataAdapterNotSupported, - providerName)); - } + bool found = false; + + foreach(string key in AdapterTypes.Keys) + { + if (providerName.Trim().ToLowerInvariant() == key.ToLowerInvariant()) + { + Type type = Adapter.AdapterTypes[key]; + adapter = (Adapter)Activator.CreateInstance(type); + adapter.ConnectionString = connectionString; + Adapter.Adapters.Add(name, adapter); + found = true; + break; + } + } + if (!found) + throw new InvalidOperationException( + string.Format( + CultureInfo.CurrentCulture, + Resources.Exception_AdapterTypeNotFound, + providerName)); - adapter.ConnectionString = connectionString; - Adapters.Add(key, adapter); - return adapter; + return adapter; } } } src/Amplify/Data/Adapter.cs @@ -1,18 +1,72 @@ - +//----------------------------------------------------------------------- +// <copyright file="root/docs/copyrights.txt" authors="Michael Herndon"> +// Copyright (c) 2008 Michael Herndon. All rights reserved. +// </copyright> +//----------------------------------------------------------------------- namespace Amplify.Data.Adapters { using System; using System.Collections.Generic; + using System.Globalization; using System.Text; #if MYSQL /// <summary> /// The adapter for MySql. /// </summary> - public class MySqlAdapter : Adapter - { + public class MySqlAdapter : Adapter + { - } + #region Quoting Properties + + /// <summary> + /// Gets the quoted true. + /// </summary> + /// <value>The quoted true.</value> + public override string QuotedTrue + { + get { return "1"; } + } + + /// <summary> + /// Gets the quoted false. + /// </summary> + /// <value>The quoted false.</value> + public override string QuotedFalse + { + get { return "0"; } + } + + #endregion + + + #region Quoting Methods + + /// <summary> + /// Quotes the specified value. + /// </summary> + /// <param name="value">The value.</param> + /// <param name="dbType">Type of the db.</param> + /// <returns></returns> + public override string Quote(object value, DbType dbType) + { + if (value is double) + return string.Format(CultureInfo.InvariantCulture, "'{0}'", value.ToString()); + return base.Quote(value, dbType); + } + + /// <summary> + /// Quotes the name of the column. + /// </summary> + /// <param name="name">The name.</param> + /// <returns></returns> + public override string QuoteColumnName(string name) + { + return string.Format(CultureInfo.InvariantCulture,"`{0}`", name); + } + + #endregion + } #endif } src/Amplify/Data/Adapters/MysqlAdapter.cs @@ -1,7 +1,14 @@ -namespace Amplify.Data.Adapters +//----------------------------------------------------------------------- +// <copyright file="root/docs/copyrights.txt" authors="Michael Herndon"> +// Copyright (c) 2008 Michael Herndon. All rights reserved. +// </copyright> +//----------------------------------------------------------------------- + +namespace Amplify.Data.Adapters { using System; using System.Collections.Generic; + using System.Globalization; using System.Text; /// <summary> @@ -9,5 +16,76 @@ /// </summary> public class SqlAdapter : Adapter { + + + #region Quoting Properties + + /// <summary> + /// Gets the quoted true. + /// </summary> + /// <value>The quoted true.</value> + public override string QuotedTrue + { + get { return "1"; } + } + + /// <summary> + /// Gets the quoted false. + /// </summary> + /// <value>The quoted false.</value> + public override string QuotedFalse + { + get { return "0"; } + } + + #endregion + + + #region Quoting Methods + + /// <summary> + /// Quotes the specified value. + /// </summary> + /// <param name="value">The value.</param> + /// <param name="dbType">Type of the db.</param> + /// <returns></returns> + public override string Quote(object value, DbType dbType) + { + switch (value.GetType().ToString().ToLowerInvariant()) + { + case "system.boolean": + if ((bool)value) + return "1"; + else + return "0"; + case "system.datetime": + if (dbType == DbType.Date) + return this.SingleQuote(((DateTime)value).ToString("MM/dd/yyyy", CultureInfo.InvariantCulture)); + return this.SingleQuote(((DateTime)value).ToString("MM/dd/yyyy HH:mm:ss", CultureInfo.InvariantCulture)); + } + return base.Quote(value, dbType); + } + + /// <summary> + /// Quotes the name of the column. + /// </summary> + /// <param name="name">The name.</param> + /// <returns></returns> + public override string QuoteColumnName(string name) + { + return string.Format(CultureInfo.InvariantCulture, "[{0}]", name); + } + + /// <summary> + /// Quotes the name of the table. + /// </summary> + /// <param name="name">The name.</param> + /// <returns></returns> + public override string QuoteTableName(string name) + { + return string.Format(CultureInfo.InvariantCulture, "[{0}]", name); + } + + #endregion } } src/Amplify/Data/Adapters/SqlAdapter.cs @@ -8,15 +8,87 @@ namespace Amplify.Data.Adapters { using System; using System.Collections.Generic; + using System.Diagnostics.CodeAnalysis; + using System.Globalization; using System.Text; #if SQLCE /// <summary> /// The adapter for sql compact edition. /// </summary> + [SuppressMessage("Microsoft.Naming", "CA1709", Justification = "Uppercasing CE make its harder to read SqlCEAdapter vs SqlCeAdapter")] public class SqlCeAdapter : Adapter { + #region Quoting Properties + + /// <summary> + /// Gets the quoted true. + /// </summary> + /// <value>The quoted true.</value> + public override string QuotedTrue + { + get { return "1"; } + } + + /// <summary> + /// Gets the quoted false. + /// </summary> + /// <value>The quoted false.</value> + public override string QuotedFalse + { + get { return "0"; } + } + + #endregion + + + #region Quoting Methods + + /// <summary> + /// Quotes the specified value. + /// </summary> + /// <param name="value">The value.</param> + /// <param name="dbType">Type of the db.</param> + /// <returns></returns> + public override string Quote(object value, DbType dbType) + { + switch (value.GetType().ToString().ToLowerInvariant()) + { + case "system.boolean": + if ((bool)value) + return "1"; + else + return "0"; + case "system.datetime": + if (dbType == DbType.Date) + return this.SingleQuote(((DateTime)value).ToString("MM/dd/yyyy", CultureInfo.InvariantCulture)); + return this.SingleQuote(((DateTime)value).ToString("MM/dd/yyyy HH:mm:ss", CultureInfo.InvariantCulture)); + } + return base.Quote(value, dbType); + } + + /// <summary> + /// Quotes the name of the column. + /// </summary> + /// <param name="name">The name.</param> + /// <returns></returns> + public override string QuoteColumnName(string name) + { + return string.Format(CultureInfo.InvariantCulture,"[{0}]", name); + } + + /// <summary> + /// Quotes the name of the table. + /// </summary> + /// <param name="name">The name.</param> + /// <returns></returns> + public override string QuoteTableName(string name) + { + return string.Format(CultureInfo.InvariantCulture,"[{0}]", name); + } + + #endregion } #endif } src/Amplify/Data/Adapters/SqlCeAdapter.cs @@ -8,14 +8,17 @@ namespace Amplify.Data.Adapters { using System; using System.Collections.Generic; + using System.Diagnostics.CodeAnalysis; using System.Text; #if SQLITE /// <summary> /// The sqlite adapter /// </summary> - public class SqliteAdapter : Adapter + [SuppressMessage("Microsoft.Naming", "CA1704", Justification = "Sqlite is correctly named")] + public class SqliteAdapter : Adapter { + } #endif } src/Amplify/Data/Adapters/SqliteAdapter.cs @@ -14,6 +14,8 @@ using System.Text; { Amplify.Hash Properties { get; } + string EnvironmentMode { get; } + bool IsInTest { get; } bool IsInDevelopment { get; } src/Amplify/IAmp.cs @@ -61,6 +61,24 @@ namespace Amplify.Properties { } /// <summary> + /// Looks up a localized string similar to an adapter with the name {0} already exists. + /// </summary> + public static string Exception_AdapterNameAlreadyExists { + get { + return ResourceManager.GetString("Exception_AdapterNameAlreadyExists", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to The Adapter type you specified {0} could not be found in Adapter.AdapterTypes. + /// </summary> + public static string Exception_AdapterTypeNotFound { + get { + return ResourceManager.GetString("Exception_AdapterTypeNotFound", resourceCulture); + } + } + + /// <summary> /// Looks up a localized string similar to The database connection has not been initialized.. /// </summary> public static string Exception_ConnectionNotInitialized { src/Amplify/Properties/Resources.Designer.cs @@ -117,6 +117,12 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <data name="Exception_AdapterNameAlreadyExists" xml:space="preserve"> + <value>an adapter with the name {0} already exists</value> + </data> + <data name="Exception_AdapterTypeNotFound" xml:space="preserve"> + <value>The Adapter type you specified {0} could not be found in Adapter.AdapterTypes</value> + </data> <data name="Exception_ConnectionNotInitialized" xml:space="preserve"> <value>The database connection has not been initialized.</value> </data> src/Amplify/Properties/Resources.resx @@ -16,6 +16,16 @@ { /// <summary> + /// Regexes the specified pattern. + /// </summary> + /// <param name="pattern">The pattern.</param> + /// <returns></returns> + public static Regex ToRegex(string pattern) + { + return new Regex(pattern, RegexOptions.ECMAScript); + } + + /// <summary> /// Grep and substring static utility method. /// </summary> /// <param name="input">The string to be parsed.</param> src/Amplify/StringUtil.cs de78a767e78ee3f21bf33c48a835e59d73035372 unknown michael.herndon@.mt.local http://github.com/michaelherndon/amplify/commit/4bec3f3b71401ce2da01ca358244638df28c388d 4bec3f3b71401ce2da01ca358244638df28c388d 2008-10-30T10:33:48-07:00 2008-10-30T10:33:48-07:00 made modifications to Amp & Adapter in order to provide increased flexibility in adding adapters and adding application environment modes ca78e5ecb8d6122d716fc41277ae9d85bcfd76ec unknown michael.herndon@.mt.local