Merge pull request ThatRendle#327 from jplane/master

ThatRendle · ThatRendle · commit 65ff01e482ce · 2014-03-31T13:54:59.000+01:00
added support for dynamic indexer getter to SimpleRecord
diff --git a/Simple.Data.UnitTest/DynamicRecordTest.cs b/Simple.Data.UnitTest/DynamicRecordTest.cs
@@ -41,6 +41,17 @@ public void DynamicRecordSetterTest()
             Assert.AreEqual("Bob", target.Name);
         }
 
+        /// <summary>
+        ///A test for DynamicRecord Constructor
+        ///</summary>
+        [Test()]
+        public void DynamicRecordIndexerTest()
+        {
+            dynamic target = new SimpleRecord();
+            target.Name = "Bob";
+            Assert.AreEqual("Bob", target["Name"]);
+        }
+
         [Test]
         public void DynamicCastTest()
         {
diff --git a/Simple.Data/SimpleRecord.cs b/Simple.Data/SimpleRecord.cs
@@ -46,12 +46,22 @@ public SimpleRecord(IDictionary<string, object> data, string tableName, DataStra
 
         public override bool TryGetMember(GetMemberBinder binder, out object result)
         {
-            if (_data.ContainsKey(binder.Name))
+            if (TryGetMember(binder.Name, out result) == false)
             {
-                result = _data[binder.Name];
+                return base.TryGetMember(binder, out result);
+            }
+
+            return true;
+        }
+
+        private bool TryGetMember(string name, out object result)
+        {
+            if (_data.ContainsKey(name))
+            {
+                result = _data[name];
                 var converted = ConvertResult(result);
                 if (!ReferenceEquals(result, converted))
-                    _data[binder.Name] = result = converted;
+                    _data[name] = result = converted;
 
                 return true;
             }
@@ -67,9 +77,9 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
                 try
                 {
                     var relatedAdapter = _database.GetAdapter() as IAdapterWithRelation;
-                    if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, binder.Name))
+                    if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, name))
                     {
-                        result = GetRelatedData(binder, relatedAdapter);
+                        result = GetRelatedData(name, relatedAdapter);
                         return true;
                     }
                 }
@@ -78,13 +88,15 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
                     throw new UnresolvableObjectException(e.ObjectName, string.Format("Column '{0}' not found.", e.ObjectName), e);
                 }
             }
-            return base.TryGetMember(binder, out result);
+
+            result = null;
+            return false;
         }
 
-        private object GetRelatedData(GetMemberBinder binder, IAdapterWithRelation relatedAdapter)
+        private object GetRelatedData(string name, IAdapterWithRelation relatedAdapter)
         {
             object result;
-            var related = relatedAdapter.FindRelated(_tableName, _data, binder.Name);
+            var related = relatedAdapter.FindRelated(_tableName, _data, name);
             var query = related as SimpleQuery;
             if (query != null)
             {
@@ -94,10 +106,10 @@ private object GetRelatedData(GetMemberBinder binder, IAdapterWithRelation relat
             else
             {
                 result = related is IDictionary<string, object>
-                             ? (object) new SimpleRecord(related as IDictionary<string, object>, binder.Name, _database)
+                             ? (object) new SimpleRecord(related as IDictionary<string, object>, name, _database)
                              : ((IEnumerable<IDictionary<string, object>>) related).Select(
-                                       dict => new SimpleRecord(dict, binder.Name, _database)).ToList<dynamic>();
-                _data[binder.Name] = result;
+                                       dict => new SimpleRecord(dict, name, _database)).ToList<dynamic>();
+                _data[name] = result;
 
             }
             return result;
@@ -115,6 +127,19 @@ public override bool TryConvert(ConvertBinder binder, out object result)
             return result != null;
         }
 
+        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+        {
+            if (indexes.Length == 1 && indexes[0] is string)
+            {
+                if (TryGetMember((string) indexes[0], out result))
+                {
+                    return true;
+                }
+            }
+
+            return base.TryGetIndex(binder, indexes, out result);
+        }
+
         public override IEnumerable<string> GetDynamicMemberNames()
         {
             return _data.Keys.AsEnumerable();

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,22 @@ public SimpleRecord(IDictionary<string, object> data, string tableName, DataStra`
`46`	`46`
`47`	`47`	`public override bool TryGetMember(GetMemberBinder binder, out object result)`
`48`	`48`	`{`
`49`		`- if (_data.ContainsKey(binder.Name))`
	`49`	`+ if (TryGetMember(binder.Name, out result) == false)`
`50`	`50`	`{`
`51`		`- result = _data[binder.Name];`
	`51`	`+ return base.TryGetMember(binder, out result);`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ return true;`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ private bool TryGetMember(string name, out object result)`
	`58`	`+ {`
	`59`	`+ if (_data.ContainsKey(name))`
	`60`	`+ {`
	`61`	`+ result = _data[name];`
`52`	`62`	`var converted = ConvertResult(result);`
`53`	`63`	`if (!ReferenceEquals(result, converted))`
`54`		`- _data[binder.Name] = result = converted;`
	`64`	`+ _data[name] = result = converted;`
`55`	`65`
`56`	`66`	`return true;`
`57`	`67`	`}`
`@@ -67,9 +77,9 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)`
`67`	`77`	`try`
`68`	`78`	`{`
`69`	`79`	`var relatedAdapter = _database.GetAdapter() as IAdapterWithRelation;`
`70`		`- if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, binder.Name))`
	`80`	`+ if (relatedAdapter != null && relatedAdapter.IsValidRelation(_tableName, name))`
`71`	`81`	`{`
`72`		`- result = GetRelatedData(binder, relatedAdapter);`
	`82`	`+ result = GetRelatedData(name, relatedAdapter);`
`73`	`83`	`return true;`
`74`	`84`	`}`
`75`	`85`	`}`
`@@ -78,13 +88,15 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)`
`78`	`88`	`throw new UnresolvableObjectException(e.ObjectName, string.Format("Column '{0}' not found.", e.ObjectName), e);`
`79`	`89`	`}`
`80`	`90`	`}`
`81`		`- return base.TryGetMember(binder, out result);`
	`91`	`+`
	`92`	`+ result = null;`
	`93`	`+ return false;`
`82`	`94`	`}`
`83`	`95`
`84`		`- private object GetRelatedData(GetMemberBinder binder, IAdapterWithRelation relatedAdapter)`
	`96`	`+ private object GetRelatedData(string name, IAdapterWithRelation relatedAdapter)`
`85`	`97`	`{`
`86`	`98`	`object result;`
`87`		`- var related = relatedAdapter.FindRelated(_tableName, _data, binder.Name);`
	`99`	`+ var related = relatedAdapter.FindRelated(_tableName, _data, name);`
`88`	`100`	`var query = related as SimpleQuery;`
`89`	`101`	`if (query != null)`
`90`	`102`	`{`
`@@ -94,10 +106,10 @@ private object GetRelatedData(GetMemberBinder binder, IAdapterWithRelation relat`
`94`	`106`	`else`
`95`	`107`	`{`
`96`	`108`	`result = related is IDictionary<string, object>`
`97`		`- ? (object) new SimpleRecord(related as IDictionary<string, object>, binder.Name, _database)`
	`109`	`+ ? (object) new SimpleRecord(related as IDictionary<string, object>, name, _database)`
`98`	`110`	`: ((IEnumerable<IDictionary<string, object>>) related).Select(`
`99`		`- dict => new SimpleRecord(dict, binder.Name, _database)).ToList<dynamic>();`
`100`		`- _data[binder.Name] = result;`
	`111`	`+ dict => new SimpleRecord(dict, name, _database)).ToList<dynamic>();`
	`112`	`+ _data[name] = result;`
`101`	`113`
`102`	`114`	`}`
`103`	`115`	`return result;`
`@@ -115,6 +127,19 @@ public override bool TryConvert(ConvertBinder binder, out object result)`
`115`	`127`	`return result != null;`
`116`	`128`	`}`
`117`	`129`
	`130`	`+ public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)`
	`131`	`+ {`
	`132`	`+ if (indexes.Length == 1 && indexes[0] is string)`
	`133`	`+ {`
	`134`	`+ if (TryGetMember((string) indexes[0], out result))`
	`135`	`+ {`
	`136`	`+ return true;`
	`137`	`+ }`
	`138`	`+ }`
	`139`	`+`
	`140`	`+ return base.TryGetIndex(binder, indexes, out result);`
	`141`	`+ }`
	`142`	`+`
`118`	`143`	`public override IEnumerable<string> GetDynamicMemberNames()`
`119`	`144`	`{`
`120`	`145`	`return _data.Keys.AsEnumerable();`