From d3d1820613673c7ffea568d01866c7ecdcc4e85e Mon Sep 17 00:00:00 2001
From: jiftle <lixugood@126.com>
Date: Mon, 2 Oct 2017 17:36:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=AF=E6=8C=81oracle=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DapperDal/DalBaseOfTEntity.cs  |  10 ++-
 src/DapperDal/DapperDal.csproj     |   8 +-
 src/DapperDal/Sql/OracleDialect.cs | 114 +++++++++++++++++++++++++++++
 src/DapperDal/packages.config      |   2 +-
 4 files changed, 128 insertions(+), 6 deletions(-)
 create mode 100644 src/DapperDal/Sql/OracleDialect.cs

diff --git a/src/DapperDal/DalBaseOfTEntity.cs b/src/DapperDal/DalBaseOfTEntity.cs
index cd1721717..9f0d20cbb 100644
--- a/src/DapperDal/DalBaseOfTEntity.cs
+++ b/src/DapperDal/DalBaseOfTEntity.cs
@@ -2,7 +2,9 @@
 using System.Configuration;
 using System.Data;
 using System.Data.SqlClient;
+using System.Data.OracleClient;
 using DapperDal.Mapper;
+using DapperDal.Sql;
 
 namespace DapperDal
 {
@@ -58,7 +60,7 @@ public DalBase() : this("Default")
         public DalBase(string connNameOrConnStr)
         {
             Configuration = DalConfiguration.Default;
-
+            
             // 初始化配置项
             SetDefaultOptions();
 
@@ -102,7 +104,9 @@ protected virtual IDbConnection OpenConnection(string connNameOrConnStr)
                 throw new ArgumentNullException("connectionString");
             }
 
-            var connection = new SqlConnection(connectionString);
+            //------------------------这里应该区分下数据库类型-------------------
+            //var connection = new SqlConnection(connectionString);
+            var connection = new OracleConnection(connectionString);
             if (connection == null)
                 throw new ConfigurationErrorsException(
                     string.Format("Failed to create a connection using the connection string '{0}'.", connectionString));
@@ -122,6 +126,8 @@ private static void SetDefaultConfiguration()
                 DalConfiguration.Default.DefaultMapper = typeof(AutoEntityMapper<>);
                 DalConfiguration.Default.Nolock = true;
                 DalConfiguration.Default.Buffered = true;
+
+                DalConfiguration.Default.Dialect = new OracleDialect();
             }
         }
 
diff --git a/src/DapperDal/DapperDal.csproj b/src/DapperDal/DapperDal.csproj
index 5cec4eaaa..ce542446f 100644
--- a/src/DapperDal/DapperDal.csproj
+++ b/src/DapperDal/DapperDal.csproj
@@ -32,12 +32,14 @@
     <DocumentationFile>bin\Release\DapperDal.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Dapper.1.50.2\lib\net40\Dapper.dll</HintPath>
+    <Reference Include="Dapper, Version=1.50.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\coding_net\anbao\code\ScWCFService\packages\Dapper.1.50.1\lib\net40\Dapper.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -75,6 +77,7 @@
     <Compile Include="DalOptions.cs" />
     <Compile Include="DalConfiguration.cs" />
     <Compile Include="Expressions\PredicateExtensions.cs" />
+    <Compile Include="Sql\OracleDialect.cs" />
     <Compile Include="Utils\ExpressionExtensions.cs" />
     <Compile Include="Expressions\ExpressionUtility.cs" />
     <Compile Include="Expressions\PredicateBuilder.cs" />
@@ -100,7 +103,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/DapperDal/Sql/OracleDialect.cs b/src/DapperDal/Sql/OracleDialect.cs
new file mode 100644
index 000000000..969834844
--- /dev/null
+++ b/src/DapperDal/Sql/OracleDialect.cs
@@ -0,0 +1,114 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DapperDal.Sql
+{
+    /// <summary>
+    /// Oracle鏂硅█绫�
+    /// </summary>
+    public class OracleDialect : SqlDialectBase
+    {
+        /// <summary>
+        /// 鏋勯�犲嚱鏁�
+        /// </summary>
+        public OracleDialect() { }
+
+        /// <inheritdoc />
+        public override string GetIdentitySql(string tableName)
+        {
+            throw new System.NotImplementedException("Oracle does not support get last inserted identity.");
+        }
+
+        /// <inheritdoc />
+        public override bool SupportsMultipleStatements
+        {
+            get { return false; }
+        }
+
+        //from Simple.Data.Oracle implementation https://github.com/flq/Simple.Data.Oracle/blob/master/Simple.Data.Oracle/OraclePager.cs
+        /// <inheritdoc />
+        public override string GetPagingSql(string sql, int page, int resultsPerPage, IDictionary<string, object> parameters)
+        {
+            var toSkip = page * resultsPerPage;
+            var topLimit = (page + 1) * resultsPerPage;
+
+            var sb = new StringBuilder();
+            sb.AppendLine("SELECT * FROM (");
+            sb.AppendLine("SELECT \"_ss_dapper_1_\".*, ROWNUM RNUM FROM (");
+            sb.Append(sql);
+            sb.AppendLine(") \"_ss_dapper_1_\"");
+            sb.AppendLine("WHERE ROWNUM <= :topLimit) \"_ss_dapper_2_\" ");
+            sb.AppendLine("WHERE \"_ss_dapper_2_\".RNUM > :toSkip");
+
+            parameters.Add(":topLimit", topLimit);
+            parameters.Add(":toSkip", toSkip);
+
+            return sb.ToString();
+        }
+
+        /// <inheritdoc />
+        public override string GetSetSql(string sql, int firstResult, int maxResults, IDictionary<string, object> parameters)
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("SELECT * FROM (");
+            sb.AppendLine("SELECT \"_ss_dapper_1_\".*, ROWNUM RNUM FROM (");
+            sb.Append(sql);
+            sb.AppendLine(") \"_ss_dapper_1_\"");
+            sb.AppendLine("WHERE ROWNUM <= :topLimit) \"_ss_dapper_2_\" ");
+            sb.AppendLine("WHERE \"_ss_dapper_2_\".RNUM > :toSkip");
+
+            parameters.Add(":topLimit", maxResults + firstResult);
+            parameters.Add(":toSkip", firstResult);
+
+            return sb.ToString();
+        }
+
+        /// <inheritdoc />
+        public override string QuoteString(string value)
+        {
+            if (value != null && value[0] == '`')
+            {
+                return string.Format("{0}{1}{2}", OpenQuote, value.Substring(1, value.Length - 2), CloseQuote);
+            }
+            return value.ToUpper();
+        }
+
+        /// <inheritdoc />
+        public override char ParameterPrefix
+        {
+            get { return ':'; }
+        }
+
+        /// <inheritdoc />
+        public override char OpenQuote
+        {
+            get { return '"'; }
+        }
+
+        /// <inheritdoc />
+        public override char CloseQuote
+        {
+            get { return '"'; }
+        }
+
+        /// <inheritdoc />
+        public override string SelectLimit(string sql, int limit)
+        {//rownum <= 1
+            if (sql.Contains("ROWNUM <"))
+            {
+                return sql;
+            }
+
+            return sql.Insert(sql.Length,
+                string.Format(" AND ROWNUM <= {0}", limit));
+        }
+
+        /// <inheritdoc />
+        public override string SetNolock(string sql)
+        {
+                return sql;
+        }
+    }
+}
diff --git a/src/DapperDal/packages.config b/src/DapperDal/packages.config
index dfb939ee8..82a9fdbd2 100644
--- a/src/DapperDal/packages.config
+++ b/src/DapperDal/packages.config
@@ -1,4 +1,4 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Dapper" version="1.50.2" targetFramework="net40" />
+  <package id="Dapper" version="1.50.1" targetFramework="net40" />
 </packages>
\ No newline at end of file

From e8a32093f2772015ae084584345c9da6b7268258 Mon Sep 17 00:00:00 2001
From: jiftle <lixugood@126.com>
Date: Tue, 3 Oct 2017 14:23:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E8=87=AA=E5=8A=A8=EF=BC=8C=E5=8D=B3=E4=BD=BF?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E4=B8=8D=E6=98=AFid=E6=88=96id?=
 =?UTF-8?q?=E7=BB=93=E5=B0=BE=E7=9A=84=E4=B9=9F=E5=8F=AF=E4=BB=A5=E3=80=82?=
 =?UTF-8?q?=20=E6=94=AF=E6=8C=81NLog=E6=89=93=E5=8D=B0sql=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DapperDal/Attributes/FieldAtrribute.cs  | 33 +++++++++++++++++++++
 src/DapperDal/DalBaseOfTEntity.Insert.cs    |  5 ++++
 src/DapperDal/DapperDal.csproj              |  5 ++++
 src/DapperDal/Implementor/DalImplementor.cs | 25 ++++++++++++++--
 src/DapperDal/Mapper/ClassMapper.cs         | 14 ++++++++-
 src/DapperDal/Sql/SqlGenerator.cs           |  8 +++--
 src/DapperDal/packages.config               |  1 +
 7 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 src/DapperDal/Attributes/FieldAtrribute.cs

diff --git a/src/DapperDal/Attributes/FieldAtrribute.cs b/src/DapperDal/Attributes/FieldAtrribute.cs
new file mode 100644
index 000000000..be9222b80
--- /dev/null
+++ b/src/DapperDal/Attributes/FieldAtrribute.cs
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+//using System.Reflection;
+
+namespace DapperDal.Attributes
+{
+    /// <summary>
+    /// 瀛楁灞炴�э紝娉ㄨВ
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class FieldAtrribute:Attribute
+    {
+        /// <summary>
+        /// 鏄富閿� 锛�
+        /// </summary>
+        public bool IsPrimaryKey { get; set; }
+
+
+        /// <summary>
+        /// 鍚嶅瓧
+        /// </summary>
+        public string Name { get; set; }
+
+        
+
+        /// <summary>
+        /// 鎻忚堪
+        /// </summary>
+        public string Describtion { get; set; }
+    }
+}
diff --git a/src/DapperDal/DalBaseOfTEntity.Insert.cs b/src/DapperDal/DalBaseOfTEntity.Insert.cs
index bd6fb9401..67ec3f0fb 100644
--- a/src/DapperDal/DalBaseOfTEntity.Insert.cs
+++ b/src/DapperDal/DalBaseOfTEntity.Insert.cs
@@ -6,6 +6,11 @@
 
 namespace DapperDal
 {
+    /// <summary>
+    /// 鏁版嵁璁块棶灞傚熀绫� 
+    /// </summary>
+    /// <typeparam name="TEntity">瀹炰綋</typeparam>
+    /// <typeparam name="TPrimaryKey">涓婚敭鏁版嵁绫诲瀷</typeparam>
     public partial class DalBase<TEntity, TPrimaryKey> where TEntity : class
     {
         /// <summary>
diff --git a/src/DapperDal/DapperDal.csproj b/src/DapperDal/DapperDal.csproj
index ce542446f..ff5c2f586 100644
--- a/src/DapperDal/DapperDal.csproj
+++ b/src/DapperDal/DapperDal.csproj
@@ -36,6 +36,10 @@
       <HintPath>..\..\..\..\coding_net\anbao\code\ScWCFService\packages\Dapper.1.50.1\lib\net40\Dapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\coding_net\anbao\code\ScWCFService\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -48,6 +52,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Attributes\FieldAtrribute.cs" />
     <Compile Include="DalBaseOfTEntity.Execute.OtherConn.cs" />
     <Compile Include="DalBaseOfTEntity.ExecuteScalar.OtherConn.cs" />
     <Compile Include="DalBaseOfTEntity.QueryDataSet.OtherConn.cs" />
diff --git a/src/DapperDal/Implementor/DalImplementor.cs b/src/DapperDal/Implementor/DalImplementor.cs
index 4b817836f..ad4dfd8d0 100644
--- a/src/DapperDal/Implementor/DalImplementor.cs
+++ b/src/DapperDal/Implementor/DalImplementor.cs
@@ -10,6 +10,7 @@
 using DapperDal.Predicate;
 using DapperDal.Sql;
 using DapperDal.Utils;
+using NLog;
 
 namespace DapperDal.Implementor
 {
@@ -235,6 +236,8 @@ public interface IDalImplementor
     /// </summary>
     public class DalImplementor : IDalImplementor
     {
+        private static Logger logger = LogManager.GetCurrentClassLogger();
+
         /// <summary>
         /// 鍒濆鍖栨暟鎹闂櫒
         /// </summary>
@@ -293,10 +296,12 @@ public void Insert<T>(IDbConnection connection, IEnumerable<T> entities, IDbTran
 
             if (triggerIdentityColumn == null)
             {
+                logger.Debug("DapperDal SQL: " + sql);
                 connection.Execute(sql, entities, transaction, commandTimeout, CommandType.Text);
             }
             else
             {
+                logger.Debug("DapperDal SQL: " + sql);
                 connection.Execute(sql, parameters, transaction, commandTimeout, CommandType.Text);
             }
         }
@@ -325,10 +330,13 @@ public dynamic Insert<T>(IDbConnection connection, T entity, IDbTransaction tran
                 if (SqlGenerator.SupportsMultipleStatements())
                 {
                     sql += SqlGenerator.Configuration.Dialect.BatchSeperator + SqlGenerator.IdentitySql(classMap);
+
+                    logger.Debug("DapperDal SQL: " + sql);
                     result = connection.Query<long>(sql, entity, transaction, false, commandTimeout, CommandType.Text);
                 }
                 else
                 {
+                    logger.Debug("DapperDal SQL: " + sql);
                     connection.Execute(sql, entity, transaction, commandTimeout, CommandType.Text);
                     sql = SqlGenerator.IdentitySql(classMap);
                     result = connection.Query<long>(sql, entity, transaction, false, commandTimeout, CommandType.Text);
@@ -352,6 +360,7 @@ public dynamic Insert<T>(IDbConnection connection, T entity, IDbTransaction tran
                 var defaultValue = entity.GetType().GetProperty(triggerIdentityColumn.PropertyInfo.Name).GetValue(entity, null);
                 dynamicParameters.Add("IdOutParam", direction: ParameterDirection.Output, value: defaultValue);
 
+                logger.Debug("DapperDal SQL: " + sql);
                 connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text);
 
                 var value = dynamicParameters.Get<object>(SqlGenerator.Configuration.Dialect.ParameterPrefix + "IdOutParam");
@@ -360,6 +369,7 @@ public dynamic Insert<T>(IDbConnection connection, T entity, IDbTransaction tran
             }
             else
             {
+                logger.Debug("DapperDal SQL: " + sql);
                 connection.Execute(sql, entity, transaction, commandTimeout, CommandType.Text);
             }
 
@@ -396,6 +406,7 @@ public bool Update<T>(IDbConnection connection, T entity, IDbTransaction transac
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0;
         }
 
@@ -422,6 +433,7 @@ public bool Update<T>(IDbConnection connection, T entity, IList<string> props, I
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0;
         }
 
@@ -450,6 +462,7 @@ public bool Update<T>(IDbConnection connection, T entity, object props, IDbTrans
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0;
         }
 
@@ -463,7 +476,6 @@ public bool Update<T>(IDbConnection connection, object keyAndProps, IDbTransacti
             var propValues = ReflectionHelper.GetObjectValues(keyAndProps);
             var propKeys = propValues.Keys.ToList();
             string sql = SqlGenerator.Update(classMap, predicate, parameters, propKeys);
-
             var columns = classMap.Properties.Where(
                 p => (propKeys.Count == 0 || propKeys.Contains(p.Name, StringComparer.OrdinalIgnoreCase)) &&
                      !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned));
@@ -479,6 +491,7 @@ public bool Update<T>(IDbConnection connection, object keyAndProps, IDbTransacti
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0;
         }
 
@@ -495,7 +508,9 @@ public bool Update<T>(IDbConnection connection, object props, object predicate,
             var columns = classMap.Properties.Where(
                 p => (propKeys.Count == 0 || propKeys.Contains(p.Name, StringComparer.OrdinalIgnoreCase)) &&
                      !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned));
-
+           // var columns = classMap.Properties.Where(
+           //p => (propKeys.Count == 0 || propKeys.Contains(p.Name, StringComparer.OrdinalIgnoreCase)) &&
+           //     !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity));
             DynamicParameters dynamicParameters = new DynamicParameters();
             foreach (var property in propValues.Where(property => columns.Any(c => c.Name.Equals(property.Key, StringComparison.OrdinalIgnoreCase))))
             {
@@ -507,6 +522,7 @@ public bool Update<T>(IDbConnection connection, object props, object predicate,
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0;
         }
 
@@ -580,6 +596,7 @@ public int Count<T>(IDbConnection connection, object predicate, IDbTransaction t
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return (int)connection.Query(sql, dynamicParameters, transaction, false, commandTimeout, CommandType.Text).Single().Total;
         }
 
@@ -623,6 +640,7 @@ protected IEnumerable<T> GetList<T>(IDbConnection connection, IClassMapper class
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Query<T>(sql, dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text);
         }
 
@@ -650,6 +668,7 @@ protected IEnumerable<T> GetPage<T>(IDbConnection connection, IClassMapper class
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Query<T>(sql, dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text);
         }
 
@@ -677,6 +696,7 @@ protected IEnumerable<T> GetSet<T>(IDbConnection connection, IClassMapper classM
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Query<T>(sql, dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text);
         }
 
@@ -700,6 +720,7 @@ protected bool Delete<T>(IDbConnection connection, IClassMapper classMap, IPredi
                 dynamicParameters.Add(parameter.Key, parameter.Value);
             }
 
+            logger.Debug("DapperDal SQL: " + sql);
             return connection.Execute(sql, dynamicParameters, transaction, commandTimeout, CommandType.Text) > 0;
         }
 
diff --git a/src/DapperDal/Mapper/ClassMapper.cs b/src/DapperDal/Mapper/ClassMapper.cs
index 1f877a22d..45860679f 100644
--- a/src/DapperDal/Mapper/ClassMapper.cs
+++ b/src/DapperDal/Mapper/ClassMapper.cs
@@ -6,6 +6,7 @@
 using System.Numerics;
 using System.Reflection;
 using DapperDal.Utils;
+using DapperDal.Attributes;
 
 namespace DapperDal.Mapper
 {
@@ -128,6 +129,7 @@ protected virtual void AutoMap(Func<Type, PropertyInfo, bool> canMap)
             PropertyMap keyMap = null;
             foreach (var propertyInfo in type.GetProperties())
             {
+                
                 if (Properties.Any(p => p.Name.Equals(propertyInfo.Name, StringComparison.InvariantCultureIgnoreCase)))
                 {
                     continue;
@@ -141,11 +143,21 @@ protected virtual void AutoMap(Func<Type, PropertyInfo, bool> canMap)
                 PropertyMap map = Map(propertyInfo);
                 if (!hasDefinedKey)
                 {
-                    if (string.Equals(map.PropertyInfo.Name, "id", StringComparison.InvariantCultureIgnoreCase))
+                    //--------------------jiftle 娣诲姞----- 瑙ｅ喅涓婚敭涓嶆槸id 鎴杋d缁撳熬鐨勬儏鍐�----------------
+                    var fieldAtrribute = (FieldAtrribute)Attribute.GetCustomAttribute(propertyInfo, typeof(FieldAtrribute));
+                    if (fieldAtrribute != null && fieldAtrribute.IsPrimaryKey)
                     {
                         keyMap = map;
                     }
 
+                    //瀛楁鍚嶆槸 id 璁や负鏄富閿�
+                    //if (string.Equals(map.PropertyInfo.Name, "id", StringComparison.InvariantCultureIgnoreCase))
+                    if (keyMap == null && string.Equals(map.PropertyInfo.Name, "id", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        keyMap = map;
+                    }
+
+                    //瀛楁鍚嶇敤id缁撳熬 璁や负鏄富閿�
                     if (keyMap == null && map.PropertyInfo.Name.EndsWith("id", true, CultureInfo.InvariantCulture))
                     {
                         keyMap = map;
diff --git a/src/DapperDal/Sql/SqlGenerator.cs b/src/DapperDal/Sql/SqlGenerator.cs
index 6be283d7b..76bc3adec 100644
--- a/src/DapperDal/Sql/SqlGenerator.cs
+++ b/src/DapperDal/Sql/SqlGenerator.cs
@@ -354,20 +354,24 @@ public virtual string Update(IClassMapper classMap, IPredicate predicate, IDicti
             var columns = classMap.Properties.Where(
                 p => (props == null || props.Count == 0 || props.Contains(p.Name, StringComparer.OrdinalIgnoreCase)) &&
                      !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity || p.KeyType == KeyType.Assigned));
+            //var columns = classMap.Properties.Where(
+            // p => (props == null || props.Count == 0 || props.Contains(p.Name, StringComparer.OrdinalIgnoreCase)) &&
+            //      !(p.Ignored || p.IsReadOnly || p.KeyType == KeyType.Identity));
             if (!columns.Any())
             {
                 throw new ArgumentException("No columns were mapped.");
             }
-
+            //DapperDal.Mapper.KeyType
             var setSql =
                 columns.Select(
                     p =>
                     string.Format(
                         "{0} = {1}{2}", GetColumnName(classMap, p, false), Configuration.Dialect.ParameterPrefix, p.Name));
+            string strSetSql = setSql.AppendStrings();
 
             var sql = string.Format("UPDATE {0} SET {1} WHERE {2}",
                 GetTableName(classMap),
-                setSql.AppendStrings(),
+               strSetSql,
                 predicate.GetSql(this, parameters));
 
             if (Configuration.OutputSql != null)
diff --git a/src/DapperDal/packages.config b/src/DapperDal/packages.config
index 82a9fdbd2..8ef666b01 100644
--- a/src/DapperDal/packages.config
+++ b/src/DapperDal/packages.config
@@ -1,4 +1,5 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Dapper" version="1.50.1" targetFramework="net40" />
+  <package id="NLog" version="4.4.12" targetFramework="net40" />
 </packages>
\ No newline at end of file

From e9beeedf81fd1aa6a8741a967edc507d31e1c1bf Mon Sep 17 00:00:00 2001
From: jiftle <lixugood@126.com>
Date: Wed, 4 Oct 2017 00:05:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8COracle=E8=8E=B7=E5=8F=96GetFirst=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DapperDal/DalBaseOfTEntity.Insert.cs |  5 ---
 src/DapperDal/DapperDal.csproj           | 20 +++++++++++
 src/DapperDal/Sql/OracleDialect.cs       | 43 ++++++++++++++++++++++--
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/DapperDal/DalBaseOfTEntity.Insert.cs b/src/DapperDal/DalBaseOfTEntity.Insert.cs
index 67ec3f0fb..bd6fb9401 100644
--- a/src/DapperDal/DalBaseOfTEntity.Insert.cs
+++ b/src/DapperDal/DalBaseOfTEntity.Insert.cs
@@ -6,11 +6,6 @@
 
 namespace DapperDal
 {
-    /// <summary>
-    /// 鏁版嵁璁块棶灞傚熀绫� 
-    /// </summary>
-    /// <typeparam name="TEntity">瀹炰綋</typeparam>
-    /// <typeparam name="TPrimaryKey">涓婚敭鏁版嵁绫诲瀷</typeparam>
     public partial class DalBase<TEntity, TPrimaryKey> where TEntity : class
     {
         /// <summary>
diff --git a/src/DapperDal/DapperDal.csproj b/src/DapperDal/DapperDal.csproj
index ff5c2f586..09cd09910 100644
--- a/src/DapperDal/DapperDal.csproj
+++ b/src/DapperDal/DapperDal.csproj
@@ -31,6 +31,26 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\DapperDal.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>bin\Debug\DapperDal.xml</DocumentationFile>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>bin\Release\DapperDal.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dapper, Version=1.50.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\coding_net\anbao\code\ScWCFService\packages\Dapper.1.50.1\lib\net40\Dapper.dll</HintPath>
diff --git a/src/DapperDal/Sql/OracleDialect.cs b/src/DapperDal/Sql/OracleDialect.cs
index 969834844..f725ef6ae 100644
--- a/src/DapperDal/Sql/OracleDialect.cs
+++ b/src/DapperDal/Sql/OracleDialect.cs
@@ -101,14 +101,51 @@ public override string SelectLimit(string sql, int limit)
                 return sql;
             }
 
-            return sql.Insert(sql.Length,
-                string.Format(" AND ROWNUM <= {0}", limit));
+            const string where = " WHERE ";
+            const string orderby = " ORDER BY ";
+
+            if (sql.Contains(orderby))
+            {
+                sql = sql.Insert(sql.IndexOf(orderby, StringComparison.OrdinalIgnoreCase), string.Format(" AND ROWNUM <= {0} ", limit));
+            }else
+            {
+                if (sql.Contains(where))
+                {
+                    sql = sql.Insert(sql.Length, string.Format(" AND ROWNUM <= {0} ", limit));
+                }
+            }
+
+            return sql;
+
+            //return sql.Insert(sql.Length,
+            //    string.Format(" AND ROWNUM <= {0}", limit));
         }
 
         /// <inheritdoc />
         public override string SetNolock(string sql)
         {
-                return sql;
+            return sql;
+
+            //const string withNolock = " WITH (NOLOCK)";
+            //const string where = " WHERE ";
+            //const string orderby = " ORDER BY ";
+
+            //if (sql.Contains(withNolock))
+            //{
+            //    return sql;
+            //}
+
+            //if (sql.Contains(where))
+            //{
+            //    return sql.Insert(sql.IndexOf(where, StringComparison.OrdinalIgnoreCase), withNolock);
+            //}
+
+            //if (sql.Contains(orderby))
+            //{
+            //    return sql.Insert(sql.IndexOf(orderby, StringComparison.OrdinalIgnoreCase), withNolock);
+            //}
+
+            //return string.Concat(sql, withNolock);
         }
     }
 }

From 2a4f2fc822d28ba82ced23e3cf9ccc16962c2037 Mon Sep 17 00:00:00 2001
From: jiftle <lixugood@126.com>
Date: Sun, 18 Nov 2018 00:06:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?oracle=E6=94=AF=E6=8C=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/DapperDal/App.config                      | 30 ++++++
 src/DapperDal/DalBaseOfTEntity.cs             | 93 ++++++++++++++++++-
 src/DapperDal/DapperDal.csproj                | 15 ++-
 src/DapperDal/Implementor/DalImplementor.cs   |  5 +
 .../Providers/Common/ConnectionFactory.cs     | 26 ++++++
 src/DapperDal/Providers/IDbProvider.cs        | 18 ++++
 src/DapperDal/Providers/OracleProvider.cs     | 41 ++++++++
 src/DapperDal/Providers/SqlServerProvider.cs  | 43 +++++++++
 src/DapperDal/Sql/OracleDialect.cs            | 50 +++++++---
 src/DapperDal/packages.config                 |  3 +-
 10 files changed, 304 insertions(+), 20 deletions(-)
 create mode 100644 src/DapperDal/App.config
 create mode 100644 src/DapperDal/Providers/Common/ConnectionFactory.cs
 create mode 100644 src/DapperDal/Providers/IDbProvider.cs
 create mode 100644 src/DapperDal/Providers/OracleProvider.cs
 create mode 100644 src/DapperDal/Providers/SqlServerProvider.cs

diff --git a/src/DapperDal/App.config b/src/DapperDal/App.config
new file mode 100644
index 000000000..fb8ed4507
--- /dev/null
+++ b/src/DapperDal/App.config
@@ -0,0 +1,30 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="oracle.manageddataaccess.client"
+      type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+    </configSections>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="Oracle.ManagedDataAccess.Client"/>
+      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver"
+        type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
+    </DbProviderFactories>
+  </system.data>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <publisherPolicy apply="no"/>
+        <assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral"/>
+        <bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.122.1.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <oracle.manageddataaccess.client>
+    <version number="*">
+      <dataSources>
+        <dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) "/>
+      </dataSources>
+    </version>
+  </oracle.manageddataaccess.client>
+</configuration>
\ No newline at end of file
diff --git a/src/DapperDal/DalBaseOfTEntity.cs b/src/DapperDal/DalBaseOfTEntity.cs
index 9f0d20cbb..9742bed50 100644
--- a/src/DapperDal/DalBaseOfTEntity.cs
+++ b/src/DapperDal/DalBaseOfTEntity.cs
@@ -1,10 +1,14 @@
 using System;
 using System.Configuration;
 using System.Data;
+
 using System.Data.SqlClient;
-using System.Data.OracleClient;
+//using System.Data.OracleClient;
+using Oracle.ManagedDataAccess.Client;
+
 using DapperDal.Mapper;
 using DapperDal.Sql;
+using DapperDal.Providers;
 
 namespace DapperDal
 {
@@ -49,6 +53,7 @@ static DalBase()
         /// </summary>
         public DalBase() : this("Default")
         {
+
         }
 
         /// <summary>
@@ -64,7 +69,12 @@ public DalBase(string connNameOrConnStr)
             // 初始化配置项
             SetDefaultOptions();
 
-            ConnectionString = ResolveConnectionString(connNameOrConnStr);
+            //ConnectionString = ResolveConnectionString(connNameOrConnStr);
+
+            ConnectionStringSettings connectionStringSettings = ResolveConnectionStringFromConfig("DapperDalConnStr");
+
+            DbType = connectionStringSettings.ProviderName.IndexOf("Oracle") > 0 ?"Oracle":"";
+            ConnectionString = connectionStringSettings.ConnectionString;
         }
 
         /// <summary>
@@ -82,13 +92,69 @@ public DalBase(string connNameOrConnStr)
         /// </summary>
         public string ConnectionString { get; private set; }
 
+        /// <summary>
+        /// 数据库类型 Oracle, SqlServer
+        /// </summary>
+        public string DbType { get; set; }
+
         /// <summary>
         /// 打开DB连接
         /// </summary>
         /// <returns>DB连接</returns>
         protected virtual IDbConnection OpenConnection()
         {
-            return OpenConnection(ConnectionString);
+            return OpenConnection(DbType, ConnectionString);
+            //return OpenConnection(ConnectionString);
+        }
+
+        /// <summary>
+        /// 创建数据库提供程序驱动
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private static IDbProvider GetProvider(string type)
+        {
+            switch (type)
+            {
+                case "Oracle":
+                    return new OracleProvider();
+
+                case "SqlServer":
+                default:
+                    return new SqlServerProvider();
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="dbType"></param>
+        /// <param name="connNameOrConnStr"></param>
+        /// <returns></returns>
+        protected virtual IDbConnection OpenConnection(string dbType,string connNameOrConnStr)
+        {
+            //var connectionString = ResolveConnectionString(connNameOrConnStr);
+            //if (string.IsNullOrEmpty(connectionString))
+            //{
+            //    throw new ArgumentNullException("connectionString");
+            //}
+
+            //------------------------这里应该区分下数据库类型-------------------
+            IDbProvider dbProvider = GetProvider(dbType);
+            var connection = dbProvider.CreateConnection();
+
+            try
+            {
+                connection.ConnectionString = connNameOrConnStr;
+            }
+            catch(Exception)
+            {
+                throw new ConfigurationErrorsException(string.Format("Failed to create a connection using the connection string '{0}'", connNameOrConnStr));
+            }
+           
+            connection.Open();
+
+            return connection;
         }
 
         /// <summary>
@@ -106,6 +172,7 @@ protected virtual IDbConnection OpenConnection(string connNameOrConnStr)
 
             //------------------------这里应该区分下数据库类型-------------------
             //var connection = new SqlConnection(connectionString);
+            //var connection = new OracleConnection(connectionString);
             var connection = new OracleConnection(connectionString);
             if (connection == null)
                 throw new ConfigurationErrorsException(
@@ -125,8 +192,10 @@ private static void SetDefaultConfiguration()
             {
                 DalConfiguration.Default.DefaultMapper = typeof(AutoEntityMapper<>);
                 DalConfiguration.Default.Nolock = true;
-                DalConfiguration.Default.Buffered = true;
+                DalConfiguration.Default.Buffered = true;//默认是true,也就是启用缓存,因为查询数据时不更新，所以禁用
 
+                //------------------自定义 jiftle -----------------------
+                //DalConfiguration.Default.Buffered = false;
                 DalConfiguration.Default.Dialect = new OracleDialect();
             }
         }
@@ -174,5 +243,21 @@ private string ResolveConnectionString(string connNameOrConnStr)
             }
         }
 
+        /// <summary>
+        /// 从配置文件中获取数据库连接字符串
+        /// </summary>
+        /// <returns></returns>
+        private ConnectionStringSettings ResolveConnectionStringFromConfig(string ConnName)
+        {
+            var conStr = ConfigurationManager.ConnectionStrings[ConnName];
+            if (conStr == null)
+            {
+                throw new ConfigurationErrorsException(
+                    string.Format("Failed to find connection string named '{0}' in app/web.config.", ConnName));
+            }
+
+            return conStr;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/src/DapperDal/DapperDal.csproj b/src/DapperDal/DapperDal.csproj
index 09cd09910..d89adbe64 100644
--- a/src/DapperDal/DapperDal.csproj
+++ b/src/DapperDal/DapperDal.csproj
@@ -52,12 +52,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Dapper, Version=1.50.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\coding_net\anbao\code\ScWCFService\packages\Dapper.1.50.1\lib\net40\Dapper.dll</HintPath>
+    <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\coding_net\anbao\code\1.鍓嶇疆鏈嶅姟\ScWCFService\packages\Dapper.1.50.2\lib\net40\Dapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\coding_net\anbao\code\ScWCFService\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <HintPath>..\..\..\..\coding_net\anbao\code\1.鍓嶇疆鏈嶅姟\ScWCFService\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\coding_net\anbao\code\1.鍓嶇疆鏈嶅姟\ScWCFService\packages\Oracle.ManagedDataAccess.12.2.1100\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -102,6 +106,10 @@
     <Compile Include="DalOptions.cs" />
     <Compile Include="DalConfiguration.cs" />
     <Compile Include="Expressions\PredicateExtensions.cs" />
+    <Compile Include="Providers\Common\ConnectionFactory.cs" />
+    <Compile Include="Providers\IDbProvider.cs" />
+    <Compile Include="Providers\OracleProvider.cs" />
+    <Compile Include="Providers\SqlServerProvider.cs" />
     <Compile Include="Sql\OracleDialect.cs" />
     <Compile Include="Utils\ExpressionExtensions.cs" />
     <Compile Include="Expressions\ExpressionUtility.cs" />
@@ -126,6 +134,7 @@
     <Compile Include="Sql\SqlServerDialect.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/DapperDal/Implementor/DalImplementor.cs b/src/DapperDal/Implementor/DalImplementor.cs
index ad4dfd8d0..0be7747fd 100644
--- a/src/DapperDal/Implementor/DalImplementor.cs
+++ b/src/DapperDal/Implementor/DalImplementor.cs
@@ -641,7 +641,12 @@ protected IEnumerable<T> GetList<T>(IDbConnection connection, IClassMapper class
             }
 
             logger.Debug("DapperDal SQL: " + sql);
+
+            //sql = "Select * from (SELECT ABS_TERMINFOUPLOAD.TERMNO, ABS_TERMINFOUPLOAD.UPLOADTIME, ABS_TERMINFOUPLOAD.OPDT, ABS_TERMINFOUPLOAD.STATUS, ABS_TERMINFOUPLOAD.VERINFO, ABS_TERMINFOUPLOAD.DESCRIPTION FROM ABS_TERMINFOUPLOAD WHERE (ABS_TERMINFOUPLOAD.TERMNO = '10000002')   ORDER BY ABS_TERMINFOUPLOAD.OPDT DESC) where ROWNUM <= 1 ";
             return connection.Query<T>(sql, dynamicParameters, transaction, buffered, commandTimeout, CommandType.Text);
+
+            //IEnumerable<T> list = connection.Query<T>(sql, dynamicParameters, transaction, false, commandTimeout, CommandType.Text);
+            //return list;
         }
 
         /// <summary>
diff --git a/src/DapperDal/Providers/Common/ConnectionFactory.cs b/src/DapperDal/Providers/Common/ConnectionFactory.cs
new file mode 100644
index 000000000..fd9e9390d
--- /dev/null
+++ b/src/DapperDal/Providers/Common/ConnectionFactory.cs
@@ -0,0 +1,26 @@
+锘縰sing System.Data;
+using System.Data.Common;
+
+namespace DapperDal.Providers.Common
+{
+    /// <summary>
+    /// 鏁版嵁搴撹繛鎺ュ伐鍘�
+    /// </summary>
+	internal class ConnectionFactory
+	{
+        /// <summary>
+        /// 鍒涘缓杩炴帴
+        /// </summary>
+        /// <param name="providerName"></param>
+        /// <param name="connectionString"></param>
+        /// <returns></returns>
+		public static IDbConnection CreateConnection(string providerName, string connectionString)
+		{
+			var factory = DbProviderFactories.GetFactory(providerName);
+
+			var connection = factory.CreateConnection();
+			connection.ConnectionString = connectionString;
+			return connection;
+		}
+	}
+}
diff --git a/src/DapperDal/Providers/IDbProvider.cs b/src/DapperDal/Providers/IDbProvider.cs
new file mode 100644
index 000000000..93d6cab0d
--- /dev/null
+++ b/src/DapperDal/Providers/IDbProvider.cs
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Data;
+using System.Data.Common;
+
+namespace DapperDal.Providers
+{
+    /// <summary>
+    /// 鏁版嵁搴撻┍鍔ㄦ彁渚涚▼搴�
+    /// </summary>
+	public interface IDbProvider
+	{
+        /// <summary>
+        /// 鍒涘缓鏁版嵁搴撹繛鎺ワ紝杩斿洖鏁版嵁搴撹繛鎺�
+        /// </summary>
+        /// <returns></returns>
+		IDbConnection CreateConnection();
+	}
+}
diff --git a/src/DapperDal/Providers/OracleProvider.cs b/src/DapperDal/Providers/OracleProvider.cs
new file mode 100644
index 000000000..d287b1336
--- /dev/null
+++ b/src/DapperDal/Providers/OracleProvider.cs
@@ -0,0 +1,41 @@
+锘縰sing System;
+using System.Data;
+using System.Data.Common;
+
+namespace DapperDal.Providers
+{
+    /// <summary>
+    /// Oracle鏁版嵁搴撴彁渚涚▼搴�
+    /// </summary>
+	public class OracleProvider : IDbProvider
+	{
+		private static readonly Lazy<DbProviderFactory> _dbProviderFactory = new Lazy<DbProviderFactory>(CreateDbProviderFactory, true);
+
+		private static DbProviderFactory CreateDbProviderFactory()
+		{
+			return DbProviderFactories.GetFactory(ProviderName);
+		}
+
+        /// <summary>
+        /// 鍒涘缓鏁版嵁搴撹繛鎺ワ紝杩斿洖鏁版嵁搴撹繛鎺�
+        /// </summary>
+        /// <returns></returns>
+		public IDbConnection CreateConnection()
+		{
+			return _dbProviderFactory.Value.CreateConnection();
+		}
+
+        /// <summary>
+        /// 鏁版嵁搴撴彁渚涚▼搴忓悕瀛�
+        /// </summary>
+		public static string ProviderName
+		{ 
+			get
+			{
+                //return "System.Data.OracleClient";//渚濊禆浜巓racle瀹樻柟椹卞姩锛岄渶瑕佸彟澶栧畨瑁卭racle瀹㈡埛绔�
+                //return "Oracle.DataAccess.Client";//Oracle鏁版嵁搴擄紝瀹樻柟闈炴墭绠￠┍鍔紝闄愬埗姣旇緝澶�
+                return "Oracle.ManagedDataAccess.Client";//Oracle瀹樻柟鎵樼椹卞姩,10g浠ヤ笅鐗堟湰涓嶆敮鎸侊紝鏃犱换浣曚緷璧�
+            } 
+		}
+	}
+}
diff --git a/src/DapperDal/Providers/SqlServerProvider.cs b/src/DapperDal/Providers/SqlServerProvider.cs
new file mode 100644
index 000000000..7ea8379b6
--- /dev/null
+++ b/src/DapperDal/Providers/SqlServerProvider.cs
@@ -0,0 +1,43 @@
+锘縰sing System;
+using System.Data;
+using System.Data.Common;
+using System.Text;
+//using MT.Data.Providers.Common;
+//using MT.Data.Providers.Common.Builders;
+
+namespace DapperDal.Providers
+{
+    /// <summary>
+    /// SQL Server
+    /// </summary>
+	public class SqlServerProvider : IDbProvider
+	{
+		private static readonly Lazy<DbProviderFactory> _dbProviderFactory = new Lazy<DbProviderFactory>(CreateDbProviderFactory, true);
+
+		private static DbProviderFactory CreateDbProviderFactory()
+		{
+			return DbProviderFactories.GetFactory(ProviderName);
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+		public IDbConnection CreateConnection()
+		{
+			return _dbProviderFactory.Value.CreateConnection();
+		}
+
+        /// <summary>
+        /// 
+        /// </summary>
+		public static string ProviderName
+		{ 
+			get
+			{
+				return "System.Data.SqlClient";
+			} 
+		}
+
+	}
+}
diff --git a/src/DapperDal/Sql/OracleDialect.cs b/src/DapperDal/Sql/OracleDialect.cs
index f725ef6ae..1f5a00dc0 100644
--- a/src/DapperDal/Sql/OracleDialect.cs
+++ b/src/DapperDal/Sql/OracleDialect.cs
@@ -96,27 +96,53 @@ public override char CloseQuote
         /// <inheritdoc />
         public override string SelectLimit(string sql, int limit)
         {//rownum <= 1
+
             if (sql.Contains("ROWNUM <"))
             {
                 return sql;
             }
 
-            const string where = " WHERE ";
-            const string orderby = " ORDER BY ";
+            sql = string.Format("SELECT * FROM ({0}) WHERE ROWNUM <= 1",sql);
 
-            if (sql.Contains(orderby))
-            {
-                sql = sql.Insert(sql.IndexOf(orderby, StringComparison.OrdinalIgnoreCase), string.Format(" AND ROWNUM <= {0} ", limit));
-            }else
-            {
-                if (sql.Contains(where))
-                {
-                    sql = sql.Insert(sql.Length, string.Format(" AND ROWNUM <= {0} ", limit));
-                }
-            }
+            //const string where = " WHERE ";
+            //const string orderby = " ORDER BY ";
+
+            //if (sql.Contains(orderby))
+            //{
+            //    sql = sql.Insert(sql.IndexOf(orderby, StringComparison.OrdinalIgnoreCase), string.Format(" AND ROWNUM <= {0} ", limit));
+            //}
+            //else
+            //{
+            //    if (sql.Contains(where))
+            //    {
+            //        sql = sql.Insert(sql.Length, string.Format(" AND ROWNUM <= {0} ", limit));
+            //    }
+            //}
 
             return sql;
 
+            //----------------------------鑾峰彇鍗曟潯璁板綍鏈夐棶棰�---------------------------
+            //if (sql.Contains("ROWNUM <"))
+            //{
+            //    return sql;
+            //}
+
+            //const string where = " WHERE ";
+            //const string orderby = " ORDER BY ";
+
+            //if (sql.Contains(orderby))
+            //{
+            //    sql = sql.Insert(sql.IndexOf(orderby, StringComparison.OrdinalIgnoreCase), string.Format(" AND ROWNUM <= {0} ", limit));
+            //}else
+            //{
+            //    if (sql.Contains(where))
+            //    {
+            //        sql = sql.Insert(sql.Length, string.Format(" AND ROWNUM <= {0} ", limit));
+            //    }
+            //}
+
+            //return sql;
+
             //return sql.Insert(sql.Length,
             //    string.Format(" AND ROWNUM <= {0}", limit));
         }
diff --git a/src/DapperDal/packages.config b/src/DapperDal/packages.config
index 8ef666b01..4fdce6ed6 100644
--- a/src/DapperDal/packages.config
+++ b/src/DapperDal/packages.config
@@ -1,5 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Dapper" version="1.50.1" targetFramework="net40" />
+  <package id="Dapper" version="1.50.2" targetFramework="net40" />
   <package id="NLog" version="4.4.12" targetFramework="net40" />
+  <package id="Oracle.ManagedDataAccess" version="12.2.1100" targetFramework="net40" />
 </packages>
\ No newline at end of file