More clean up. s/Orm/ResultSet for the rowToObject function.

bordoley · bordoley · commit 3c4e6abb22ad · 2015-03-24T07:28:22.000-07:00
diff --git a/SQLitePCL.pretty.Orm/Attributes.cs b/SQLitePCL.pretty.Orm/Attributes.cs
@@ -250,7 +250,8 @@ public NotNullAttribute(object defaultValue)
     [AttributeUsage (AttributeTargets.Property)]
     public sealed class ForeignKeyAttribute : Attribute
     {
-        private readonly ForeignKeyConstraint constraint;
+        private readonly string tableName;
+        private readonly string columnName;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SQLitePCL.pretty.Orm.Attributes.ForeignKeyAttribute"/> class.
@@ -260,9 +261,10 @@ public ForeignKeyAttribute(Type typ)
         {
             Contract.Requires(typ != null);
 
-            var tableName = typ.GetTableName();
-            var columnName = typ.GetPublicInstanceProperties().Where(x => x.IsPrimaryKey()).Select(x => x.GetColumnName()).First();
-            this.constraint = new ForeignKeyConstraint(tableName, columnName);
+            var table = TableMapping.Get(typ);
+
+            this.tableName = table.TableName;
+            this.columnName = table.PrimaryKeyColumn();
         }
 
         /// <summary>
@@ -275,13 +277,12 @@ public ForeignKeyAttribute(string tableName, string columnName)
             Contract.Requires(tableName != null);
             Contract.Requires(columnName != null);
 
-            this.constraint = new ForeignKeyConstraint(tableName, columnName);
+            this.tableName = tableName;
+            this.columnName = columnName;
         }
 
-        /// <summary>
-        /// Gets the foreign key constraint value.
-        /// </summary>
-        public ForeignKeyConstraint Value { get { return constraint; } }
+        public string TableName { get { return tableName; } }
+        public string ColumnName { get { return columnName; } }
     }
 
     internal static class OrmAttributes
@@ -341,8 +342,10 @@ internal static object GetDefaultValue(this PropertyInfo This)
 
         internal static ForeignKeyConstraint GetForeignKeyConstraint(this PropertyInfo This)
         {
-            var fkAttr = This.GetCustomAttributes<ForeignKeyAttribute>(true).FirstOrDefault();
-            return fkAttr != null ? fkAttr.Value : null;
+            return 
+                This.GetCustomAttributes<ForeignKeyAttribute>(true)
+                    .Select(x => new ForeignKeyConstraint(x.TableName, x.ColumnName))
+                    .FirstOrDefault();
         }
 
         internal static IEnumerable<PropertyInfo> GetNotIgnoredGettableProperties(this Type This)
diff --git a/SQLitePCL.pretty.Orm/ColumnMapping.cs b/SQLitePCL.pretty.Orm/ColumnMapping.cs
@@ -6,7 +6,7 @@ namespace SQLitePCL.pretty.Orm
     /// <summary>
     /// Provides the mapping between a column's SQL and CLR representation.
     /// </summary>
-    public sealed class ColumnMapping: IEquatable<ColumnMapping>
+    internal sealed class ColumnMapping: IEquatable<ColumnMapping>
     {
         /// <summary>
         /// Indicates whether the two ColumnMapping instances are equal to each other.
diff --git a/SQLitePCL.pretty.Orm/DatabaseConnection.Delete.cs b/SQLitePCL.pretty.Orm/DatabaseConnection.Delete.cs
@@ -24,7 +24,7 @@ public static IStatement PrepareDeleteStatement<T>(this IDatabaseConnection This
         {
             Contract.Requires(This != null);
 
-            var tableMapping = TableMapping.Create<T>();
+            var tableMapping = TableMapping.Get<T>();
             var sql = deleteQueries.GetValue(tableMapping, mapping => 
                 {
                     var primaryKeyColumn = mapping.PrimaryKeyColumn();
@@ -119,7 +119,7 @@ public static void DropTableIfExists<T>(this IDatabaseConnection This)
         {
             Contract.Requires(This != null);
 
-            var tableMapping = TableMapping.Create<T>();
+            var tableMapping = TableMapping.Get<T>();
             This.Execute(SQLBuilder.DropTableIfExists(tableMapping.TableName));
         }
 
@@ -133,7 +133,7 @@ public static void DeleteAllRows<T>(this IDatabaseConnection This)
         {
             Contract.Requires(This != null);
 
-            var tableMapping = TableMapping.Create<T>();
+            var tableMapping = TableMapping.Get<T>();
             This.Execute(SQLBuilder.DeleteAll(tableMapping.TableName));
         }
     }
diff --git a/SQLitePCL.pretty.Orm/DatabaseConnection.Find.cs b/SQLitePCL.pretty.Orm/DatabaseConnection.Find.cs
@@ -23,7 +23,7 @@ public static IStatement PrepareFindStatement<T>(this IDatabaseConnection This)
         {
             Contract.Requires(This != null);
 
-            var tableMapping = TableMapping.Create<T>();
+            var tableMapping = TableMapping.Get<T>();
             var sql = findQueries.GetValue(tableMapping, mapping => 
                 {
                     var column = mapping.PrimaryKeyColumn();
diff --git a/SQLitePCL.pretty.Orm/DatabaseConnection.InsertOrReplace.cs b/SQLitePCL.pretty.Orm/DatabaseConnection.InsertOrReplace.cs
@@ -23,7 +23,7 @@ public static IStatement PrepareInsertOrReplaceStatement<T>(this IDatabaseConnec
         {
             Contract.Requires(This != null);
 
-            var sql = insertOrReplaceQueries.GetValue(TableMapping.Create<T>(), mapping => 
+            var sql = insertOrReplaceQueries.GetValue(TableMapping.Get<T>(), mapping => 
                 {
                     var column = mapping.PrimaryKeyColumn();
                     return SQLBuilder.InsertOrReplace(mapping.TableName, mapping.Columns.Select(x => x.Key));     
@@ -32,19 +32,19 @@ public static IStatement PrepareInsertOrReplaceStatement<T>(this IDatabaseConnec
             return This.PrepareStatement(sql);   
         }
 
-        private static IEnumerable<KeyValuePair<TInserted, TResult>> YieldInsertOrReplaceAll<TInserted, TResult>(
+        private static IEnumerable<KeyValuePair<T,T>> YieldInsertOrReplaceAll<T>(
             this IDatabaseConnection This, 
-            IEnumerable<TInserted> objects,
-            Func<IReadOnlyList<IResultSetValue>,TResult> resultSelector)
+            IEnumerable<T> objects,
+            Func<IReadOnlyList<IResultSetValue>,T> resultSelector)
         {
-            using (var insertOrReplaceStmt = This.PrepareInsertOrReplaceStatement<TInserted>())
-            using (var findStmt = This.PrepareFindByRowId(TableMapping.Create<TInserted>().TableName))
+            using (var insertOrReplaceStmt = This.PrepareInsertOrReplaceStatement<T>())
+            using (var findStmt = This.PrepareFindByRowId(TableMapping.Get<T>().TableName))
             {
                 foreach (var obj in objects)
                 {
                     insertOrReplaceStmt.ExecuteWithProperties(obj);
                     var rowId = This.LastInsertedRowId;
-                    yield return new KeyValuePair<TInserted, TResult>(obj, findStmt.Query(rowId).Select(resultSelector).First());
+                    yield return new KeyValuePair<T,T>(obj, findStmt.Query(rowId).Select(resultSelector).First());
                 } 
             }
         }
@@ -57,16 +57,16 @@ private static IEnumerable<KeyValuePair<TInserted, TResult>> YieldInsertOrReplac
         /// <param name="tableMapping">The table mapping.</param>
         /// <param name="obj">The object to insert.</param>
         /// <typeparam name="T">The mapped type.</typeparam>     
-        public static TResult InsertOrReplace<TInserted, TResult>(
+        public static T InsertOrReplace<T>(
             this IDatabaseConnection This, 
-            TInserted obj,
-            Func<IReadOnlyList<IResultSetValue>,TResult> resultSelector)
+            T obj,
+            Func<IReadOnlyList<IResultSetValue>,T> resultSelector)
         {
             Contract.Requires(This != null);
             Contract.Requires(obj != null);
             Contract.Requires(resultSelector != null);
 
-            return This.YieldInsertOrReplaceAll(new TInserted[] {obj}, resultSelector).First().Value;
+            return This.YieldInsertOrReplaceAll(new T[] {obj}, resultSelector).First().Value;
         }
 
         /// <summary>
@@ -77,10 +77,10 @@ public static TResult InsertOrReplace<TInserted, TResult>(
         /// <param name="tableMapping">The table mapping.</param>
         /// <param name="objects">The objects to be inserted into the database.</param>
         /// <typeparam name="T">The mapped type.</typeparam> 
-        public static IReadOnlyDictionary<TInserted,TResult> InsertOrReplaceAll<TInserted, TResult>(
+        public static IReadOnlyDictionary<T,T> InsertOrReplaceAll<T>(
             this IDatabaseConnection This, 
-            IEnumerable<TInserted> objects,
-            Func<IReadOnlyList<IResultSetValue>,TResult> resultSelector)
+            IEnumerable<T> objects,
+            Func<IReadOnlyList<IResultSetValue>,T> resultSelector)
         {
             Contract.Requires(This != null);
             Contract.Requires(objects != null);
@@ -103,10 +103,10 @@ public static partial class AsyncDatabaseConnection
         /// <param name="objects">The objects to be inserted into the database.</param>
         /// <param name="ct">A cancellation token that can be used to cancel the operation</param>
         /// <typeparam name="T">The mapped type.</typeparam> 
-        public static Task<IReadOnlyDictionary<TInserted, TResult>> InsertOrReplaceAllAsync<TInserted, TResult>(
+        public static Task<IReadOnlyDictionary<T,T>> InsertOrReplaceAllAsync<T>(
             this IAsyncDatabaseConnection This, 
-            IEnumerable<TInserted> objects,
-            Func<IReadOnlyList<IResultSetValue>,TResult> resultSelector,
+            IEnumerable<T> objects,
+            Func<IReadOnlyList<IResultSetValue>,T> resultSelector,
             CancellationToken ct)
         {
             Contract.Requires(This != null);
@@ -124,10 +124,10 @@ public static Task<IReadOnlyDictionary<TInserted, TResult>> InsertOrReplaceAllAs
         /// <param name="tableMapping">The table mapping.</param>
         /// <param name="objects">The objects to be inserted into the database.</param>
         /// <typeparam name="T">The mapped type.</typeparam> 
-        public static Task<IReadOnlyDictionary<TInserted, TResult>> InsertOrReplaceAllAsync<TInserted, TResult>(
+        public static Task<IReadOnlyDictionary<T,T>> InsertOrReplaceAllAsync<T>(
             this IAsyncDatabaseConnection This, 
-            IEnumerable<TInserted> objects,
-            Func<IReadOnlyList<IResultSetValue>,TResult> resultSelector)
+            IEnumerable<T> objects,
+            Func<IReadOnlyList<IResultSetValue>,T> resultSelector)
         {
             Contract.Requires(This != null);
             Contract.Requires(objects != null);
diff --git a/SQLitePCL.pretty.Orm/DatabaseConnection.Tables.cs b/SQLitePCL.pretty.Orm/DatabaseConnection.Tables.cs
@@ -38,7 +38,7 @@ public static void InitTable<T>(this IDatabaseConnection This)
 
             This.RunInTransaction(_ =>
                 {
-                    var tableMapping = TableMapping.Create<T>();
+                    var tableMapping = TableMapping.Get<T>();
                     This.CreateTableIfNotExists(tableMapping.TableName, CreateFlags.None, tableMapping.Columns);
 
                     if (This.Changes != 0)
diff --git a/SQLitePCL.pretty.Orm/ForeignKeyConstraint.cs b/SQLitePCL.pretty.Orm/ForeignKeyConstraint.cs
@@ -5,7 +5,7 @@ namespace SQLitePCL.pretty.Orm
     /// <summary>
     /// Foreign key constraint table, column name tuple.
     /// </summary>
-    public sealed class ForeignKeyConstraint : IEquatable<ForeignKeyConstraint>
+    internal sealed class ForeignKeyConstraint : IEquatable<ForeignKeyConstraint>
     {
         /// <summary>
         /// Indicates whether the two ForeignKeyConstraint instances are equal to each other.
diff --git a/SQLitePCL.pretty.Orm/IndexInfo.cs b/SQLitePCL.pretty.Orm/IndexInfo.cs
@@ -7,7 +7,7 @@ namespace SQLitePCL.pretty.Orm
     /// <summary>
     /// Details about a Table index.
     /// </summary>
-    public sealed class IndexInfo : IEquatable<IndexInfo>
+    internal sealed class IndexInfo : IEquatable<IndexInfo>
     {
         /// <summary>
         /// Indicates whether the two IndexInfo instances are equal to each other.
diff --git a/SQLitePCL.pretty.Orm/ResultSet.cs b/SQLitePCL.pretty.Orm/ResultSet.cs
@@ -6,17 +6,17 @@
 
 namespace SQLitePCL.pretty.Orm
 {
-    public static partial class Orm
+    public static partial class ResultSet
     {
-        public static Func<IReadOnlyList<IResultSetValue>,T> ResultSetRowToObject<T>()
+        public static Func<IReadOnlyList<IResultSetValue>,T> RowToObject<T>()
         {
             Func<T> builder = () => Activator.CreateInstance<T>();
             Func<T, T> build = obj => obj;
 
-            return ResultSetRowToObject(builder, build);
+            return RowToObject(builder, build);
         }
 
-        public static Func<IReadOnlyList<IResultSetValue>,T> ResultSetRowToObject<TBuilder, T>(Func<TBuilder> builder, Func<TBuilder,T> build)
+        public static Func<IReadOnlyList<IResultSetValue>,T> RowToObject<TBuilder, T>(Func<TBuilder> builder, Func<TBuilder,T> build)
         {   
             Contract.Requires(builder != null);
             Contract.Requires(build != null);
diff --git a/SQLitePCL.pretty.Orm/SQLitePCL.pretty.Orm.csproj b/SQLitePCL.pretty.Orm/SQLitePCL.pretty.Orm.csproj
@@ -149,11 +149,11 @@
     <Compile Include="SqlQuery.OrderBy.cs" />
     <Compile Include="SqlQuery.Where.cs" />
     <Compile Include="Statement.cs" />
-    <Compile Include="Orm.cs" />
     <Compile Include="DatabaseConnection.Delete.cs" />
     <Compile Include="DatabaseConnection.Find.cs" />
     <Compile Include="DatabaseConnection.InsertOrReplace.cs" />
     <Compile Include="SqlQuery.From.cs" />
+    <Compile Include="ResultSet.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <ItemGroup>
diff --git a/SQLitePCL.pretty.Orm/SqlQuery.From.cs b/SQLitePCL.pretty.Orm/SqlQuery.From.cs
@@ -19,7 +19,7 @@ internal FromClause(string table)
 
             public WhereClause<T> Select()
             {
-                var table = TableMapping.Create<T>();
+                var table = TableMapping.Get<T>();
                 var columns = table.Columns.Keys.Select(col => table.TableName + "." + col).ToList();
                 return new WhereClause<T>(this, columns, null);
             }
diff --git a/SQLitePCL.pretty.Orm/Statement.cs b/SQLitePCL.pretty.Orm/Statement.cs
@@ -27,7 +27,7 @@ public static void BindProperties<T>(this IStatement This, T obj)
             Contract.Requires(This != null);
             Contract.Requires(obj != null);
 
-            var columns = TableMapping.Create<T>().Columns;
+            var columns = TableMapping.Get<T>().Columns;
             foreach (var column in columns)
             {
                 var key = ":" + column.Key;
diff --git a/SQLitePCL.pretty.Orm/TableMapping.cs b/SQLitePCL.pretty.Orm/TableMapping.cs
@@ -39,7 +39,7 @@ namespace SQLitePCL.pretty.Orm
     /// <summary>
     /// A mapping of an annotated class to a SQL table.
     /// </summary>
-    public sealed class TableMapping: IEquatable<TableMapping>
+    internal sealed class TableMapping: IEquatable<TableMapping>
     {
         /// <summary>
         /// Indicates whether the two TableMapping instances are equal to each other.
@@ -75,9 +75,14 @@ public sealed class TableMapping: IEquatable<TableMapping>
         /// Creates a table mapping instance that will use the given builder to build new instances.
         /// </summary>
         /// <typeparam name="T">The mapped type.</typeparam>
-        internal static TableMapping Create<T>()
+        internal static TableMapping Get<T>()
         {
-            return tableMappings.GetValue(typeof(T), t => CreateInternal(t));
+            return Get(typeof(T));
+        }
+
+        internal static TableMapping Get(Type typ)
+        {
+            return tableMappings.GetValue(typ, t => CreateInternal(t));
         }
 
         private static TableMapping CreateInternal(Type mappedType)
diff --git a/SQLitePCL.pretty.tests/OrmTests/QueryTests.cs b/SQLitePCL.pretty.tests/OrmTests/QueryTests.cs
diff --git a/SQLitePCL.pretty.tests/OrmTests/TableMappingTest.Async.cs b/SQLitePCL.pretty.tests/OrmTests/TableMappingTest.Async.cs
diff --git a/SQLitePCL.pretty.tests/OrmTests/TableMappingTests.Create.cs b/SQLitePCL.pretty.tests/OrmTests/TableMappingTests.Create.cs
diff --git a/SQLitePCL.pretty.tests/OrmTests/TableMappingTests.Sync.cs b/SQLitePCL.pretty.tests/OrmTests/TableMappingTests.Sync.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace SQLitePCL.pretty.Orm`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// Provides the mapping between a column's SQL and CLR representation.`
`8`	`8`	`/// </summary>`
`9`		`- public sealed class ColumnMapping: IEquatable<ColumnMapping>`
	`9`	`+ internal sealed class ColumnMapping: IEquatable<ColumnMapping>`
`10`	`10`	`{`
`11`	`11`	`/// <summary>`
`12`	`12`	`/// Indicates whether the two ColumnMapping instances are equal to each other.`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static IStatement PrepareDeleteStatement<T>(this IDatabaseConnection This`
`24`	`24`	`{`
`25`	`25`	`Contract.Requires(This != null);`
`26`	`26`
`27`		`- var tableMapping = TableMapping.Create<T>();`
	`27`	`+ var tableMapping = TableMapping.Get<T>();`
`28`	`28`	`var sql = deleteQueries.GetValue(tableMapping, mapping =>`
`29`	`29`	`{`
`30`	`30`	`var primaryKeyColumn = mapping.PrimaryKeyColumn();`
`@@ -119,7 +119,7 @@ public static void DropTableIfExists<T>(this IDatabaseConnection This)`
`119`	`119`	`{`
`120`	`120`	`Contract.Requires(This != null);`
`121`	`121`
`122`		`- var tableMapping = TableMapping.Create<T>();`
	`122`	`+ var tableMapping = TableMapping.Get<T>();`
`123`	`123`	`This.Execute(SQLBuilder.DropTableIfExists(tableMapping.TableName));`
`124`	`124`	`}`
`125`	`125`
`@@ -133,7 +133,7 @@ public static void DeleteAllRows<T>(this IDatabaseConnection This)`
`133`	`133`	`{`
`134`	`134`	`Contract.Requires(This != null);`
`135`	`135`
`136`		`- var tableMapping = TableMapping.Create<T>();`
	`136`	`+ var tableMapping = TableMapping.Get<T>();`
`137`	`137`	`This.Execute(SQLBuilder.DeleteAll(tableMapping.TableName));`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static IStatement PrepareFindStatement<T>(this IDatabaseConnection This)`
`23`	`23`	`{`
`24`	`24`	`Contract.Requires(This != null);`
`25`	`25`
`26`		`- var tableMapping = TableMapping.Create<T>();`
	`26`	`+ var tableMapping = TableMapping.Get<T>();`
`27`	`27`	`var sql = findQueries.GetValue(tableMapping, mapping =>`
`28`	`28`	`{`
`29`	`29`	`var column = mapping.PrimaryKeyColumn();`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static void InitTable<T>(this IDatabaseConnection This)`
`38`	`38`
`39`	`39`	`This.RunInTransaction(_ =>`
`40`	`40`	`{`
`41`		`- var tableMapping = TableMapping.Create<T>();`
	`41`	`+ var tableMapping = TableMapping.Get<T>();`
`42`	`42`	`This.CreateTableIfNotExists(tableMapping.TableName, CreateFlags.None, tableMapping.Columns);`
`43`	`43`
`44`	`44`	`if (This.Changes != 0)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace SQLitePCL.pretty.Orm`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Foreign key constraint table, column name tuple.`
`7`	`7`	`/// </summary>`
`8`		`- public sealed class ForeignKeyConstraint : IEquatable<ForeignKeyConstraint>`
	`8`	`+ internal sealed class ForeignKeyConstraint : IEquatable<ForeignKeyConstraint>`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Indicates whether the two ForeignKeyConstraint instances are equal to each other.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace SQLitePCL.pretty.Orm`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Details about a Table index.`
`9`	`9`	`/// </summary>`
`10`		`- public sealed class IndexInfo : IEquatable<IndexInfo>`
	`10`	`+ internal sealed class IndexInfo : IEquatable<IndexInfo>`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Indicates whether the two IndexInfo instances are equal to each other.`
Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,17 @@`
`6`	`6`
`7`	`7`	`namespace SQLitePCL.pretty.Orm`
`8`	`8`	`{`
`9`		`- public static partial class Orm`
	`9`	`+ public static partial class ResultSet`
`10`	`10`	`{`
`11`		`- public static Func<IReadOnlyList<IResultSetValue>,T> ResultSetRowToObject<T>()`
	`11`	`+ public static Func<IReadOnlyList<IResultSetValue>,T> RowToObject<T>()`
`12`	`12`	`{`
`13`	`13`	`Func<T> builder = () => Activator.CreateInstance<T>();`
`14`	`14`	`Func<T, T> build = obj => obj;`
`15`	`15`
`16`		`- return ResultSetRowToObject(builder, build);`
	`16`	`+ return RowToObject(builder, build);`
`17`	`17`	`}`
`18`	`18`
`19`		`- public static Func<IReadOnlyList<IResultSetValue>,T> ResultSetRowToObject<TBuilder, T>(Func<TBuilder> builder, Func<TBuilder,T> build)`
	`19`	`+ public static Func<IReadOnlyList<IResultSetValue>,T> RowToObject<TBuilder, T>(Func<TBuilder> builder, Func<TBuilder,T> build)`
`20`	`20`	`{`
`21`	`21`	`Contract.Requires(builder != null);`
`22`	`22`	`Contract.Requires(build != null);`