增加 Oracle IDbFirst 接口实现;

This commit is contained in:
28810 2019-04-15 14:10:10 +08:00
parent 05a40233ee
commit e5ba4b1974
6 changed files with 463 additions and 360 deletions

View File

@ -0,0 +1,21 @@
using FreeSql.DataAnnotations;
using System;
using Xunit;
namespace FreeSql.Tests.Oracle {
public class OracleDbFirstTest {
[Fact]
public void GetDatabases() {
var t1 = g.oracle.DbFirst.GetDatabases();
}
[Fact]
public void GetTablesByDatabase() {
var t2 = g.oracle.DbFirst.GetTablesByDatabase();
}
}
}

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<Version>0.4.13</Version> <Version>0.4.15</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>YeXiangQin</Authors> <Authors>YeXiangQin</Authors>
<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description> <Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>

View File

@ -148,27 +148,7 @@ from all_tab_columns
where owner={{0}} and table_name={{1}}".FormatOracleSQL(tboldname ?? tbname); where owner={{0}} and table_name={{1}}".FormatOracleSQL(tboldname ?? tbname);
var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
var tbstruct = ds.ToDictionary(a => string.Concat(a[0]), a => { var tbstruct = ds.ToDictionary(a => string.Concat(a[0]), a => {
var sqlType = string.Concat(a[1]).ToUpper(); var sqlType = GetOracleSqlTypeFullName(a);
var data_length = long.Parse(string.Concat(a[2]));
long.TryParse(string.Concat(a[3]), out var data_precision);
long.TryParse(string.Concat(a[4]), out var data_scale);
var char_used = string.Concat(a[5]);
if (Regex.IsMatch(sqlType, @"INTERVAL DAY\(\d+\) TO SECOND\(\d+\)", RegexOptions.IgnoreCase)) {
} else if (Regex.IsMatch(sqlType, @"INTERVAL YEAR\(\d+\) TO MONTH", RegexOptions.IgnoreCase)) {
} else if (sqlType.StartsWith("TIMESTAMP", StringComparison.CurrentCultureIgnoreCase)) {
} else if (sqlType.StartsWith("BLOB")) {
} else if (char_used.ToLower() == "c")
sqlType += sqlType.StartsWith("N") ? $"({data_length / 2})" : $"({data_length / 4} CHAR)";
else if (char_used.ToLower() == "b")
sqlType += $"({data_length} BYTE)";
else if (sqlType.ToLower() == "float")
sqlType += $"({data_precision})";
else if (data_precision > 0 && data_scale > 0)
sqlType += $"({data_precision},{data_scale})";
else if (data_precision > 0)
sqlType += $"({data_precision})";
else
sqlType += $"({data_length})";
return new { return new {
column = string.Concat(a[0]), column = string.Concat(a[0]),
sqlType, sqlType,
@ -294,6 +274,32 @@ where owner={{0}} and table_name={{1}}".FormatOracleSQL(tboldname ?? tbname);
return sb.Length == 0 ? null : sb.Insert(0, "BEGIN \r\n").Insert(0, sbDeclare.ToString()).Append("END;").ToString(); return sb.Length == 0 ? null : sb.Insert(0, "BEGIN \r\n").Insert(0, sbDeclare.ToString()).Append("END;").ToString();
} }
internal static string GetOracleSqlTypeFullName(object[] row) {
var a = row;
var sqlType = string.Concat(a[1]).ToUpper();
var data_length = long.Parse(string.Concat(a[2]));
long.TryParse(string.Concat(a[3]), out var data_precision);
long.TryParse(string.Concat(a[4]), out var data_scale);
var char_used = string.Concat(a[5]);
if (Regex.IsMatch(sqlType, @"INTERVAL DAY\(\d+\) TO SECOND\(\d+\)", RegexOptions.IgnoreCase)) {
} else if (Regex.IsMatch(sqlType, @"INTERVAL YEAR\(\d+\) TO MONTH", RegexOptions.IgnoreCase)) {
} else if (sqlType.StartsWith("TIMESTAMP", StringComparison.CurrentCultureIgnoreCase)) {
} else if (sqlType.StartsWith("BLOB")) {
} else if (char_used.ToLower() == "c")
sqlType += sqlType.StartsWith("N") ? $"({data_length / 2})" : $"({data_length / 4} CHAR)";
else if (char_used.ToLower() == "b")
sqlType += $"({data_length} BYTE)";
else if (sqlType.ToLower() == "float")
sqlType += $"({data_precision})";
else if (data_precision > 0 && data_scale > 0)
sqlType += $"({data_precision},{data_scale})";
else if (data_precision > 0)
sqlType += $"({data_precision})";
else
sqlType += $"({data_length})";
return sqlType;
}
static object syncStructureLock = new object(); static object syncStructureLock = new object();
ConcurrentDictionary<string, bool> dicSyced = new ConcurrentDictionary<string, bool>(); ConcurrentDictionary<string, bool> dicSyced = new ConcurrentDictionary<string, bool>();
public bool SyncStructure<TEntity>() => this.SyncStructure(typeof(TEntity)); public bool SyncStructure<TEntity>() => this.SyncStructure(typeof(TEntity));

View File

@ -1,361 +1,437 @@
//using FreeSql.DatabaseModel; using FreeSql.DatabaseModel;
//using FreeSql.Internal; using FreeSql.Internal;
//using System; using System;
//using System.Collections.Generic; using System.Collections.Generic;
//using System.Linq; using System.Collections.Concurrent;
//using System.Text.RegularExpressions; using System.Linq;
//using Oracle.ManagedDataAccess.Client; using System.Text.RegularExpressions;
//using System.Data; using Oracle.ManagedDataAccess.Client;
using System.Data;
//namespace FreeSql.Oracle { namespace FreeSql.Oracle {
// class OracleDbFirst : IDbFirst { class OracleDbFirst : IDbFirst {
// IFreeSql _orm; IFreeSql _orm;
// protected CommonUtils _commonUtils; protected CommonUtils _commonUtils;
// protected CommonExpression _commonExpression; protected CommonExpression _commonExpression;
// public OracleDbFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression) { public OracleDbFirst(IFreeSql orm, CommonUtils commonUtils, CommonExpression commonExpression) {
// _orm = orm; _orm = orm;
// _commonUtils = commonUtils; _commonUtils = commonUtils;
// _commonExpression = commonExpression; _commonExpression = commonExpression;
// } }
// public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column); public int GetDbType(DbColumnInfo column) => (int)GetSqlDbType(column);
// OracleDbType GetSqlDbType(DbColumnInfo column) { OracleDbType GetSqlDbType(DbColumnInfo column) {
// switch (column.DbTypeText.ToLower()) { var dbfull = column.DbTypeTextFull.ToLower();
// case "bit": return OracleDbType.Boolean; switch (dbfull) {
// case "tinyint": return OracleDbType.TinyInt; case "number(1)": return OracleDbType.Boolean;
// case "smallint": return OracleDbType.SmallInt;
// case "int": return OracleDbType.Int;
// case "bigint": return OracleDbType.BigInt;
// case "numeric":
// case "decimal": return OracleDbType.Decimal;
// case "smallmoney": return OracleDbType.SmallMoney;
// case "money": return OracleDbType.Money;
// case "float": return OracleDbType.Float;
// case "real": return OracleDbType.Real;
// case "date": return OracleDbType.Date;
// case "datetime":
// case "datetime2": return OracleDbType.DateTime;
// case "datetimeoffset": return OracleDbType.DateTimeOffset;
// case "smalldatetime": return OracleDbType.SmallDateTime;
// case "time": return OracleDbType.Time;
// case "char": return OracleDbType.Char;
// case "varchar": return OracleDbType.VarChar;
// case "text": return OracleDbType.Text;
// case "nchar": return OracleDbType.NChar;
// case "nvarchar": return OracleDbType.NVarChar;
// case "ntext": return OracleDbType.NText;
// case "binary": return OracleDbType.Binary;
// case "varbinary": return OracleDbType.VarBinary;
// case "image": return OracleDbType.Image;
// case "timestamp": return OracleDbType.Timestamp;
// case "uniqueidentifier": return OracleDbType.UniqueIdentifier;
// default: return OracleDbType.Variant;
// }
// }
// static readonly Dictionary<int, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)> _dicDbToCs = new Dictionary<int, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)>() { case "number(4)": return OracleDbType.Decimal;
// { (int)OracleDbType.Boolean, ("(bool?)", "{0} == \"1\"", "{0} == true ? \"1\" : \"0\"", "bool?", typeof(bool), typeof(bool?), "{0}.Value", "GetBoolean") }, case "number(6)": return OracleDbType.Int16;
case "number(11)": return OracleDbType.Int32;
case "number(21)": return OracleDbType.Int64;
// { (int)OracleDbType.TinyInt, ("(byte?)", "sbyte.Parse({0})", "{0}.ToString()", "sbyte?", typeof(sbyte), typeof(sbyte?), "{0}.Value", "GetByte") }, case "number(3)": return OracleDbType.Byte;
// { (int)OracleDbType.SmallInt, ("(short?)", "short.Parse({0})", "{0}.ToString()", "short?", typeof(short), typeof(short?), "{0}.Value", "GetInt16") }, case "number(5)": return OracleDbType.Decimal;
// { (int)OracleDbType.Int, ("(int?)", "int.Parse({0})", "{0}.ToString()", "int?", typeof(int), typeof(int?), "{0}.Value", "GetInt32") }, case "number(10)": return OracleDbType.Decimal;
// { (int)OracleDbType.BigInt, ("(long?)", "long.Parse({0})", "{0}.ToString()", "long?", typeof(long), typeof(long?), "{0}.Value", "GetInt64") }, case "number(20)": return OracleDbType.Decimal;
// { (int)OracleDbType.SmallMoney, ("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") }, case "float(126)": return OracleDbType.Double;
// { (int)OracleDbType.Money, ("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") }, case "float(63)": return OracleDbType.Single;
// { (int)OracleDbType.Decimal, ("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") }, case "number(10,2)": return OracleDbType.Decimal;
// { (int)OracleDbType.Float, ("(double?)", "double.Parse({0})", "{0}.ToString()", "double?", typeof(double), typeof(double?), "{0}.Value", "GetDouble") },
// { (int)OracleDbType.Real, ("(float?)", "float.Parse({0})", "{0}.ToString()", "float?", typeof(float), typeof(float?), "{0}.Value", "GetFloat") },
// { (int)OracleDbType.Time, ("(TimeSpan?)", "TimeSpan.Parse(double.Parse({0}))", "{0}.Ticks.ToString()", "TimeSpan?", typeof(TimeSpan), typeof(TimeSpan?), "{0}.Value", "GetValue") }, case "interval day(2) to second(6)": return OracleDbType.IntervalDS;
// { (int)OracleDbType.Date, ("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") }, case "timestamp(6)": return OracleDbType.TimeStamp;
// { (int)OracleDbType.DateTime, ("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") }, case "timestamp(6) with local time zone": return OracleDbType.TimeStampLTZ;
// { (int)OracleDbType.DateTime2, ("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
// { (int)OracleDbType.SmallDateTime, ("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetDateTime") },
// { (int)OracleDbType.DateTimeOffset, ("(DateTimeOffset?)", "new DateTimeOffset(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTimeOffset), typeof(DateTimeOffset?), "{0}.Value", "GetDateTimeOffset") },
// { (int)OracleDbType.Binary, ("(byte[])", "Convert.FromBase64String({0})", "Convert.ToBase64String({0})", "byte[]", typeof(byte[]), typeof(byte[]), "{0}", "GetValue") }, case "blob": return OracleDbType.Blob;
// { (int)OracleDbType.VarBinary, ("(byte[])", "Convert.FromBase64String({0})", "Convert.ToBase64String({0})", "byte[]", typeof(byte[]), typeof(byte[]), "{0}", "GetValue") }, case "nvarchar2(255)": return OracleDbType.NVarchar2;
// { (int)OracleDbType.Image, ("(byte[])", "Convert.FromBase64String({0})", "Convert.ToBase64String({0})", "byte[]", typeof(byte[]), typeof(byte[]), "{0}", "GetValue") },
// { (int)OracleDbType.Timestamp, ("(byte[])", "Convert.FromBase64String({0})", "Convert.ToBase64String({0})", "byte[]", typeof(byte[]), typeof(byte[]), "{0}", "GetValue") },
// { (int)OracleDbType.Char, ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") }, case "char(36 char)": return OracleDbType.Char;
// { (int)OracleDbType.VarChar, ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") }, }
// { (int)OracleDbType.Text, ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") }, switch (column.DbTypeText.ToLower()) {
// { (int)OracleDbType.NChar, ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") }, case "number":
// { (int)OracleDbType.NVarChar, ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") }, _dicDbToCs.TryAdd(dbfull, _dicDbToCs["number(10,2)"]);
// { (int)OracleDbType.NText, ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") }, return OracleDbType.Decimal;
case "float":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["float(126)"]);
return OracleDbType.Double;
case "interval day to second":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["interval day(2) to second(6)"]);
return OracleDbType.IntervalDS;
case "timestamp":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["timestamp(6)"]);
return OracleDbType.TimeStamp;
case "timestamp with local time zone":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["timestamp(6) with local time zone"]);
return OracleDbType.TimeStampLTZ;
case "blob":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["blob"]);
return OracleDbType.Blob;
case "nvarchar2":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
return OracleDbType.NVarchar2;
case "varchar2":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
return OracleDbType.Varchar2;
case "char":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["char(36 char)"]);
return OracleDbType.Char;
case "clob":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
return OracleDbType.Clob;
case "nclob":
_dicDbToCs.TryAdd(dbfull, _dicDbToCs["nvarchar2(255)"]);
return OracleDbType.NClob;
}
throw new NotImplementedException($"未实现 {column.DbTypeTextFull} 类型映射");
}
// { (int)OracleDbType.UniqueIdentifier, ("(Guid?)", "Guid.Parse({0})", "{0}.ToString()", "Guid?", typeof(Guid), typeof(Guid?), "{0}.Value", "GetGuid") }, static ConcurrentDictionary<string, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)> _dicDbToCs = new ConcurrentDictionary<string, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)>();
// }; static OracleDbFirst() {
var defaultDbToCs = new Dictionary<string, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)>() {
{ "number(1)", ("(bool?)", "{0} == \"1\"", "{0} == true ? \"1\" : \"0\"", "bool?", typeof(bool), typeof(bool?), "{0}.Value", "GetBoolean") },
// public string GetCsConvert(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? (column.IsNullable ? trydc.csConvert : trydc.csConvert.Replace("?", "")) : null; { "number(4)", ("(sbyte?)", "sbyte.Parse({0})", "{0}.ToString()", "sbyte?", typeof(sbyte), typeof(sbyte?), "{0}.Value", "GetInt16") },
// public string GetCsParse(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csParse : null; { "number(6)", ("(short?)", "short.Parse({0})", "{0}.ToString()", "short?", typeof(short), typeof(short?), "{0}.Value", "GetInt16") },
// public string GetCsStringify(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csStringify : null; { "number(11)", ("(int?)", "int.Parse({0})", "{0}.ToString()", "int?", typeof(int), typeof(int?), "{0}.Value", "GetInt32") },
// public string GetCsType(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? (column.IsNullable ? trydc.csType : trydc.csType.Replace("?", "")) : null; { "number(21)", ("(long?)", "long.Parse({0})", "{0}.ToString()", "long?", typeof(long), typeof(long?), "{0}.Value", "GetInt64") },
// public Type GetCsTypeInfo(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeInfo : null;
// public string GetCsTypeValue(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.csTypeValue : null;
// public string GetDataReaderMethod(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbType, out var trydc) ? trydc.dataReaderMethod : null;
// public List<string> GetDatabases() { { "number(3)", ("(byte?)", "byte.Parse({0})", "{0}.ToString()", "byte?", typeof(byte), typeof(byte?), "{0}.Value", "GetByte") },
// var sql = @" select username from all_users"; { "number(5)", ("(ushort?)", "ushort.Parse({0})", "{0}.ToString()", "ushort?", typeof(ushort), typeof(ushort?), "{0}.Value", "GetInt32") },
// var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); { "number(10)", ("(uint?)", "uint.Parse({0})", "{0}.ToString()", "uint?", typeof(uint), typeof(uint?), "{0}.Value", "GetInt64") },
// return ds.Select(a => a.FirstOrDefault()?.ToString()).ToList(); { "number(20)", ("(ulong?)", "ulong.Parse({0})", "{0}.ToString()", "ulong?", typeof(ulong), typeof(ulong?), "{0}.Value", "GetDecimal") },
// }
// public List<DbTableInfo> GetTablesByDatabase(params string[] database2) { { "float(126)", ("(double?)", "double.Parse({0})", "{0}.ToString()", "double?", typeof(double), typeof(double?), "{0}.Value", "GetDouble") },
// var loc1 = new List<DbTableInfo>(); { "float(63)", ("(float?)", "float.Parse({0})", "{0}.ToString()", "float?", typeof(float), typeof(float?), "{0}.Value", "GetFloat") },
// var loc2 = new Dictionary<string, DbTableInfo>(); { "number(10,2)", ("(decimal?)", "decimal.Parse({0})", "{0}.ToString()", "decimal?", typeof(decimal), typeof(decimal?), "{0}.Value", "GetDecimal") },
// var loc3 = new Dictionary<string, Dictionary<string, DbColumnInfo>>();
// var database = database2?.ToArray();
// if (database == null || database.Any() == false) { { "interval day(2) to second(6)", ("(TimeSpan?)", "TimeSpan.Parse(double.Parse({0}))", "{0}.Ticks.ToString()", "TimeSpan?", typeof(TimeSpan), typeof(TimeSpan?), "{0}.Value", "GetValue") },
// using (var conn = _orm.Ado.MasterPool.Get()) { { "timestamp(6)", ("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetValue") },
// if (string.IsNullOrEmpty(conn.Value.Database)) return loc1; { "timestamp(6) with local time zone", ("(DateTime?)", "new DateTime(long.Parse({0}))", "{0}.Ticks.ToString()", "DateTime?", typeof(DateTime), typeof(DateTime?), "{0}.Value", "GetValue") },
// database = new[] { conn.Value.Database };
// }
// }
// var databaseIn = string.Join(",", database.Select(a => "{0}".FormatOracleSQL(a)));
// var sql = string.Format(@"
//select
//'TABLE:' || a.owner || '.' || a.table_name,
//a.owner,
//a.table_name,
//b.comments,
//'TABLE'
//from all_tables a
//left join all_tab_comments b on b.owner = a.owner and b.table_name = a.table_name and b.table_type = 'TABLE'
//where a.owner in ({0})", databaseIn);
// var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
// if (ds == null) return loc1;
// var loc6 = new List<string>(); { "blob", ("(byte[])", "Convert.FromBase64String({0})", "Convert.ToBase64String({0})", "byte[]", typeof(byte[]), typeof(byte[]), "{0}", "GetValue") },
// var loc66 = new List<string>();
// foreach (var row in ds) {
// var table_id = string.Concat(row[0]);
// var schema = string.Concat(row[1]);
// var table = string.Concat(row[2]);
// var comment = string.Concat(row[3]);
// var type = string.Concat(row[4]) == "VIEW" ? DbTableType.VIEW : DbTableType.TABLE;
// if (database.Length == 1) {
// table_id = table_id.Substring(table_id.IndexOf('.') + 1);
// schema = "";
// }
// loc2.Add(table_id, new DbTableInfo { Id = table_id, Schema = schema, Name = table, Comment = comment, Type = type });
// loc3.Add(table_id, new Dictionary<string, DbColumnInfo>());
// switch (type) {
// case DbTableType.TABLE:
// case DbTableType.VIEW:
// loc6.Add(table.Replace("'", "''"));
// break;
// case DbTableType.StoreProcedure:
// loc66.Add(table.Replace("'", "''"));
// break;
// }
// }
// if (loc6.Count == 0) return loc1;
// var loc8 = "'" + string.Join("','", loc6.ToArray()) + "'";
// var loc88 = "'" + string.Join("','", loc66.ToArray()) + "'";
// sql = string.Format(@" { "nvarchar2(255)", ("", "{0}.Replace(StringifySplit, \"|\")", "{0}.Replace(\"|\", StringifySplit)", "string", typeof(string), typeof(string), "{0}", "GetString") },
//select { "char(36 char)", ("(Guid?)", "Guid.Parse({0})", "{0}.ToString()", "Guid?", typeof(Guid), typeof(Guid?), "{0}.Value", "GetGuid") },
//concat(a.table_schema, '.', a.table_name), };
//a.column_name, foreach (var kv in defaultDbToCs)
//a.data_type, _dicDbToCs.TryAdd(kv.Key, kv.Value);
//ifnull(a.character_maximum_length, 0) 'len', }
//a.column_type,
//case when a.is_nullable = 'YES' then 1 else 0 end 'is_nullable',
//case when locate('auto_increment', a.extra) > 0 then 1 else 0 end 'is_identity',
//a.column_comment 'comment'
//from information_schema.columns a
//where a.table_schema in ({1}) and a.table_name in ({0})
//", loc8, databaseIn);
// ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
// if (ds == null) return loc1;
// foreach (var row in ds) { public string GetCsConvert(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? (column.IsNullable ? trydc.csConvert : trydc.csConvert.Replace("?", "")) : null;
// string table_id = string.Concat(row[0]); public string GetCsParse(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? trydc.csParse : null;
// string column = string.Concat(row[1]); public string GetCsStringify(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? trydc.csStringify : null;
// string type = string.Concat(row[2]); public string GetCsType(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? (column.IsNullable ? trydc.csType : trydc.csType.Replace("?", "")) : null;
// //long max_length = long.Parse(string.Concat(row[3])); public Type GetCsTypeInfo(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? trydc.csTypeInfo : null;
// string sqlType = string.Concat(row[4]); public string GetCsTypeValue(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? trydc.csTypeValue : null;
// var m_len = Regex.Match(sqlType, @"\w+\((\d+)"); public string GetDataReaderMethod(DbColumnInfo column) => _dicDbToCs.TryGetValue(column.DbTypeTextFull, out var trydc) ? trydc.dataReaderMethod : null;
// int max_length = m_len.Success ? int.Parse(m_len.Groups[1].Value) : -1;
// bool is_nullable = string.Concat(row[5]) == "1";
// bool is_identity = string.Concat(row[6]) == "1";
// string comment = string.Concat(row[7]);
// if (max_length == 0) max_length = -1;
// if (database.Length == 1) {
// table_id = table_id.Substring(table_id.IndexOf('.') + 1);
// }
// loc3[table_id].Add(column, new DbColumnInfo {
// Name = column,
// MaxLength = max_length,
// IsIdentity = is_identity,
// IsNullable = is_nullable,
// IsPrimary = false,
// DbTypeText = type,
// DbTypeTextFull = sqlType,
// Table = loc2[table_id],
// Coment = comment
// });
// loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
// loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);
// }
// sql = string.Format(@" public List<string> GetDatabases() {
//select var sql = @" select username from all_users";
//concat(a.constraint_schema, '.', a.table_name) 'table_id', var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
//a.column_name, return ds.Select(a => a.FirstOrDefault()?.ToString()).ToList();
//concat(a.constraint_schema, '/', a.table_name, '/', a.constraint_name) 'index_id', }
//1 'IsUnique',
//case when constraint_name = 'PRIMARY' then 1 else 0 end 'IsPrimaryKey',
//0 'IsClustered',
//0 'IsDesc'
//from information_schema.key_column_usage a
//where a.constraint_schema in ({1}) and a.table_name in ({0}) and isnull(position_in_unique_constraint)
//", loc8, databaseIn);
// ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
// if (ds == null) return loc1;
// var indexColumns = new Dictionary<string, Dictionary<string, List<DbColumnInfo>>>(); public List<DbTableInfo> GetTablesByDatabase(params string[] database2) {
// var uniqueColumns = new Dictionary<string, Dictionary<string, List<DbColumnInfo>>>(); var loc1 = new List<DbTableInfo>();
// foreach (var row in ds) { var loc2 = new Dictionary<string, DbTableInfo>();
// string table_id = string.Concat(row[0]); var loc3 = new Dictionary<string, Dictionary<string, DbColumnInfo>>();
// string column = string.Concat(row[1]); var database = database2?.ToArray();
// string index_id = string.Concat(row[2]);
// bool is_unique = string.Concat(row[3]) == "1";
// bool is_primary_key = string.Concat(row[4]) == "1";
// bool is_clustered = string.Concat(row[5]) == "1";
// int is_desc = int.Parse(string.Concat(row[6]));
// if (database.Length == 1) {
// table_id = table_id.Substring(table_id.IndexOf('.') + 1);
// }
// if (loc3.ContainsKey(table_id) == false || loc3[table_id].ContainsKey(column) == false) continue;
// var loc9 = loc3[table_id][column];
// if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
// Dictionary<string, List<DbColumnInfo>> loc10 = null; if (database == null || database.Any() == false) {
// List<DbColumnInfo> loc11 = null; var userUsers = _orm.Ado.ExecuteScalar("select username from user_users")?.ToString();
// if (!indexColumns.TryGetValue(table_id, out loc10)) if (string.IsNullOrEmpty(userUsers)) return loc1;
// indexColumns.Add(table_id, loc10 = new Dictionary<string, List<DbColumnInfo>>()); database = new[] { userUsers };
// if (!loc10.TryGetValue(index_id, out loc11)) }
// loc10.Add(index_id, loc11 = new List<DbColumnInfo>()); var databaseIn = string.Join(",", database.Select(a => "{0}".FormatOracleSQL(a)));
// loc11.Add(loc9); var sql = string.Format(@"
// if (is_unique) { select
// if (!uniqueColumns.TryGetValue(table_id, out loc10)) a.owner || '.' || a.table_name,
// uniqueColumns.Add(table_id, loc10 = new Dictionary<string, List<DbColumnInfo>>()); a.owner,
// if (!loc10.TryGetValue(index_id, out loc11)) a.table_name,
// loc10.Add(index_id, loc11 = new List<DbColumnInfo>()); b.comments,
// loc11.Add(loc9); 'TABLE'
// } from all_tables a
// } left join all_tab_comments b on b.owner = a.owner and b.table_name = a.table_name and b.table_type = 'TABLE'
// foreach (string table_id in indexColumns.Keys) { where a.owner in ({0})", databaseIn);
// foreach (var columns in indexColumns[table_id].Values) var ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
// loc2[table_id].Indexes.Add(columns); if (ds == null) return loc1;
// }
// foreach (string table_id in uniqueColumns.Keys) {
// foreach (var columns in uniqueColumns[table_id].Values) {
// columns.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
// loc2[table_id].Uniques.Add(columns);
// }
// }
// sql = string.Format(@" var loc6 = new List<string>();
//select var loc66 = new List<string>();
//concat(a.constraint_schema, '.', a.table_name) 'table_id', foreach (var row in ds) {
//a.column_name, var table_id = string.Concat(row[0]);
//concat(a.constraint_schema, '/', a.constraint_name) 'FKId', var schema = string.Concat(row[1]);
//concat(a.referenced_table_schema, '.', a.referenced_table_name) 'ref_table_id', var table = string.Concat(row[2]);
//1 'IsForeignKey', var comment = string.Concat(row[3]);
//a.referenced_column_name 'ref_column' var type = string.Concat(row[4]) == "VIEW" ? DbTableType.VIEW : DbTableType.TABLE;
//from information_schema.key_column_usage a if (database.Length == 1) {
//where a.constraint_schema in ({1}) and a.table_name in ({0}) and not isnull(position_in_unique_constraint) table_id = table_id.Substring(table_id.IndexOf('.') + 1);
//", loc8, databaseIn); schema = "";
// ds = _orm.Ado.ExecuteArray(CommandType.Text, sql); }
// if (ds == null) return loc1; loc2.Add(table_id, new DbTableInfo { Id = table_id, Schema = schema, Name = table, Comment = comment, Type = type });
loc3.Add(table_id, new Dictionary<string, DbColumnInfo>());
switch (type) {
case DbTableType.TABLE:
case DbTableType.VIEW:
loc6.Add(table.Replace("'", "''"));
break;
case DbTableType.StoreProcedure:
loc66.Add(table.Replace("'", "''"));
break;
}
}
if (loc6.Count == 0) return loc1;
var loc8 = "'" + string.Join("','", loc6.ToArray()) + "'";
var loc88 = "'" + string.Join("','", loc66.ToArray()) + "'";
// var fkColumns = new Dictionary<string, Dictionary<string, DbForeignInfo>>(); sql = string.Format(@"
// foreach (var row in ds) { select
// string table_id = string.Concat(row[0]); a.owner || '.' || a.table_name,
// string column = string.Concat(row[1]); a.column_name,
// string fk_id = string.Concat(row[2]); a.data_type,
// string ref_table_id = string.Concat(row[3]); a.data_length,
// bool is_foreign_key = string.Concat(row[4]) == "1"; a.data_precision,
// string referenced_column = string.Concat(row[5]); a.data_scale,
// if (database.Length == 1) { a.char_used,
// table_id = table_id.Substring(table_id.IndexOf('.') + 1); case when nullable = 'Y' then 1 else 0 end,
// ref_table_id = ref_table_id.Substring(ref_table_id.IndexOf('.') + 1); nvl((select 1 from user_sequences where upper(sequence_name)=upper(a.table_name||'_seq_'||a.column_name)), 0),
// } b.comments
// if (loc3.ContainsKey(table_id) == false || loc3[table_id].ContainsKey(column) == false) continue; from all_tab_cols a
// var loc9 = loc3[table_id][column]; left join all_col_comments b on b.owner = a.owner and b.table_name = a.table_name and b.column_name = a.column_name
// if (loc2.ContainsKey(ref_table_id) == false) continue; where a.owner in ({1}) and a.table_name in ({0})
// var loc10 = loc2[ref_table_id]; ", loc8, databaseIn);
// var loc11 = loc3[ref_table_id][referenced_column]; ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
// Dictionary<string, DbForeignInfo> loc12 = null; var ds2 = new List<object[]>();
// DbForeignInfo loc13 = null; foreach (var row in ds) {
// if (!fkColumns.TryGetValue(table_id, out loc12)) var ds2item = new object[8];
// fkColumns.Add(table_id, loc12 = new Dictionary<string, DbForeignInfo>()); ds2item[0] = row[0];
// if (!loc12.TryGetValue(fk_id, out loc13)) ds2item[1] = row[1];
// loc12.Add(fk_id, loc13 = new DbForeignInfo { Table = loc2[table_id], ReferencedTable = loc10 }); ds2item[2] = Regex.Replace(string.Concat(row[2]), @"\(\d+\)", "");
// loc13.Columns.Add(loc9); ds2item[4] = OracleCodeFirst.GetOracleSqlTypeFullName(new object[] { row[1], row[2], row[3], row[4], row[5], row[6] });
// loc13.ReferencedColumns.Add(loc11); ds2item[5] = string.Concat(row[7]) == "1";
// } ds2item[6] = string.Concat(row[8]) == "1";
// foreach (var table_id in fkColumns.Keys) ds2item[7] = string.Concat(row[9]);
// foreach (var fk in fkColumns[table_id].Values) ds2.Add(ds2item);
// loc2[table_id].Foreigns.Add(fk); }
foreach (var row in ds2) {
string table_id = string.Concat(row[0]);
string column = string.Concat(row[1]);
string type = string.Concat(row[2]);
//long max_length = long.Parse(string.Concat(row[3]));
string sqlType = string.Concat(row[4]);
var m_len = Regex.Match(sqlType, @"\w+\((\d+)");
int max_length = m_len.Success ? int.Parse(m_len.Groups[1].Value) : -1;
bool is_nullable = string.Concat(row[5]) == "1";
bool is_identity = string.Concat(row[6]) == "1";
string comment = string.Concat(row[7]);
if (max_length == 0) max_length = -1;
if (database.Length == 1) {
table_id = table_id.Substring(table_id.IndexOf('.') + 1);
}
loc3[table_id].Add(column, new DbColumnInfo {
Name = column,
MaxLength = max_length,
IsIdentity = is_identity,
IsNullable = is_nullable,
IsPrimary = false,
DbTypeText = type,
DbTypeTextFull = sqlType,
Table = loc2[table_id],
Coment = comment
});
loc3[table_id][column].DbType = this.GetDbType(loc3[table_id][column]);
loc3[table_id][column].CsType = this.GetCsTypeInfo(loc3[table_id][column]);
}
// foreach (var table_id in loc3.Keys) { sql = string.Format(@"
// foreach (var loc5 in loc3[table_id].Values) { select
// loc2[table_id].Columns.Add(loc5); a.owner || '.' || a.table_name,
// if (loc5.IsIdentity) loc2[table_id].Identitys.Add(loc5); c.column_name,
// if (loc5.IsPrimary) loc2[table_id].Primarys.Add(loc5); a.owner || '/' || a.table_name || '/' || c.constraint_name,
// } case when a.constraint_type = 'U' then 1 else 0 end,
// } case when a.constraint_type = 'P' then 1 else 0 end,
// foreach (var loc4 in loc2.Values) { 0,
// if (loc4.Primarys.Count == 0 && loc4.Uniques.Count > 0) { 0
// foreach (var loc5 in loc4.Uniques[0]) { from
// loc5.IsPrimary = true; all_constraints a,
// loc4.Primarys.Add(loc5); all_cons_columns c
// } where
// } a.constraint_name = c.constraint_name
// loc4.Primarys.Sort((c1, c2) => c1.Name.CompareTo(c2.Name)); and a.owner = c.owner
// loc4.Columns.Sort((c1, c2) => { and a.table_name = c.table_name
// int compare = c2.IsPrimary.CompareTo(c1.IsPrimary); and a.constraint_type in ('P', 'U')
// if (compare == 0) { and a.owner in ({1}) and a.table_name in ({0})
// bool b1 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c1.Name) != null) != null; ", loc8, databaseIn);
// bool b2 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c2.Name) != null) != null; ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
// compare = b2.CompareTo(b1); if (ds == null) return loc1;
// }
// if (compare == 0) compare = c1.Name.CompareTo(c2.Name);
// return compare;
// });
// loc1.Add(loc4);
// }
// loc1.Sort((t1, t2) => {
// var ret = t1.Schema.CompareTo(t2.Schema);
// if (ret == 0) ret = t1.Name.CompareTo(t2.Name);
// return ret;
// });
// foreach (var loc4 in loc1) {
// var dicUniques = new Dictionary<string, List<DbColumnInfo>>();
// if (loc4.Primarys.Count > 0) dicUniques.Add(string.Join(",", loc4.Primarys.Select(a => a.Name)), loc4.Primarys);
// foreach (var loc5 in loc4.Uniques) {
// var dickey = string.Join(",", loc5.Select(a => a.Name));
// if (dicUniques.ContainsKey(dickey)) continue;
// dicUniques.Add(dickey, loc5);
// }
// loc4.Uniques = dicUniques.Values.ToList();
// }
// loc2.Clear(); var indexColumns = new Dictionary<string, Dictionary<string, List<DbColumnInfo>>>();
// loc3.Clear(); var uniqueColumns = new Dictionary<string, Dictionary<string, List<DbColumnInfo>>>();
// return loc1; foreach (var row in ds) {
// } string table_id = string.Concat(row[0]);
string column = string.Concat(row[1]);
string index_id = string.Concat(row[2]);
bool is_unique = string.Concat(row[3]) == "1";
bool is_primary_key = string.Concat(row[4]) == "1";
bool is_clustered = string.Concat(row[5]) == "1";
int is_desc = int.Parse(string.Concat(row[6]));
if (database.Length == 1) {
table_id = table_id.Substring(table_id.IndexOf('.') + 1);
}
if (loc3.ContainsKey(table_id) == false || loc3[table_id].ContainsKey(column) == false) continue;
var loc9 = loc3[table_id][column];
if (loc9.IsPrimary == false && is_primary_key) loc9.IsPrimary = is_primary_key;
// public List<DbEnumInfo> GetEnumsByDatabase(params string[] database) { Dictionary<string, List<DbColumnInfo>> loc10 = null;
// return new List<DbEnumInfo>(); List<DbColumnInfo> loc11 = null;
// } if (!indexColumns.TryGetValue(table_id, out loc10))
// } indexColumns.Add(table_id, loc10 = new Dictionary<string, List<DbColumnInfo>>());
//} if (!loc10.TryGetValue(index_id, out loc11))
loc10.Add(index_id, loc11 = new List<DbColumnInfo>());
loc11.Add(loc9);
if (is_unique) {
if (!uniqueColumns.TryGetValue(table_id, out loc10))
uniqueColumns.Add(table_id, loc10 = new Dictionary<string, List<DbColumnInfo>>());
if (!loc10.TryGetValue(index_id, out loc11))
loc10.Add(index_id, loc11 = new List<DbColumnInfo>());
loc11.Add(loc9);
}
}
foreach (string table_id in indexColumns.Keys) {
foreach (var columns in indexColumns[table_id].Values)
loc2[table_id].Indexes.Add(columns);
}
foreach (string table_id in uniqueColumns.Keys) {
foreach (var columns in uniqueColumns[table_id].Values) {
columns.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
loc2[table_id].Uniques.Add(columns);
}
}
sql = string.Format(@"
select
a.owner || '.' || a.table_name,
c.column_name,
a.owner || '/' || a.table_name || '/' || c.constraint_name,
b.owner || '.' || b.table_name,
1,
d.column_name
-- a.owner ,
-- a.table_name ,
-- c.column_name ,
-- b.owner ,
-- b.table_name ,
-- d.column_name ,
-- c.constraint_name ,
-- d.constraint_name
from
all_constraints a,
all_constraints b,
all_cons_columns c, --
all_cons_columns d --
where
a.r_constraint_name = b.constraint_name   
and a.constraint_type = 'R'   
and b.constraint_type = 'P'   
and a.r_owner = b.owner   
and a.constraint_name = c.constraint_name   
and b.constraint_name = d.constraint_name   
and a.owner = c.owner   
and a.table_name = c.table_name   
and b.owner = d.owner   
and b.table_name = d.table_name
and a.owner in ({1}) and a.table_name in ({0})
", loc8, databaseIn);
ds = _orm.Ado.ExecuteArray(CommandType.Text, sql);
if (ds == null) return loc1;
var fkColumns = new Dictionary<string, Dictionary<string, DbForeignInfo>>();
foreach (var row in ds) {
string table_id = string.Concat(row[0]);
string column = string.Concat(row[1]);
string fk_id = string.Concat(row[2]);
string ref_table_id = string.Concat(row[3]);
bool is_foreign_key = string.Concat(row[4]) == "1";
string referenced_column = string.Concat(row[5]);
if (database.Length == 1) {
table_id = table_id.Substring(table_id.IndexOf('.') + 1);
ref_table_id = ref_table_id.Substring(ref_table_id.IndexOf('.') + 1);
}
if (loc3.ContainsKey(table_id) == false || loc3[table_id].ContainsKey(column) == false) continue;
var loc9 = loc3[table_id][column];
if (loc2.ContainsKey(ref_table_id) == false) continue;
var loc10 = loc2[ref_table_id];
var loc11 = loc3[ref_table_id][referenced_column];
Dictionary<string, DbForeignInfo> loc12 = null;
DbForeignInfo loc13 = null;
if (!fkColumns.TryGetValue(table_id, out loc12))
fkColumns.Add(table_id, loc12 = new Dictionary<string, DbForeignInfo>());
if (!loc12.TryGetValue(fk_id, out loc13))
loc12.Add(fk_id, loc13 = new DbForeignInfo { Table = loc2[table_id], ReferencedTable = loc10 });
loc13.Columns.Add(loc9);
loc13.ReferencedColumns.Add(loc11);
}
foreach (var table_id in fkColumns.Keys)
foreach (var fk in fkColumns[table_id].Values)
loc2[table_id].Foreigns.Add(fk);
foreach (var table_id in loc3.Keys) {
foreach (var loc5 in loc3[table_id].Values) {
loc2[table_id].Columns.Add(loc5);
if (loc5.IsIdentity) loc2[table_id].Identitys.Add(loc5);
if (loc5.IsPrimary) loc2[table_id].Primarys.Add(loc5);
}
}
foreach (var loc4 in loc2.Values) {
if (loc4.Primarys.Count == 0 && loc4.Uniques.Count > 0) {
foreach (var loc5 in loc4.Uniques[0]) {
loc5.IsPrimary = true;
loc4.Primarys.Add(loc5);
}
}
loc4.Primarys.Sort((c1, c2) => c1.Name.CompareTo(c2.Name));
loc4.Columns.Sort((c1, c2) => {
int compare = c2.IsPrimary.CompareTo(c1.IsPrimary);
if (compare == 0) {
bool b1 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c1.Name) != null) != null;
bool b2 = loc4.Foreigns.Find(fk => fk.Columns.Find(c3 => c3.Name == c2.Name) != null) != null;
compare = b2.CompareTo(b1);
}
if (compare == 0) compare = c1.Name.CompareTo(c2.Name);
return compare;
});
loc1.Add(loc4);
}
loc1.Sort((t1, t2) => {
var ret = t1.Schema.CompareTo(t2.Schema);
if (ret == 0) ret = t1.Name.CompareTo(t2.Name);
return ret;
});
foreach (var loc4 in loc1) {
var dicUniques = new Dictionary<string, List<DbColumnInfo>>();
if (loc4.Primarys.Count > 0) dicUniques.Add(string.Join(",", loc4.Primarys.Select(a => a.Name)), loc4.Primarys);
foreach (var loc5 in loc4.Uniques) {
var dickey = string.Join(",", loc5.Select(a => a.Name));
if (dicUniques.ContainsKey(dickey)) continue;
dicUniques.Add(dickey, loc5);
}
loc4.Uniques = dicUniques.Values.ToList();
}
loc2.Clear();
loc3.Clear();
return loc1;
}
public List<DbEnumInfo> GetEnumsByDatabase(params string[] database) {
return new List<DbEnumInfo>();
}
}
}

View File

@ -38,7 +38,7 @@ namespace FreeSql.Oracle {
this.Ado = new OracleAdo(this.InternalCommonUtils, this.Cache, log, masterConnectionString, slaveConnectionString); this.Ado = new OracleAdo(this.InternalCommonUtils, this.Cache, log, masterConnectionString, slaveConnectionString);
this.Aop = new AopProvider(); this.Aop = new AopProvider();
//this.DbFirst = new OracleDbFirst(this, this.InternalCommonUtils, this.InternalCommonExpression); this.DbFirst = new OracleDbFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
this.CodeFirst = new OracleCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression); this.CodeFirst = new OracleCodeFirst(this, this.InternalCommonUtils, this.InternalCommonExpression);
} }

View File

@ -55,7 +55,7 @@ namespace FreeSql.SqlServer {
static readonly Dictionary<int, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)> _dicDbToCs = new Dictionary<int, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)>() { static readonly Dictionary<int, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)> _dicDbToCs = new Dictionary<int, (string csConvert, string csParse, string csStringify, string csType, Type csTypeInfo, Type csNullableTypeInfo, string csTypeValue, string dataReaderMethod)>() {
{ (int)SqlDbType.Bit, ("(bool?)", "{0} == \"1\"", "{0} == true ? \"1\" : \"0\"", "bool?", typeof(bool), typeof(bool?), "{0}.Value", "GetBoolean") }, { (int)SqlDbType.Bit, ("(bool?)", "{0} == \"1\"", "{0} == true ? \"1\" : \"0\"", "bool?", typeof(bool), typeof(bool?), "{0}.Value", "GetBoolean") },
{ (int)SqlDbType.TinyInt, ("(byte?)", "sbyte.Parse({0})", "{0}.ToString()", "sbyte?", typeof(sbyte), typeof(sbyte?), "{0}.Value", "GetByte") }, { (int)SqlDbType.TinyInt, ("(byte?)", "byte.Parse({0})", "{0}.ToString()", "byte?", typeof(byte), typeof(byte?), "{0}.Value", "GetByte") },
{ (int)SqlDbType.SmallInt, ("(short?)", "short.Parse({0})", "{0}.ToString()", "short?", typeof(short), typeof(short?), "{0}.Value", "GetInt16") }, { (int)SqlDbType.SmallInt, ("(short?)", "short.Parse({0})", "{0}.ToString()", "short?", typeof(short), typeof(short?), "{0}.Value", "GetInt16") },
{ (int)SqlDbType.Int, ("(int?)", "int.Parse({0})", "{0}.ToString()", "int?", typeof(int), typeof(int?), "{0}.Value", "GetInt32") }, { (int)SqlDbType.Int, ("(int?)", "int.Parse({0})", "{0}.ToString()", "int?", typeof(int), typeof(int?), "{0}.Value", "GetInt32") },
{ (int)SqlDbType.BigInt, ("(long?)", "long.Parse({0})", "{0}.ToString()", "long?", typeof(long), typeof(long?), "{0}.Value", "GetInt64") }, { (int)SqlDbType.BigInt, ("(long?)", "long.Parse({0})", "{0}.ToString()", "long?", typeof(long), typeof(long?), "{0}.Value", "GetInt64") },