!80 *同步修改OceanBaseForOracle和TDSQLForPGODBC

Merge pull request !80 from 杜子腾/master

Src/Asp.NetCore2/SqlSugar.OceanBaseForOracle/OceanBase/SqlBuilder/OceanBaseForOracleExpressionContext.cs

@@ -75,6 +75,11 @@ namespace SqlSugar.OceanBaseForOracle
     }
     public partial class OceanBaseForOracleMethod : DefaultDbMethod, IDbMethods
     {
+        public override string UNIX_TIMESTAMP(MethodCallExpressionModel model)
+        {
+            var parameterNameA = model.Args[0].MemberName;
+            return $" (CAST({parameterNameA} AS DATE) - DATE '1970-01-01') * 86400 ";
+        }
         public override string IsNullOrEmpty(MethodCallExpressionModel model)
         {
             var parameter = model.Args[0];
@@ -237,11 +242,10 @@ namespace SqlSugar.OceanBaseForOracle
             switch (type)
             {
                 case DateType.Year:
-                    time = 1 * 365;
+                    // 每年 = 12 个月
-                    break;
+                    return $"ADD_MONTHS({parameter.MemberName}, ({parameter2.MemberName}) * 12)";
                 case DateType.Month:
-                    time = 1 * 30;
+                    return $"ADD_MONTHS({parameter.MemberName}, {parameter2.MemberName})";
-                    break;
                 case DateType.Day:
                     break;
                 case DateType.Hour:

Src/Asp.NetCore2/SqlSugar.OceanBaseForOracle/OceanBase/SqlBuilder/OceanBaseForOracleInsertBuilder.cs

@@ -177,6 +177,16 @@ namespace SqlSugar.OceanBaseForOracle
                 {
                     return Convert.ToInt64(value);
                 }
+                else if (value is TimeSpan ts)
+                {
+                    return string.Format(
+                               "INTERVAL '{0} {1:D2}:{2:D2}:{3:D2}.{4:D3}' DAY TO SECOND(3)",
+                               ts.Days,
+                               ts.Hours,
+                               ts.Minutes,
+                               ts.Seconds,
+                               ts.Milliseconds);
+                }
                 else if (type == UtilConstants.ByteArrayType)
                 {
                     ++i;

Src/Asp.NetCore2/SqlSugar.OceanBaseForOracle/OceanBase/SqlBuilder/OceanBaseForOracleUpdateBuilder.cs

@@ -108,6 +108,16 @@ namespace SqlSugar.OceanBaseForOracle
                 {
                     return value.ObjToBool() ? "1" : "0";
                 }
+                else if (value is TimeSpan ts)
+                {
+                    return string.Format(
+                   "INTERVAL '{0} {1:D2}:{2:D2}:{3:D2}.{4:D3}' DAY TO SECOND(3)",
+                   ts.Days,
+                   ts.Hours,
+                   ts.Minutes,
+                   ts.Seconds,
+                   ts.Milliseconds);
+                }
                 else if (type == UtilConstants.DateTimeOffsetType)
                 {
                     var date = UtilMethods.ConvertFromDateTimeOffset((DateTimeOffset)value);

Src/Asp.NetCore2/SqlSugar.TDSQLForPGODBC/TDSQLForPG/SqlBuilder/TDSQLForPGODBCExpressionContext.cs

@@ -133,6 +133,11 @@ namespace SqlSugar.TDSQLForPGODBC
     }
     public class TDSQLForPGODBCMethod : DefaultDbMethod, IDbMethods
     {
+        public override string UNIX_TIMESTAMP(MethodCallExpressionModel model)
+        {
+            var parameterNameA = model.Args[0].MemberName;
+            return $" EXTRACT(EPOCH FROM {parameterNameA})::BIGINT ";
+        }
         public override string CharIndex(MethodCallExpressionModel model)
         {
             return string.Format(" (strpos ({1},{0})-1)", model.Args[0].MemberName, model.Args[1].MemberName);

Src/Asp.NetCore2/SqlSugar.TDSQLForPGODBC/TDSQLForPG/SqlBuilder/TDSQLForPGODBCFastBuilder.cs

@@ -75,7 +75,7 @@ namespace SqlSugar.TDSQLForPGODBC
                 ColumnView result = new ColumnView();
                 result.DbColumnInfo = columns.FirstOrDefault(it => it.DbColumnName.EqualCase(item.ColumnName));
                 result.DataColumn = item;
-                result.EntityColumnInfo=this.entityInfo.Columns.FirstOrDefault(it => it.DbColumnName.EqualCase(item.ColumnName));
+                result.EntityColumnInfo = this.entityInfo.Columns.FirstOrDefault(it => it.DbColumnName.EqualCase(item.ColumnName));
                 var key = result.DbColumnInfo?.DataType?.ToLower();
                 if (result.DbColumnInfo == null)
                 {
@@ -99,6 +99,10 @@ namespace SqlSugar.TDSQLForPGODBC
                     {
                         result.Type = NpgsqlDbType.Array | NpgsqlDbType.Bigint;
                     }
+                    else if (key == "_float8")
+                    {
+                        result.Type = NpgsqlDbType.Array | NpgsqlDbType.Double;
+                    }
                     else
                     {
                         var type = PgSqlType[key.Substring(1)];