Memory leaks fixed across the code related to cached reader.

Copyright date bump

DynamORM.Tests/DynamORM.Tests.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Description>Dynamic Object-Relational Mapping tests library.</Description>
-    <Copyright>Copyright © RUSSEK Software 2012-2024</Copyright>
+    <Copyright>Copyright © RUSSEK Software 2012-2026</Copyright>
     <Company>RUSSEK Software</Company>
     <Authors>Grzegorz Russek</Authors>
     <VersionPrefix>1.8</VersionPrefix>

DynamORM.Tests/Helpers/AttachToDebugger.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Helpers/Dynamic/DynamicParserTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Helpers/PoolingTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Helpers/Users.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Helpers/UsersBareBoneClass.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Helpers/Validation/ObjectValidationTest.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Modify/DynamicModificationTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Modify/DynamicNoSchemaModificationTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Modify/DynamicTypeSchemaModificationTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Modify/ParserTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/DynamicAccessTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/DynamicNoSchemaAccessTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/DynamicTypeSchemaAccessTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/LegacyParserTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/ParserTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/RenamedTypedAccessTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/Select/TypedAccessTests.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM.Tests/TestsBase.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/Extensions/DynamicHavingQueryExtensions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/Builders/Extensions/DynamicModifyBuilderExtensions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/Builders/Extensions/DynamicWhereQueryExtensions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/Builders/IDynamicDeleteQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/IDynamicInsertQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/IDynamicQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/IDynamicSelectQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/IDynamicUpdateQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/IParameter.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/ITableInfo.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/Implementation/DynamicDeleteQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/Builders/Implementation/DynamicInsertQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/Builders/Implementation/DynamicModifyBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Builders/Implementation/DynamicQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/Builders/Implementation/DynamicSelectQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution
@@ -139,36 +139,35 @@ namespace DynamORM.Builders.Implementation
         /// <returns>Enumerator of objects expanded from query.</returns>
         public virtual IEnumerable<dynamic> Execute()
         {
-            DynamicCachedReader cache = null;
             using (IDbConnection con = Database.Open())
             using (IDbCommand cmd = con.CreateCommand())
             {
                 using (IDataReader rdr = cmd
-                    .SetCommand(this)
+                           .SetCommand(this)
-                    .ExecuteReader())
+                           .ExecuteReader())
-                    cache = new DynamicCachedReader(rdr);
+                using (IDataReader cache = new DynamicCachedReader(rdr))
-
+                    while (cache.Read())
-                while (cache.Read())
-                {
-                    dynamic val = null;
-
-                    // Work around to avoid yield being in try...catchblock:
-                    // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    try
                     {
-                        val = cache.RowToDynamic();
+                        dynamic val = null;
-                    }
-                    catch (ArgumentException argex)
-                    {
-                        StringBuilder sb = new StringBuilder();
-                        cmd.Dump(sb);
 
-                        throw new ArgumentException(string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                        // Work around to avoid yield being in try...catchblock:
-                            argex.InnerException.NullOr(a => a, argex));
+                        // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    }
+                        try
+                        {
+                            val = cache.RowToDynamic();
+                        }
+                        catch (ArgumentException argex)
+                        {
+                            StringBuilder sb = new StringBuilder();
+                            cmd.Dump(sb);
 
-                    yield return val;
+                            throw new ArgumentException(
-                }
+                                string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                                argex.InnerException.NullOr(a => a, argex));
+                        }
+
+                        yield return val;
+                    }
             }
         }
 
@@ -177,7 +176,6 @@ namespace DynamORM.Builders.Implementation
         /// <returns>Enumerator of objects expanded from query.</returns>
         public virtual IEnumerable<T> Execute<T>() where T : class
         {
-            DynamicCachedReader cache = null;
             DynamicTypeMap mapper = DynamicMapperCache.GetMapper<T>();
 
             if (mapper == null)
@@ -187,31 +185,31 @@ namespace DynamORM.Builders.Implementation
             using (IDbCommand cmd = con.CreateCommand())
             {
                 using (IDataReader rdr = cmd
-                    .SetCommand(this)
+                           .SetCommand(this)
-                    .ExecuteReader())
+                           .ExecuteReader())
-                    cache = new DynamicCachedReader(rdr);
+                using (IDataReader cache = new DynamicCachedReader(rdr))
-
+                    while (cache.Read())
-                while (cache.Read())
-                {
-                    dynamic val = null;
-
-                    // Work around to avoid yield being in try...catchblock:
-                    // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    try
                     {
-                        val = cache.RowToDynamic();
+                        dynamic val = null;
-                    }
-                    catch (ArgumentException argex)
-                    {
-                        StringBuilder sb = new StringBuilder();
-                        cmd.Dump(sb);
 
-                        throw new ArgumentException(string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                        // Work around to avoid yield being in try...catchblock:
-                            argex.InnerException.NullOr(a => a, argex));
+                        // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    }
+                        try
+                        {
+                            val = cache.RowToDynamic();
+                        }
+                        catch (ArgumentException argex)
+                        {
+                            StringBuilder sb = new StringBuilder();
+                            cmd.Dump(sb);
 
-                    yield return mapper.Create(val) as T;
+                            throw new ArgumentException(
-                }
+                                string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                                argex.InnerException.NullOr(a => a, argex));
+                        }
+
+                        yield return mapper.Create(val) as T;
+                    }
             }
         }
 
@@ -232,16 +230,13 @@ namespace DynamORM.Builders.Implementation
         /// <param name="reader">Action containing reader.</param>
         public virtual void ExecuteCachedDataReader(Action<IDataReader> reader)
         {
-            DynamicCachedReader cache = null;
-
             using (IDbConnection con = Database.Open())
             using (IDbCommand cmd = con.CreateCommand())
             using (IDataReader rdr = cmd
                 .SetCommand(this)
                 .ExecuteReader())
-                cache = new DynamicCachedReader(rdr);
+            using (IDataReader cache = new DynamicCachedReader(rdr))
-
+                reader(cache);
-            reader(cache);
         }
 
         /// <summary>Returns a single result.</summary>

DynamORM/Builders/Implementation/DynamicUpdateQueryBuilder.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Some of methods in this code file is based on Kerosene ORM solution

DynamORM/DynamORM.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;net472;net6.0;net8.0;net10.0</TargetFrameworks>
 		<Description>Dynamic Object-Relational Mapping library.</Description>
-		<Copyright>Copyright © RUSSEK Software 2012-2024</Copyright>
+		<Copyright>Copyright © RUSSEK Software 2012-2026</Copyright>
 		<Company>RUSSEK Software</Company>
 		<Authors>Grzegorz Russek</Authors>
 		<VersionPrefix>1.9</VersionPrefix>

DynamORM/DynamicColumn.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicCommand.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicConnection.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicDatabase.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1327,7 +1327,6 @@ namespace DynamORM
         /// <returns>Enumerator of objects expanded from query.</returns>
         public virtual IEnumerable<dynamic> Query(string sql, params object[] args)
         {
-            DynamicCachedReader cache = null;
             using (IDbConnection con = Open())
             using (IDbCommand cmd = con.CreateCommand())
             {
@@ -1335,28 +1334,30 @@ namespace DynamORM
                     .SetCommand(sql)
                     .AddParameters(this, args)
                     .ExecuteReader())
-                    cache = new DynamicCachedReader(rdr);
+                using (IDataReader cache = new DynamicCachedReader(rdr))
-
-                while (cache.Read())
                 {
-                    dynamic val = null;
+                    while (cache.Read())
-
-                    // Work around to avoid yield being in try...catch block:
-                    // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    try
                     {
-                        val = cache.RowToDynamic();
+                        dynamic val = null;
-                    }
-                    catch (ArgumentException argex)
-                    {
-                        StringBuilder sb = new StringBuilder();
-                        cmd.Dump(sb);
 
-                        throw new ArgumentException(string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                        // Work around to avoid yield being in try...catch block:
-                            argex.InnerException.NullOr(a => a, argex));
+                        // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    }
+                        try
+                        {
+                            val = cache.RowToDynamic();
+                        }
+                        catch (ArgumentException argex)
+                        {
+                            StringBuilder sb = new StringBuilder();
+                            cmd.Dump(sb);
 
-                    yield return val;
+                            throw new ArgumentException(
+                                string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                                argex.InnerException.NullOr(a => a, argex));
+                        }
+
+                        yield return val;
+                    }
                 }
             }
         }
@@ -1366,36 +1367,35 @@ namespace DynamORM
         /// <returns>Enumerator of objects expanded from query.</returns>
         public virtual IEnumerable<dynamic> Query(IDynamicQueryBuilder builder)
         {
-            DynamicCachedReader cache = null;
             using (IDbConnection con = Open())
             using (IDbCommand cmd = con.CreateCommand())
             {
                 using (IDataReader rdr = cmd
                     .SetCommand(builder)
                     .ExecuteReader())
-                    cache = new DynamicCachedReader(rdr);
+                using (var cache = new DynamicCachedReader(rdr))
-
+                    while (cache.Read())
-                while (cache.Read())
-                {
-                    dynamic val = null;
-
-                    // Work around to avoid yield being in try...catch block:
-                    // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    try
                     {
-                        val = cache.RowToDynamic();
+                        dynamic val = null;
-                    }
-                    catch (ArgumentException argex)
-                    {
-                        StringBuilder sb = new StringBuilder();
-                        cmd.Dump(sb);
 
-                        throw new ArgumentException(string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                        // Work around to avoid yield being in try...catch block:
-                            argex.InnerException.NullOr(a => a, argex));
+                        // http://stackoverflow.com/questions/346365/why-cant-yield-return-appear-inside-a-try-block-with-a-catch
-                    }
+                        try
+                        {
+                            val = cache.RowToDynamic();
+                        }
+                        catch (ArgumentException argex)
+                        {
+                            StringBuilder sb = new StringBuilder();
+                            cmd.Dump(sb);
 
-                    yield return val;
+                            throw new ArgumentException(
-                }
+                                string.Format("{0}{1}{2}", argex.Message, Environment.NewLine, sb),
+                                argex.InnerException.NullOr(a => a, argex));
+                        }
+
+                        yield return val;
+                    }
             }
         }
 

DynamORM/DynamicDatabaseOptions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicExpando.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicExtensions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicProcedureInvoker.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -282,18 +282,17 @@ namespace DynamORM
                     else if (types[0] == typeof(DataTable))
                     {
                         using (IDataReader rdr = cmd.ExecuteReader())
-                            mainResult = rdr.CachedReader().ToDataTable(binder.Name);
+                        using (IDataReader cache = rdr.CachedReader())
+                            mainResult = cache.ToDataTable(binder.Name);
                     }
                     else if (types[0].IsGenericEnumerable())
                     {
                         Type argType = types[0].GetGenericArguments().First();
                         if (argType == typeof(object))
                         {
-                            IDataReader cache = null;
                             using (IDataReader rdr = cmd.ExecuteReader())
-                                cache = rdr.CachedReader();
+                            using (IDataReader cache = rdr.CachedReader())
-
+                                mainResult = cache.EnumerateReader().ToList();
-                            mainResult = cache.EnumerateReader().ToList();
                         }
                         else if (argType.IsValueType || argType == typeof(string))
                         {
@@ -302,12 +301,10 @@ namespace DynamORM
 
                             object defVal = listType.GetDefaultValue();
 
-                            IDataReader cache = null;
                             using (IDataReader rdr = cmd.ExecuteReader())
-                                cache = rdr.CachedReader();
+                            using (IDataReader cache = rdr.CachedReader())
-
+                                while (cache.Read())
-                            while (cache.Read())
+                                    listInstance.Add(cache[0] != null && cache[0] != DBNull.Value ? argType.CastObject(cache[0]) : defVal);
-                                listInstance.Add(cache[0] != null && cache[0] != DBNull.Value ? argType.CastObject(cache[0]) : defVal);
 
                             mainResult = listInstance;
                         }
@@ -318,15 +315,13 @@ namespace DynamORM
 
                             object defVal = listType.GetDefaultValue();
 
-                            IDataReader cache = null;
                             using (IDataReader rdr = cmd.ExecuteReader())
-                                cache = rdr.CachedReader();
+                            using (IDataReader cache = rdr.CachedReader())
-
+                                while (cache.Read())
-                            while (cache.Read())
+                                {
-                            {
+                                    if (cache[0] != null && cache[0] != DBNull.Value && Guid.TryParse(cache[0].ToString(), out Guid g))
-                                if (cache[0] != null && cache[0] != DBNull.Value && Guid.TryParse(cache[0].ToString(), out Guid g))
+                                        listInstance.Add(g);
-                                    listInstance.Add(g);
+                                }
-                            }
 
                             mainResult = listInstance;
                         }
@@ -336,18 +331,18 @@ namespace DynamORM
                             if (mapper == null)
                                 throw new InvalidCastException(string.Format("Don't know what to do with this type: '{0}'.", argType.ToString()));
 
-                            IDataReader cache = null;
                             using (IDataReader rdr = cmd.ExecuteReader())
-                                cache = rdr.CachedReader();
+                            using (IDataReader cache = rdr.CachedReader())
+                            {
+                                var lt = typeof(List<>);
+                                var ltc = lt.MakeGenericType(argType);
+                                var instance = Activator.CreateInstance(ltc) as IList;
 
-                            var lt = typeof(List<>);
+                                foreach (var item in cache.EnumerateReader())
-                            var ltc = lt.MakeGenericType(argType);
+                                    instance.Add(DynamicExtensions.Map(item, argType));
-                            var instance = Activator.CreateInstance(ltc) as IList;
 
-                            foreach (var item in cache.EnumerateReader())
+                                mainResult = instance;
-                                instance.Add(DynamicExtensions.Map(item, argType));
+                            }
-
-                            mainResult = instance;
 
                             //mainResult = cache.EnumerateReader().MapEnumerable(argType).ToList();
                         }

DynamORM/DynamicQueryException.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicSchemaColumn.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicTable.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/DynamicTransaction.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/CollectionComparer.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/Dynamics/DynamicParser.cs

@@ -1,6 +1,6 @@
-/*
+/*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * This code file is based on Kerosene ORM solution for parsing dynamic

DynamORM/Helpers/Dynamics/DynamicProxy.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/FrameworkTools.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/IExtendedDisposable.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/IFinalizerDisposable.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/StringExtensions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Helpers/UnclassifiedExtensions.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/ColumnAttribute.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/DynamicCast.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/DynamicMapperCache.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/DynamicPropertyInvoker.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/DynamicTypeMap.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/IgnoreAttribute.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Mapper/TableAttribute.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

DynamORM/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 /*
  * DynamORM - Dynamic Object-Relational Mapping library.
- * Copyright (c) 2012-2015, Grzegorz Russek (grzegorz.russek@gmail.com)
+ * Copyright (c) 2012-2026, Grzegorz Russek (grzegorz.russek@gmail.com)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without