RUSSEK-Software/DynamORM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
grzegorz.russek
2019-12-18 16:13:08 +00:00
parent 552f7a1f86
commit 7ce3a00613
6 changed files with 155 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DynamORM/Builders/Implementation/DynamicQueryBuilder.cs
View File

@@ -139,8 +139,8 @@ namespace DynamORM.Builders.Implementation
{
IsDisposed = true;
if (Schema != null)
Schema.Clear();
////if (Schema != null)
//// Schema.Clear();
Owner = Name = Alias = null;
Schema = null;

20
DynamORM/Mapper/DynamicPropertyInvoker.cs
View File

@@ -168,13 +168,21 @@ namespace DynamORM.Mapper
{
if (val != null)
{
var lst = (val as IEnumerable<object>).Select(x => GetElementVal(ArrayType, x)).ToList();
if (val is IEnumerable<object>)
{
var lst = (val as IEnumerable<object>).Select(x => GetElementVal(ArrayType, x)).ToList();
value = Array.CreateInstance(ArrayType, lst.Count);
value = Array.CreateInstance(ArrayType, lst.Count);
int i = 0;
foreach (var e in lst)
((Array)value).SetValue(e, i++);
int i = 0;
foreach (var e in lst)
((Array)value).SetValue(e, i++);
}
else
{
value = Array.CreateInstance(ArrayType, 1);
((Array)value).SetValue(GetElementVal(ArrayType, val), 0);
}
}
else
value = Array.CreateInstance(ArrayType, 0);
@@ -231,7 +239,7 @@ namespace DynamORM.Mapper
Guid g;
return Guid.TryParse((string)val, out g) ? g : Guid.Empty;
}
else if (IsDataContract)
else if (!typeof(IConvertible).IsAssignableFrom(type) && (IsDataContract || (!type.IsValueType && val is IDictionary<string, object>)))
return val.Map(type);
else
try

4
DynamORM/Mapper/DynamicTypeMap.cs
View File

@@ -82,6 +82,10 @@ namespace DynamORM.Mapper
foreach (PropertyInfo pi in GetAllMembers(Type).Where(x => x is PropertyInfo).Cast<PropertyInfo>())
{
// Skip indexers
if (pi.GetIndexParameters().Any())
continue;
ColumnAttribute attr = null;
object[] attrs = pi.GetCustomAttributes(typeof(ColumnAttribute), true);

106
DynamORM/Objects/DynamicEntityBase.cs
View File

@@ -102,13 +102,16 @@ namespace DynamORM.Objects
/// <returns>Returns <c>true</c> if operation was successful.</returns>
public virtual bool Insert(DynamicDatabase db)
{
if (db.Insert(this.GetType())
.Values(x => this)
.Execute() > 0)
using (var query = db.Insert(this.GetType()))
{
_changedFields.Clear();
SetDynamicEntityState(DynamicEntityState.Existing);
return true;
if (query
.Values(x => this)
.Execute() > 0)
{
_changedFields.Clear();
SetDynamicEntityState(DynamicEntityState.Existing);
return true;
}
}
return false;
@@ -121,47 +124,49 @@ namespace DynamORM.Objects
{
var t = GetType();
var mapper = DynamicMapperCache.GetMapper(t);
var query = db.Update(t);
MakeQueryWhere(mapper, query);
if (_changedFields.Any())
using (var query = db.Update(t))
{
bool any = false;
foreach (var cf in _changedFields)
MakeQueryWhere(mapper, query);
if (_changedFields.Any())
{
var cn = mapper.PropertyMap[cf.Key];
var pm = mapper.ColumnsMap[cn.ToLower()];
if (pm.Ignore)
continue;
bool any = false;
if (pm.Column != null)
foreach (var cf in _changedFields)
{
if (pm.Column.IsKey)
var cn = mapper.PropertyMap[cf.Key];
var pm = mapper.ColumnsMap[cn.ToLower()];
if (pm.Ignore)
continue;
if (!pm.Column.AllowNull && cf.Value == null)
continue;
if (pm.Column != null)
{
if (pm.Column.IsKey)
continue;
if (!pm.Column.AllowNull && cf.Value == null)
continue;
}
query.Values(cn, cf.Value);
any = true;
}
query.Values(cn, cf.Value);
any = true;
if (!any)
query.Set(x => this);
}
if (!any)
else
query.Set(x => this);
if (query.Execute() == 0)
return false;
SetDynamicEntityState(DynamicEntityState.Existing);
_changedFields.Clear();
return true;
}
else
query.Set(x => this);
if (query.Execute() == 0)
return false;
SetDynamicEntityState(DynamicEntityState.Existing);
_changedFields.Clear();
return true;
}
/// <summary>Deletes this object from database.</summary>
@@ -172,14 +177,15 @@ namespace DynamORM.Objects
var t = this.GetType();
var mapper = DynamicMapperCache.GetMapper(t);
var query = db.Delete(t);
using (var query = db.Delete(t))
{
MakeQueryWhere(mapper, query);
MakeQueryWhere(mapper, query);
if (query.Execute() == 0)
return false;
if (query.Execute() == 0)
return false;
SetDynamicEntityState(DynamicEntityState.Deleted);
SetDynamicEntityState(DynamicEntityState.Deleted);
}
return true;
}
@@ -196,17 +202,19 @@ namespace DynamORM.Objects
{
var t = this.GetType();
var mapper = DynamicMapperCache.GetMapper(t);
var query = db.From(t);
MakeQueryWhere(mapper, query);
var o = (query.Execute() as IEnumerable<dynamic>).FirstOrDefault();
using (var query = db.From(t))
{
MakeQueryWhere(mapper, query);
var o = (query.Execute() as IEnumerable<dynamic>).FirstOrDefault();
if (o == null)
return false;
if (o == null)
return false;
mapper.Map(o, this);
mapper.Map(o, this);
SetDynamicEntityState(DynamicEntityState.Existing);
_changedFields.Clear();
SetDynamicEntityState(DynamicEntityState.Existing);
_changedFields.Clear();
}
return true;
}

3
DynamORM/Objects/DynamicRepositoryBase.cs
View File

@@ -23,7 +23,8 @@ namespace DynamORM.Objects
/// <returns>Objects enumerator.</returns>
public virtual IEnumerable<T> GetAll()
{
return EnumerateQuery(_database.From<T>());
using (var q = _database.From<T>())
return EnumerateQuery(q);
}
/// <summary>Get rows from database by custom query.</summary>