diff --git a/Libraries/MigSharp.dll b/Libraries/MigSharp.dll
new file mode 100644
index 000000000..d0c265902
Binary files /dev/null and b/Libraries/MigSharp.dll differ
diff --git a/Libraries/MigSharp.xml b/Libraries/MigSharp.xml
new file mode 100644
index 000000000..1dc15a3fc
--- /dev/null
+++ b/Libraries/MigSharp.xml
@@ -0,0 +1,1335 @@
+
+
+
+ MigSharp
+
+
+
+
+ Represents a type that knows how to provide database-specific DDL statements.
+
+
+
+
+ Checks whether a user created table exists on the database. The returned SQL command must yield 0 if the table does not exist.
+
+ The database name.
+ The table name.
+ The SQL command to be executed.
+
+
+
+ Converts an object to its SQL representation for scripting.
+
+
+
+
+ Creates a tables with the specified
+
+ The name of the new table.
+ The columns of the new table.
+ Empty if there are no primary key columns.
+ The SQL commands to be executed.
+
+
+
+ Drops a table.
+
+ The SQL commands to be executed.
+
+
+
+ Adds columns to an existing table.
+
+ The SQL commands to be executed.
+
+
+
+ Renames an existing table.
+
+ The SQL commands to be executed.
+
+
+
+ Renames a column of an existing table.
+
+ The SQL commands to be executed.
+
+
+
+ Removes a column from an existing table.
+
+ The SQL commands to be executed.
+
+
+
+ Changes the data type of a column.
+
+ The SQL commands to be executed.
+
+
+
+ Adds an index to a table.
+
+ The SQL commands to be executed.
+
+
+
+ Drops an index from a table.
+
+ The SQL commands to be executed.
+
+
+
+ Adds a foreign key constraint to a table.
+
+ The SQL commands to be executed.
+
+
+
+ Drops a foreign key constraint from a table.
+
+ The SQL commands to be executed.
+
+
+
+ Adds a primary key constraint to a table.
+
+ The SQL commands to be executed.
+
+
+
+ Renames the primary key.
+
+ The SQL commands to be executed.
+
+
+
+ Drops a primary key constraint from a table.
+
+ The SQL commands to be executed.
+
+
+
+ Adds an unique constraint to a table.
+
+ The SQL commands to be executed.
+
+
+
+ Drops a unique constraint from a table.
+
+ The SQL commands to be executed.
+
+
+
+ Drops the default value (constraint) from a column.
+
+ The SQL commands to be executed.
+
+
+
+ Represents the main entry point to perform migrations.
+
+
+
+
+ Initializes a new instance of .
+
+ Connection string to the database to be migrated.
+ The name of the provider that should be used for this migrator ().
+ Options.
+
+
+
+ Initializes a new instance of for a specific module.
+
+ Connection string to the database to be migrated.
+ The name of the provider that should be used for this migrator ().
+ The name of the module whose migrations should be executed.
+
+
+
+ Initializes a new instance of with default options.
+
+ Connection string to the database to be migrated.
+ The name of the provider that should be used for this migrator ().
+
+
+
+ Executes all pending migrations found in .
+
+ The assembly to search for migrations.
+ Optional assemblies that hold additional migrations.
+
+
+
+ Executes all migrations required to reach .
+
+
+
+ Optional assemblies that hold additional migrations.
+
+
+
+ Retrieves all pending migrations.
+
+ The assembly that contains the migrations.
+ Optional assemblies that hold additional migrations.
+
+
+
+ Retrieves all required migrations to reach .
+
+ The assembly that contains the migrations.
+ The timestamp to migrate to.
+ When the migration path would require downgrading a migration which is not reversible.
+ Optional assemblies that hold additional migrations.
+
+
+
+ Checks if any migrations are pending to be performed.
+
+ The assembly that contains the migrations.
+ Optional assemblies that hold additional migrations.
+
+
+
+ Injects a custom version mechanism.
+
+
+
+
+ Injects a custom bootstrapping mechanism.
+
+
+
+
+ Represents a database.
+
+
+
+
+ Creates a new table on the database.
+
+ The name of the new table.
+ Optionally, the name of the primary key constraint.
+
+
+
+ Executes a custom query.
+
+ Custom SQL which must be understood by all providers that should be supported by this migration.
+
+
+
+ Executes a custom action against the . Use this method if you need to directly access the
+ underlying or .
+
+
+
+
+ Gets the context of the migration.
+
+
+
+
+ Gets existing tables.
+
+
+
+
+ Contains the extension methods for the interface.
+
+
+
+
+ Creates a new table on the database with a default primary key constraint name.
+
+
+
+
+ Represents the context of a migration.
+
+
+
+
+ Gets the metadata describing the underlying provider.
+
+
+
+
+ Represents an index.
+
+
+
+
+ Drops the index.
+
+
+
+
+ Represents an index which is about to be added to a table.
+
+
+
+
+ Adds the index on the provided column.
+
+
+
+
+ Represents a primary key constraint which is about to be added to a table.
+
+
+
+
+ Adds the index on the provided column.
+
+
+
+
+ Represents a batch of s.
+
+
+
+
+ Performs the migrations contained in this batch.
+
+
+
+
+ Raised before each migration that will be executed.
+
+
+
+
+ Raised after each migration that has been executed.
+
+
+
+
+ Gets the number of migrations in this batch.
+
+
+
+
+ Gets a list of s that were used to create new objects (excluding primary key columns).
+
+
+
+
+ Gets a list of s that were used to create primary key columns.
+
+
+
+
+ Gets a list of names of any created objects.
+
+
+
+
+ Gets a list of method names that were used for the migration.
+
+
+
+
+ Represents a collection of existing indexes of a table.
+
+
+
+
+ Gets an index by name.
+
+
+
+
+ Represents an unique constraint.
+
+
+
+
+ Drops the unique constraint.
+
+
+
+
+ Represents a foreign key constraint.
+
+
+
+
+ Drops the foreign key constraint.
+
+
+
+
+ Executes the migration step and updates the versioning information in one transaction.
+
+ Might be null in the case of a bootstrap step.
+
+
+
+ Executes the migration step and updates the versioning information in one transaction.
+
+
+
+
+ Represents a pair of column names which is used as an element of a foreign key relationship.
+
+
+
+
+ Gets the name of the referencing column.
+
+
+
+
+ Gets the name of the referenced column.
+
+
+
+
+ Represents the version of a database containing all information about past migrations.
+
+
+
+
+ Verifies if a specific migration was executed.
+
+ It might seems odd that this method does not receive a connection. However, the idea is that the object implementing
+ this interface initializes itself once upon construction and the answers the calls to this method from a cache.
+ Thus, it would not need to do any round-trip to the database which is important as this method is called for each migration.
+
+
+
+
+
+ Updates the versioning to include or exclude the migration depending on the provided .
+
+ Post-condition: if was , must return true.
+ Otherwise was and must return false.
+
+
+ The metadata of the migration to be included in the versioning table.
+ An open connection to the database containing the versioning table.
+ The associated transaction.
+ The direction of the migration.
+ Used to execute s.
+
+
+
+ Represents a created table.
+
+
+
+
+ Represents a created table.
+
+
+
+
+ Adds a non-nullable column which is part of the primary key constraint to the table being created.
+
+
+
+
+ Adds a non-nullable column to the table being created.
+
+
+
+
+ Adds a nullable column to the table being created.
+
+
+
+
+ Gets the name of the table.
+
+
+
+
+ Represents a unique constraint which is about to be added to a table.
+
+
+
+
+ Adds the unique constraint on the provided column.
+
+
+
+
+ Declares the support of a specific data type.
+
+
+
+
+ Initializes a new instance.
+
+
+
+
+ Gets the supported data type.
+
+
+
+
+ Gets or sets the maximum length for character data types or the maximum total number of decimal digits for numeric data types.
+
+
+
+
+ Gets or sets the maximum number of decimal digits that can be stored to the right of the decimal point. Scale is a value from 0 through .
+
+
+
+
+ Indicates if the data type can be used in primary key columns. By default, this is false.
+
+
+
+
+ Gets or sets a warning message if there are any restrictions when using this .
+ The warning message is logged when executing a migration containing this data type.
+
+
+
+
+ Indicates if the data type can be scripted.
+
+
+
+
+ Represents an added column on an existing table.
+
+
+
+
+ Represents a table that was created before.
+
+
+
+
+ Adds a not-nullable column.
+
+
+
+
+ Adds a nullable column.
+
+
+
+
+ Gets the name of the table.
+
+
+
+
+ Specifies the size and the scale of the data type of the column.
+
+ The length for character data types or the maximum total number of decimal digits for numeric data types.
+ The maximum number of decimal digits that can be stored to the right of the decimal point. Scale must be a value from 0 through .
+
+
+
+ Adds a default value to the column.
+
+
+
+
+ Adds a default value to the column.
+
+
+
+
+ Adds a default value to the column which is dropped after adding the column to the table.
+ Use this method to fill a non-nullable column with default values.
+
+
+
+
+ Adds a default value to the column which is dropped after adding the column to the table.
+ Use this method to fill a non-nullable column with default values.
+
+
+
+
+ Contains the extensions methods for the interface.
+
+
+
+
+ Specifies the size of the data type of the column.
+
+
+ The length for character data types or the maximum total number of decimal digits for numeric data types.
+
+
+
+ Sets the default of the column to be the current system time of the database server.
+
+
+
+
+ Reperesents metadata about an .
+
+
+
+
+ Gets the unique name of this provider.
+
+
+
+
+ Gets the invariant name of the provider needed for .
+
+
+
+
+ Gets an indication if the underlying provider supports transactions.
+
+
+
+
+ Gets an expression that specifies how s are addressed in command texts. The literal 'p' is replaced by the parameter name.
+
+
+
+
+ Gets the maximum length of object names within the database. 0 meaning that there is non restriction which is the default.
+
+
+
+
+ Represents a column on a newly created table.
+
+
+
+
+ Specifies the size and the scale of the data type of the column.
+
+ The length for character data types or the maximum total number of decimal digits for numeric data types.
+ The maximum number of decimal digits that can be stored to the right of the decimal point. Scale must be a value from 0 through .
+
+
+
+ Puts the column under an unique constraint.
+
+ Optionally, specify the name of the unique constraint. If null or empty, a default constraint name will be generated.
+
+
+
+ Makes the column auto-increment.
+
+
+
+
+ Adds a default value to the column.
+
+
+
+
+ Adds a default value to the column.
+
+
+
+
+ Gets the column name.
+
+
+
+
+ This exception is thrown when a requested downgrade path contains an irreversible migration.
+
+
+
+
+ Contains the names of the supported providers.
+
+
+
+
+ Represents the run-time context of a migration.
+
+
+
+
+ Gets the connection which is used to perform the migration.
+
+
+
+
+ Gets the transaction which is used to perform the migration.
+
+
+
+
+ Gets the that should be used to execute database modifying commands.
+ This ensures that they are logged and scripted consistently.
+
+
+
+
+ Lists special default values for columns.
+
+
+
+
+ Represents the current date time of the database server.
+
+
+
+
+ Represents a collection of providers that should be supported for all migrations. Validation of migrations is performed
+ against providers contained within this list.
+
+
+
+
+ Initializes a new instance used for unit testing.
+
+
+
+
+ Initializes a new instance which is ready-to-use with the default providers.
+
+
+
+
+ Adds a provider.
+
+
+
+
+ Removes a provider.
+
+
+
+
+ Removes all ODBC providers.
+
+
+
+
+ Sets the collection to a list of providers.
+
+
+
+
+ Resets the collection to support all providers that are delivered with Mig#.
+
+
+
+
+ Gets the names of the providers.
+
+
+
+
+ Represents a collection of existing unique constraints of a table.
+
+
+
+
+ Gets an unique constraint by name.
+
+
+
+
+ Use this attribute to mark classes as migrations.
+
+
+
+
+ The maximum string length for a module name.
+
+
+
+
+ Initializes a new instance of the attribute.
+
+
+
+
+ Gets the name of the module to which this migration belongs to (see also ).
+
+
+
+
+ Gets the tag associated with this migration.
+
+
+
+
+ Represents a migration that can also be downgraded.
+
+
+
+
+ The interface that needs to be implemented in order to define a migration.
+ Additionally, the must be applied
+ to a class implementing this interface in order to be recognized as a migration.
+
+
+
+
+ Applies the required changes to the provided for this migration.
+
+
+
+
+ Undoes all changes from the method.
+
+
+
+
+ Represents a foreign key constraint which is about to be added to a table.
+
+
+
+
+ Specifies the columns on which the foreign key is defined.
+
+
+ This method is not called 'On', as 'On' is a reserved language keyword (see FxCop rule "Identifiers should not match keywords").
+
+
+
+
+ Contains information about used data types, longest name, etc. for a specific migration.
+
+
+
+
+ Gets the full type name of the migration for this report.
+
+
+
+
+ Gets the error message for the migration if there was an .
+
+
+
+
+ Gets a list of s that were used to create new objects (including primary key columns).
+
+
+
+
+ Gets a list of s that were used to create primary key columns.
+
+
+
+
+ Gets the longest name of any created objects.
+
+
+
+
+ Gets a list of used provider method names.
+
+
+
+
+ Marks the class as an provider implementing .
+
+
+
+
+ Initializes a new instance.
+
+
+
+
+ Gets the unique name of this provider.
+
+
+
+
+ Gets the invariant name of the provider needed for .
+
+
+
+
+ Gets or sets an indication if the underlying provider supports transactions. True by default.
+
+
+
+
+ Gets an expression that specifies how s are addressed in command texts. The literal 'p' is replaced by the parameter name.
+ The default is '@p'.
+
+
+
+
+ Gets or sets the maximum length of object names within the database. 0 meaning that there is non restriction which is the default.
+
+
+
+
+ Represents a collection of existing foreign key constraints of a table.
+
+
+
+
+ Gets an foreign key constraint by name.
+
+
+
+
+ Represents an existing column whose data type is being altered.
+
+
+
+
+ Specifies the size and the scale of the new data type of the column.
+
+ The length for character data types or the maximum total number of decimal digits for numeric data types.
+ The maximum number of decimal digits that can be stored to the right of the decimal point. Scale must be a value from 0 through .
+
+
+
+ Adds a default value to the column.
+
+
+
+
+ Adds a default value to the column.
+
+
+
+
+ Contains the extensions methods for the interface.
+
+
+
+
+ Specifies the size of the new data type of the column.
+
+
+ The length for character data types or the maximum total number of decimal digits for numeric data types.
+
+
+
+ Sets the default of the column to be the current system time of the database server.
+
+
+
+
+ MigSharp provider for Microsoft SQL Compact Edition 4.0.
+
+
+
+
+ Represents a collection of existing tables.
+
+
+
+
+ Gets a table by its name.
+
+
+
+
+ Represents a collection of existing columns.
+
+
+
+
+ Gets a column by its name.
+
+
+
+
+ Represents an existing column.
+
+
+
+
+ Renames the column.
+
+
+
+
+ Removes the column from its table.
+
+
+
+
+ Alters the column to be a nullable column.
+
+ A new or the old data type of the column.
+
+
+
+ Alters the column to be a nullable column.
+
+ A new or the old data type of the column.
+
+
+
+ Gets the name of the column.
+
+
+
+
+ Gets the name of the table of the column.
+
+
+
+
+ Contains the extensions methods for the interface.
+
+
+
+
+ Specifies the size of the data type of the column.
+
+
+ The length for character data types or the maximum total number of decimal digits for numeric data types.
+
+
+
+ Puts the column under an unique constraint with a default constraint name.
+
+
+
+
+ Sets the default of the column to be the current system time of the database server.
+
+
+
+
+ Visits all commands executed against a and translates them into SQL
+ using a specific .
+
+
+
+
+ Translates the recorded commands on the to SQL commands.
+
+
+
+
+ Represents a SQL data type.
+
+
+
+
+ Initializes a new instance of .
+
+
+
+
+ Used in validation messages and for debugging.
+
+
+
+
+ Gets the length for character data types or the maximum total number of decimal digits for numeric data types.
+
+
+
+
+ Gets the maximum number of decimal digits that can be stored to the right of the decimal point. Scale is a value from 0 through .
+
+
+
+
+ Use this class to configure the behaviour of the .
+
+
+
+
+ Initializes an instance of default options.
+
+
+
+
+ Initializes options that select migrations for specific module only.
+
+ The name of the selected module. Only migrations for this module will be executed.
+
+
+
+ Suppresses validation warnings for the provider called and the data type under the .
+
+
+
+
+ Outputs the SQL used for the migrations to external files without affecting the database.
+
+
+
+
+ Outputs the SQL used for the migrations to external files without affecting the database.
+
+
+
+
+ Outputs the SQL used for the migrations to external files while migrating the database.
+
+
+
+
+ Outputs the SQL used for the migrations to external files while migrating the database.
+
+
+
+
+ Sets the level of general information being traced.
+
+
+
+
+ Sets the level of SQL information being traced.
+
+
+
+
+ Sets the level of performance information being traced.
+
+
+
+
+ Gets or sets the table name of the versioning table.
+
+
+
+
+ Gets the providers that should be supported for all migrations. Compatibility validation of migrations is performed
+ against the providers in this collection.
+
+
+
+
+ Gets or sets a function that selects the module based on its name. Only migrations for this module will be executed.
+
+
+
+
+ Expresses under which circumstances a warning should be expressed for a given and its OfSize parameters.
+
+
+
+
+ Suppresses all warnings for the specified . Use diligently.
+
+
+
+
+ Suppresses warnings for the specified when it is used without a specified size.
+
+
+
+
+ Suppresses warnings for the specified when it is used with a specified size.
+
+
+
+
+ Suppresses warnings for the specified when it is used with a specified size and a specified scale.
+
+
+
+
+ Validates s against the list of supported providers.
+
+
+
+
+ Represents a table that was created before.
+
+
+
+
+ Gets the primary key constraint of the table.
+
+ Optionally, the name of the primary key constraint. If null or empty, the default name will be used.
+
+
+
+ Renames the table.
+
+
+
+
+ Drops the table.
+
+
+
+
+ Adds a primary key constraint to the table.
+
+ Optionally, the primary key constraint name. If null or empty, a default name will be generated.
+
+
+
+ Adds an index to the table.
+
+ Optionally, the index name. If null or empty, a default name will be generated.
+
+
+
+ Adds a foreign key constraint to another table.
+
+ The name of the referenced table.
+ Optionally, the name of the foreign key constraint. If null or empty, a default name will be generated.
+
+
+
+ Adds an unique constraint to the table.
+
+ Optionally, the name of the unique constraint. If null or empty, a default name will be generated.
+
+
+
+ Gets the columns of the table.
+
+
+
+
+ Gets the unique constraints of the table.
+
+
+
+
+ Gets the unique constraints of the table.
+
+
+
+
+ Gets the foreign key constraints of the table.
+
+
+
+
+ Represents a primary key constraint.
+
+
+
+
+ Drops the primary key constraint.
+
+
+
+
+ Renames the primary key constraint and all associated resources (e.g. Oracle maintains an index along with the primary key which is renamed, too).
+
+
+
+
+
+ Returns the longer string.
+
+
+
+
+ Returns the longest string.
+
+
+
+
+ Creates a name with the following structure: '_[0]_[1]_..._'.
+ The contained names are shortened such that the complete generated name fits characters.
+
+ The table name.
+ The postfix to be appended to the name. The postfix will *not* be shortened in any way.
+ The maximum length of the generated name.
+ Additional names that should be included in the result which follow the table name.
+
+
+
+ Event arguments for migration events.
+
+
+
+
+ Initializes a new instance.
+
+
+
+
+ Gets the associated metadata.
+
+
+
+
+ Gets the direction of the migration step.
+
+
+
+
+ Implements a custom bootstrapping logic which is executed if the versioning table of MigSharp doe not exists yet.
+
+
+
+
+ Triggers whatever actions are needed to prepare the custom bootstrapping. This method is called exactly once,
+ before is called any times.
+
+ The connection used to update the versioning table.
+ The transaction used to update the versioning table.
+
+
+
+ Returns true if the migration should be assumed as already executed when bootstrapping the versioning.
+
+
+
+
+ Triggers whatever actions are needed to finish the custom bootstrapping. This method is called exactly once,
+ after is called any times.
+
+ The connection used to update the versioning table.
+ The transaction used to update the versioning table.
+
+
+
+ Contains extension methods for the interface.
+
+
+
+
+ Gets the primary key constraint of the table with the default name.
+
+
+
+
+ Adds a primary key constraint to the table with the default name.
+
+
+
+
+ Adds an index to the table.
+
+
+
+
+ Adds a foreign key constraint to another table with the default name.
+
+
+ The name of the referenced table.
+
+
+
+ Adds an unique constraint to the table with the default name.
+
+
+
+
+ Gets an unique constraint by the name of its first column.
+
+
+
+
+ Gets an foreign key constraint by the name of its referenced table.
+
+
+
+
+ Implements without creating a versioning table until it is really needed.
+
+
+
+
diff --git a/NzbDrone.Core.Test/App.config b/NzbDrone.Core.Test/App.config
index 6e63be8ce..0d29e6625 100644
--- a/NzbDrone.Core.Test/App.config
+++ b/NzbDrone.Core.Test/App.config
@@ -19,5 +19,11 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/Framework/MockLib.cs b/NzbDrone.Core.Test/Framework/MockLib.cs
index 0030f9682..9adc0f271 100644
--- a/NzbDrone.Core.Test/Framework/MockLib.cs
+++ b/NzbDrone.Core.Test/Framework/MockLib.cs
@@ -10,6 +10,7 @@ using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Repository.Quality;
+using PetaPoco;
using SubSonic.DataProviders;
using SubSonic.Repository;
@@ -38,7 +39,7 @@ namespace NzbDrone.Core.Test.Framework
public static IRepository GetEmptyRepository(bool enableLogging = false, string fileName = "")
{
- Console.WriteLine("Creating an empty SQLite database");
+ Console.WriteLine("Creating an empty Subsonic repository");
if (String.IsNullOrWhiteSpace(fileName))
{
@@ -50,7 +51,7 @@ namespace NzbDrone.Core.Test.Framework
var repo = Connection.CreateSimpleRepository(provider);
ForceMigration(repo);
- Migrations.Run(Connection.GetConnectionString(fileName), false);
+ //Migrations.Run(Connection.GetConnectionString(fileName), false);
if (enableLogging)
{
@@ -62,6 +63,24 @@ namespace NzbDrone.Core.Test.Framework
return repo;
}
+ public static IDatabase GetEmptyDatabase(bool enableLogging = false, string fileName = "")
+ {
+ Console.WriteLine("Creating an empty PetaPoco database");
+
+ if (String.IsNullOrWhiteSpace(fileName))
+ {
+ fileName = Guid.NewGuid() + ".db";
+ }
+
+ var connectionString = Connection.GetConnectionString(fileName);
+
+ MigrationsHelper.MigrateDatabase(connectionString);
+
+ var database = Connection.GetPetaPocoDb(connectionString);
+
+ return database;
+ }
+
public static DiskProvider GetStandardDisk(int seasons, int episodes)
{
var mock = new Mock();
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 8776fe479..fbbb24f17 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -36,6 +36,9 @@
True
+
+ ..\packages\Castle.Core.2.5.2\lib\NET35\Castle.Core.dll
+
..\packages\NBuilder.2.3.0.0\lib\FizzWare.NBuilder.dll
@@ -72,11 +75,9 @@
..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll
-
- False
- ..\Libraries\SubSonic.Core.dll
-
+
+
..\Libraries\System.Data.SQLite.dll
diff --git a/NzbDrone.Core.Test/RepoTest.cs b/NzbDrone.Core.Test/RepoTest.cs
index 55852a919..c206d4136 100644
--- a/NzbDrone.Core.Test/RepoTest.cs
+++ b/NzbDrone.Core.Test/RepoTest.cs
@@ -42,7 +42,6 @@ namespace NzbDrone.Core.Test
}
[Test]
- [Ignore]
public void query_scratch_pad()
{
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index bd5086dd6..d8f4a283a 100644
Binary files a/NzbDrone.Core.Test/SeriesProviderTest.cs and b/NzbDrone.Core.Test/SeriesProviderTest.cs differ
diff --git a/NzbDrone.Core.Test/packages.config b/NzbDrone.Core.Test/packages.config
index 764a1f0cd..05e7c4fc9 100644
--- a/NzbDrone.Core.Test/packages.config
+++ b/NzbDrone.Core.Test/packages.config
@@ -7,4 +7,6 @@
+
+
\ No newline at end of file
diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs
index a1e4b894c..8f9e7811f 100644
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@@ -15,6 +15,7 @@ using NzbDrone.Core.Providers.Indexer;
using NzbDrone.Core.Providers.Jobs;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Repository.Quality;
+using PetaPoco;
using SubSonic.DataProviders;
using SubSonic.Repository;
@@ -56,7 +57,7 @@ namespace NzbDrone.Core
LogConfiguration.StartDbLogging();
- Migrations.Run(Connection.MainConnectionString, true);
+ MigrationsHelper.Run(Connection.MainConnectionString, true);
_kernel.Get().SetupDefaultProfiles();
@@ -95,6 +96,7 @@ namespace NzbDrone.Core
_kernel.Bind().ToSelf().InSingletonScope();
_kernel.Bind().ToConstant(Connection.CreateSimpleRepository(Connection.MainConnectionString)).InSingletonScope();
+ _kernel.Bind().ToConstant(Connection.GetPetaPocoDb(Connection.MainConnectionString)).InRequestScope();
_kernel.Bind().ToConstant(Connection.CreateSimpleRepository(Connection.LogConnectionString)).WhenInjectedInto().InSingletonScope();
_kernel.Bind().ToConstant(Connection.CreateSimpleRepository(Connection.LogConnectionString)).WhenInjectedInto().InSingletonScope();
}
diff --git a/NzbDrone.Core/Datastore/Connection.cs b/NzbDrone.Core/Datastore/Connection.cs
index 40abbf572..e8eedf736 100644
--- a/NzbDrone.Core/Datastore/Connection.cs
+++ b/NzbDrone.Core/Datastore/Connection.cs
@@ -1,6 +1,8 @@
using System;
+using System.Data.SQLite;
using System.IO;
using MvcMiniProfiler.Data;
+using PetaPoco;
using SubSonic.DataProviders;
using SubSonic.DataProviders.SQLite;
using SubSonic.Repository;
@@ -53,6 +55,16 @@ namespace NzbDrone.Core.Datastore
return new SimpleRepository(GetDataProvider(connectionString), SimpleRepositoryOptions.RunMigrations);
}
+ public static IDatabase GetPetaPocoDb(string connectionString)
+ {
+ var profileConnection = ProfiledDbConnection.Get(new SQLiteConnection(connectionString));
+ PetaPoco.Database.Mapper = new CustomeMapper();
+ var db = new PetaPoco.Database(profileConnection);
+ db.OpenSharedConnection();
+
+ return db;
+ }
+
}
@@ -67,6 +79,7 @@ namespace NzbDrone.Core.Datastore
public override System.Data.Common.DbConnection CreateConnection(string connectionString)
{
return ProfiledDbConnection.Get(base.CreateConnection(connectionString));
+
}
}
}
diff --git a/NzbDrone.Core/Datastore/CustomeMapper.cs b/NzbDrone.Core/Datastore/CustomeMapper.cs
new file mode 100644
index 000000000..cb993927a
--- /dev/null
+++ b/NzbDrone.Core/Datastore/CustomeMapper.cs
@@ -0,0 +1,33 @@
+using System;
+using PetaPoco;
+
+namespace NzbDrone.Core.Datastore
+{
+ public class CustomeMapper : DefaultMapper
+ {
+ public override Func GetFromDbConverter(DestinationInfo destinationInfo, Type SourceType)
+ {
+
+ if ((SourceType == typeof(Int32) || SourceType == typeof(Int64)) && destinationInfo.Type.IsGenericType && destinationInfo.Type.GetGenericTypeDefinition() == typeof(Nullable<>))
+ {
+ // If it is NULLABLE, then get the underlying type. eg if "Nullable" then this will return just "int"
+ if (destinationInfo.Type.GetGenericArguments()[0].IsEnum)
+ {
+ return delegate(object s)
+ {
+ int value;
+ Int32.TryParse(s.ToString(), out value);
+ if (value == 0)
+ {
+ return null;
+ }
+
+ return (Nullable)value;
+ };
+ }
+ }
+
+ return base.GetFromDbConverter(destinationInfo, SourceType);
+ }
+ }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/Migrations/Legacy/Migration.cs b/NzbDrone.Core/Datastore/Migrations/Legacy/Migration.cs
new file mode 100644
index 000000000..2d5f74f2c
--- /dev/null
+++ b/NzbDrone.Core/Datastore/Migrations/Legacy/Migration.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Migrator.Framework;
+
+namespace NzbDrone.Core.Datastore.Migrations.Legacy
+{
+ [Migration(20110523)]
+ public class Migration20110523 : Migration
+ {
+ public override void Up()
+ {
+ Database.RemoveTable(RepositoryProvider.JobsSchema.Name);
+ }
+
+ public override void Down()
+ {
+ throw new NotImplementedException();
+ }
+ }
+
+ [Migration(20110603)]
+ public class Migration20110603 : Migration
+ {
+ public override void Up()
+ {
+ Database.RemoveTable("Seasons");
+
+ MigrationsHelper.RemoveDeletedColumns(Database);
+ MigrationsHelper.AddNewColumns(Database);
+ }
+
+ public override void Down()
+ {
+ throw new NotImplementedException();
+ }
+ }
+
+ [Migration(20110604)]
+ public class Migration20110604 : Migration
+ {
+ public override void Up()
+ {
+ MigrationsHelper.ForceSubSonicMigration(Connection.CreateSimpleRepository(Connection.MainConnectionString));
+
+ var episodesTable = RepositoryProvider.EpisodesSchema;
+ //Database.AddIndex("idx_episodes_series_season_episode", episodesTable.Name, true,
+ // episodesTable.GetColumnByPropertyName("SeriesId").Name,
+ // episodesTable.GetColumnByPropertyName("SeasonNumber").Name,
+ // episodesTable.GetColumnByPropertyName("EpisodeNumber").Name);
+
+ Database.AddIndex("idx_episodes_series_season", episodesTable.Name, false,
+ episodesTable.GetColumnByPropertyName("SeriesId").Name,
+ episodesTable.GetColumnByPropertyName("SeasonNumber").Name);
+
+ Database.AddIndex("idx_episodes_series", episodesTable.Name, false,
+ episodesTable.GetColumnByPropertyName("SeriesId").Name);
+
+ MigrationsHelper.RemoveDeletedColumns(Database);
+ MigrationsHelper.AddNewColumns(Database);
+ }
+
+ public override void Down()
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/NzbDrone.Core/Datastore/Migrations/MigrationExport.cs b/NzbDrone.Core/Datastore/Migrations/MigrationExport.cs
new file mode 100644
index 000000000..74fef9048
--- /dev/null
+++ b/NzbDrone.Core/Datastore/Migrations/MigrationExport.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using MigSharp;
+
+namespace NzbDrone.Core.Datastore.Migrations
+{
+ [MigrationExport]
+ internal class Migration1 : IMigration
+ {
+ public void Up(IDatabase db)
+ {
+ db.CreateTable("Series")
+ .WithPrimaryKeyColumn("SeriesId", DbType.Int32).AsIdentity()
+ .WithNullableColumn("Title", DbType.String)
+ .WithNullableColumn("CleanTitle", DbType.String)
+ .WithNullableColumn("Status", DbType.String)
+ .WithNullableColumn("Overview", DbType.String)
+ .WithNullableColumn("AirsDayOfWeek", DbType.Int16)
+ .WithNullableColumn("AirTimes", DbType.String)
+ .WithNullableColumn("Language", DbType.String)
+ .WithNotNullableColumn("Path", DbType.String)
+ .WithNotNullableColumn("Monitored", DbType.Boolean)
+ .WithNotNullableColumn("QualityProfileId", DbType.Int16)
+ .WithNotNullableColumn("SeasonFolder", DbType.Boolean)
+ .WithNullableColumn("LastInfoSync", DbType.DateTime)
+ .WithNullableColumn("LastDiskSync", DbType.DateTime);
+ }
+ }
+}
diff --git a/NzbDrone.Core/Datastore/Migrations.cs b/NzbDrone.Core/Datastore/MigrationsHelper.cs
similarity index 63%
rename from NzbDrone.Core/Datastore/Migrations.cs
rename to NzbDrone.Core/Datastore/MigrationsHelper.cs
index b87f8589f..d73acfbc0 100644
--- a/NzbDrone.Core/Datastore/Migrations.cs
+++ b/NzbDrone.Core/Datastore/MigrationsHelper.cs
@@ -5,6 +5,7 @@ using System.Linq;
using System.Reflection;
using System.Text;
using Migrator.Framework;
+using MigSharp;
using NLog;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Repository.Quality;
@@ -14,7 +15,7 @@ using SubSonic.Schema;
namespace NzbDrone.Core.Datastore
{
- public class Migrations
+ public class MigrationsHelper
{
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -27,11 +28,11 @@ namespace NzbDrone.Core.Datastore
Migrator.Migrator migrator;
if (trace)
{
- migrator = new Migrator.Migrator("Sqlite", connetionString, Assembly.GetAssembly(typeof(Migrations)), true, new MigrationLogger());
+ migrator = new Migrator.Migrator("Sqlite", connetionString, Assembly.GetAssembly(typeof(MigrationsHelper)), true, new MigrationLogger());
}
else
{
- migrator = new Migrator.Migrator("Sqlite", connetionString, Assembly.GetAssembly(typeof(Migrations)));
+ migrator = new Migrator.Migrator("Sqlite", connetionString, Assembly.GetAssembly(typeof(MigrationsHelper)));
}
@@ -50,6 +51,13 @@ namespace NzbDrone.Core.Datastore
}
}
+
+ public static void MigrateDatabase(string connectionString)
+ {
+ var migrator = new MigSharp.Migrator(connectionString, ProviderNames.SQLite);
+ migrator.MigrateAll(typeof(MigrationsHelper).Assembly);
+ }
+
public static void ForceSubSonicMigration(IRepository repository)
{
repository.Single(1);
@@ -113,64 +121,5 @@ namespace NzbDrone.Core.Datastore
}
- [Migration(20110523)]
- public class Migration20110523 : Migration
- {
- public override void Up()
- {
- Database.RemoveTable(RepositoryProvider.JobsSchema.Name);
- }
-
- public override void Down()
- {
- throw new NotImplementedException();
- }
- }
-
- [Migration(20110603)]
- public class Migration20110603 : Migration
- {
- public override void Up()
- {
- Database.RemoveTable("Seasons");
-
- Migrations.RemoveDeletedColumns(Database);
- Migrations.AddNewColumns(Database);
- }
- public override void Down()
- {
- throw new NotImplementedException();
- }
- }
-
- [Migration(20110604)]
- public class Migration20110604 : Migration
- {
- public override void Up()
- {
- Migrations.ForceSubSonicMigration(Connection.CreateSimpleRepository(Connection.MainConnectionString));
-
- var episodesTable = RepositoryProvider.EpisodesSchema;
- //Database.AddIndex("idx_episodes_series_season_episode", episodesTable.Name, true,
- // episodesTable.GetColumnByPropertyName("SeriesId").Name,
- // episodesTable.GetColumnByPropertyName("SeasonNumber").Name,
- // episodesTable.GetColumnByPropertyName("EpisodeNumber").Name);
-
- Database.AddIndex("idx_episodes_series_season", episodesTable.Name, false,
- episodesTable.GetColumnByPropertyName("SeriesId").Name,
- episodesTable.GetColumnByPropertyName("SeasonNumber").Name);
-
- Database.AddIndex("idx_episodes_series", episodesTable.Name, false,
- episodesTable.GetColumnByPropertyName("SeriesId").Name);
-
- Migrations.RemoveDeletedColumns(Database);
- Migrations.AddNewColumns(Database);
- }
-
- public override void Down()
- {
- throw new NotImplementedException();
- }
- }
}
\ No newline at end of file
diff --git a/NzbDrone.Core/Models/PetaPoco.cs b/NzbDrone.Core/Models/PetaPoco.cs
new file mode 100644
index 000000000..24555a31c
--- /dev/null
+++ b/NzbDrone.Core/Models/PetaPoco.cs
@@ -0,0 +1,2447 @@
+/* PetaPoco v4.0.2 - A Tiny ORMish thing for your POCO's.
+ * Copyright © 2011 Topten Software. All Rights Reserved.
+ *
+ * Apache License 2.0 - http://www.toptensoftware.com/petapoco/license
+ *
+ * Special thanks to Rob Conery (@robconery) for original inspiration (ie:Massive) and for
+ * use of Subsonic's T4 templates, Rob Sullivan (@DataChomp) for hard core DBA advice
+ * and Adam Schroder (@schotime) for lots of suggestions, improvements and Oracle support
+ */
+
+#define PETAPOCO_NO_DYNAMIC //in your project settings on .NET 3.5
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Configuration;
+using System.Data.Common;
+using System.Data;
+using System.Text.RegularExpressions;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Linq.Expressions;
+
+
+// ReSharper disable
+namespace PetaPoco
+
+{
+ // Poco's marked [Explicit] require all column properties to be marked
+ [AttributeUsage(AttributeTargets.Class)]
+ public class ExplicitColumnsAttribute : Attribute
+ {
+ }
+ // For non-explicit pocos, causes a property to be ignored
+ [AttributeUsage(AttributeTargets.Property)]
+ public class IgnoreAttribute : Attribute
+ {
+ }
+
+ // For explicit pocos, marks property as a column
+ [AttributeUsage(AttributeTargets.Property)]
+ public class ColumnAttribute : Attribute
+ {
+ public ColumnAttribute() { }
+ public ColumnAttribute(string name) { Name = name; }
+ public string Name { get; set; }
+ }
+
+ // For explicit pocos, marks property as a column
+ [AttributeUsage(AttributeTargets.Property)]
+ public class ResultColumnAttribute : ColumnAttribute
+ {
+ public ResultColumnAttribute() { }
+ public ResultColumnAttribute(string name) : base(name) { }
+ }
+
+ // Specify the table name of a poco
+ [AttributeUsage(AttributeTargets.Class)]
+ public class TableNameAttribute : Attribute
+ {
+ public TableNameAttribute(string tableName)
+ {
+ Value = tableName;
+ }
+ public string Value { get; private set; }
+ }
+
+ // Specific the primary key of a poco class (and optional sequence name for Oracle)
+ [AttributeUsage(AttributeTargets.Class)]
+ public class PrimaryKeyAttribute : Attribute
+ {
+ public PrimaryKeyAttribute(string primaryKey)
+ {
+ Value = primaryKey;
+ autoIncrement = true;
+ }
+
+ public string Value { get; private set; }
+ public string sequenceName { get; set; }
+ public bool autoIncrement { get; set; }
+ }
+
+ [AttributeUsage(AttributeTargets.Property)]
+ public class AutoJoinAttribute : Attribute
+ {
+ public AutoJoinAttribute() { }
+ }
+
+ [AttributeUsage(AttributeTargets.Property)]
+ public class VersionColumnAttribute : ColumnAttribute
+ {
+ public VersionColumnAttribute() { }
+ public VersionColumnAttribute(string name) : base(name) { }
+ }
+
+ // Results from paged request
+ public class Page
+ {
+ public long CurrentPage { get; set; }
+ public long TotalPages { get; set; }
+ public long TotalItems { get; set; }
+ public long ItemsPerPage { get; set; }
+ public List Items { get; set; }
+ public object Context { get; set; }
+ }
+
+ // Pass as parameter value to force to DBType.AnsiString
+ public class AnsiString
+ {
+ public AnsiString(string str)
+ {
+ Value = str;
+ }
+ public string Value { get; private set; }
+ }
+
+ // Used by IMapper to override table bindings for an object
+ public class TableInfo
+ {
+ public string TableName { get; set; }
+ public string PrimaryKey { get; set; }
+ public bool AutoIncrement { get; set; }
+ public string SequenceName { get; set; }
+ }
+
+ // Optionally provide and implementation of this to Database.Mapper
+ public interface IMapper
+ {
+ void GetTableInfo(Type t, TableInfo ti);
+ bool MapPropertyToColumn(PropertyInfo pi, ref string columnName, ref bool resultColumn);
+ Func GetFromDbConverter(DestinationInfo destinationInfo, Type SourceType);
+ Func GetToDbConverter(Type SourceType);
+ }
+
+ public class DefaultMapper : IMapper
+ {
+ public virtual void GetTableInfo(Type t, TableInfo ti) { }
+ public virtual bool MapPropertyToColumn(PropertyInfo pi, ref string columnName, ref bool resultColumn)
+ {
+ return true;
+ }
+ public virtual Func GetFromDbConverter(DestinationInfo destinationInfo, Type SourceType)
+ {
+ return null;
+ }
+ public virtual Func GetToDbConverter(Type SourceType)
+ {
+ return null;
+ }
+ }
+
+ public class DestinationInfo
+ {
+ public DestinationInfo(Type type)
+ {
+ Type = type;
+ }
+
+ public DestinationInfo(PropertyInfo propertyInfo)
+ {
+ PropertyInfo = propertyInfo;
+ Type = propertyInfo.PropertyType;
+ }
+
+ public PropertyInfo PropertyInfo { get; private set; }
+ public Type Type { get; private set; }
+ }
+
+ public interface IDatabaseQuery
+ {
+ void OpenSharedConnection();
+ void CloseSharedConnection();
+ int Execute(string sql, params object[] args);
+ int Execute(Sql sql);
+ T ExecuteScalar(string sql, params object[] args);
+ T ExecuteScalar(Sql sql);
+ List Fetch();
+ List Fetch(string sql, params object[] args);
+ List Fetch(Sql sql);
+ List Fetch(long page, long itemsPerPage, string sql, params object[] args);
+ List Fetch(long page, long itemsPerPage, Sql sql);
+ Page Page(long page, long itemsPerPage, string sql, params object[] args);
+ Page Page(long page, long itemsPerPage, Sql sql);
+ List Fetch(Func cb, string sql, params object[] args);
+ List Fetch(Func cb, string sql, params object[] args);
+ List Fetch(Func cb, string sql, params object[] args);
+ IEnumerable Query(Func cb, string sql, params object[] args);
+ IEnumerable Query(Func cb, string sql, params object[] args);
+ IEnumerable Query(Func cb, string sql, params object[] args);
+ List Fetch(Func cb, Sql sql);
+ List Fetch(Func cb, Sql sql);
+ List Fetch(Func cb, Sql sql);
+ IEnumerable Query(Func cb, Sql sql);
+ IEnumerable Query(Func cb, Sql sql);
+ IEnumerable Query(Func cb, Sql sql);
+ List Fetch(string sql, params object[] args);
+ List Fetch(string sql, params object[] args);
+ List Fetch(string sql, params object[] args);
+ IEnumerable Query(string sql, params object[] args);
+ IEnumerable Query(string sql, params object[] args);
+ IEnumerable Query(string sql, params object[] args);
+ IEnumerable Query(Type[] types, object cb, string sql, params object[] args);
+ List Fetch(Sql sql);
+ List Fetch(Sql sql);
+ List Fetch(Sql sql);
+ IEnumerable Query(Sql sql);
+ IEnumerable Query(Sql sql);
+ IEnumerable Query(Sql sql);
+ IEnumerable Query(string sql, params object[] args);
+ IEnumerable Query(Sql sql);
+ T Single(object primaryKey);
+ T SingleOrDefault(object primaryKey);
+ T Single(string sql, params object[] args);
+ T SingleOrDefault(string sql, params object[] args);
+ T First(string sql, params object[] args);
+ T FirstOrDefault(string sql, params object[] args);
+ T Single(Sql sql);
+ T SingleOrDefault(Sql sql);
+ T First(Sql sql);
+ T FirstOrDefault(Sql sql);
+ bool Exists(object primaryKey);
+ int OneTimeCommandTimeout { get; set; }
+ }
+
+ public interface IDatabase : IDatabaseQuery
+ {
+ void Dispose();
+ IDbConnection Connection { get; }
+ Transaction GetTransaction();
+ void BeginTransaction();
+ void AbortTransaction();
+ void CompleteTransaction();
+ object Insert(string tableName, string primaryKeyName, bool autoIncrement, object poco);
+ object Insert(string tableName, string primaryKeyName, object poco);
+ object Insert(object poco);
+ int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue);
+ int Update(string tableName, string primaryKeyName, object poco);
+ int Update(object poco);
+ int Update(object poco, object primaryKeyValue);
+ int Update(string sql, params object[] args);
+ int Update(Sql sql);
+ int Delete(string tableName, string primaryKeyName, object poco);
+ int Delete(string tableName, string primaryKeyName, object poco, object primaryKeyValue);
+ int Delete(object poco);
+ int Delete(string sql, params object[] args);
+ int Delete(Sql sql);
+ int Delete(object pocoOrPrimaryKey);
+ void Save(string tableName, string primaryKeyName, object poco);
+ void Save(object poco);
+ }
+
+ // Database class ... this is where most of the action happens
+ public class Database : IDisposable, IDatabase
+ {
+ public const string MsSqlClientProvider = "System.Data.SqlClient";
+
+ public Database(IDbConnection connection)
+ {
+ _sharedConnection = connection;
+ _connectionString = connection.ConnectionString;
+ _sharedConnectionDepth = 2; // Prevent closing external connection
+ CommonConstruct();
+ }
+
+ public Database(string connectionString, string providerName)
+ {
+ _connectionString = connectionString;
+ _providerName = providerName;
+ CommonConstruct();
+ }
+
+ public Database(string connectionString, DbProviderFactory provider)
+ {
+ _connectionString = connectionString;
+ _factory = provider;
+ CommonConstruct();
+ }
+
+ public Database(string connectionStringName)
+ {
+ // Use first?
+ if (connectionStringName == "")
+ connectionStringName = ConfigurationManager.ConnectionStrings[0].Name;
+
+ // Work out connection string and provider name
+ var providerName = "System.Data.SqlClient";
+ if (ConfigurationManager.ConnectionStrings[connectionStringName] != null)
+ {
+ if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[connectionStringName].ProviderName))
+ providerName = ConfigurationManager.ConnectionStrings[connectionStringName].ProviderName;
+ }
+ else
+ {
+ throw new InvalidOperationException("Can't find a connection string with the name '" + connectionStringName + "'");
+ }
+
+ // Store factory and connection string
+ _connectionString = ConfigurationManager.ConnectionStrings[connectionStringName].ConnectionString;
+ _providerName = providerName;
+ CommonConstruct();
+ }
+
+ enum DBType
+ {
+ SqlServer,
+ SqlServerCE,
+ MySql,
+ PostgreSQL,
+ Oracle,
+ SQLite
+ }
+ DBType _dbType = DBType.SqlServer;
+
+ // Common initialization
+ private void CommonConstruct()
+ {
+ _transactionDepth = 0;
+ ForceDateTimesToUtc = true;
+ EnableAutoSelect = true;
+
+ if (_providerName != null)
+ _factory = DbProviderFactories.GetFactory(_providerName);
+
+ string dbtype = (_factory == null ? _sharedConnection.GetType() : _factory.GetType()).Name;
+ if (dbtype.StartsWith("MySql")) _dbType = DBType.MySql;
+ else if (dbtype.StartsWith("SqlCe")) _dbType = DBType.SqlServerCE;
+ else if (dbtype.StartsWith("Npgsql")) _dbType = DBType.PostgreSQL;
+ else if (dbtype.StartsWith("Oracle")) _dbType = DBType.Oracle;
+ else if (dbtype.StartsWith("SQLite")) _dbType = DBType.SQLite;
+
+ if (_dbType == DBType.MySql && _connectionString != null && _connectionString.IndexOf("Allow User Variables=true") >= 0)
+ _paramPrefix = "?";
+ if (_dbType == DBType.Oracle)
+ _paramPrefix = ":";
+ }
+
+ // Automatically close one open shared connection
+ public void Dispose()
+ {
+ // Automatically close one open connection reference
+ // (Works with KeepConnectionAlive and manually opening a shared connection)
+ CloseSharedConnection();
+ }
+
+ // Set to true to keep the first opened connection alive until this object is disposed
+ public bool KeepConnectionAlive { get; set; }
+
+ // Open a connection (can be nested)
+ public void OpenSharedConnection()
+ {
+ if (_sharedConnectionDepth == 0)
+ {
+ _sharedConnection = _factory.CreateConnection();
+ _sharedConnection.ConnectionString = _connectionString;
+ _sharedConnection.Open();
+
+ if (KeepConnectionAlive)
+ _sharedConnectionDepth++; // Make sure you call Dispose
+ }
+ _sharedConnectionDepth++;
+ }
+
+ // Close a previously opened connection
+ public void CloseSharedConnection()
+ {
+ if (_sharedConnectionDepth > 0)
+ {
+ _sharedConnectionDepth--;
+ if (_sharedConnectionDepth == 0)
+ {
+ _sharedConnection.Dispose();
+ _sharedConnection = null;
+ }
+ }
+ }
+
+ // Access to our shared connection
+ public IDbConnection Connection
+ {
+ get { return _sharedConnection; }
+ }
+
+ // Helper to create a transaction scope
+ public Transaction GetTransaction()
+ {
+ return new Transaction(this);
+ }
+
+ // Use by derived repo generated by T4 templates
+ public virtual void OnBeginTransaction() { }
+ public virtual void OnEndTransaction() { }
+
+ // Start a new transaction, can be nested, every call must be
+ // matched by a call to AbortTransaction or CompleteTransaction
+ // Use `using (var scope=db.Transaction) { scope.Complete(); }` to ensure correct semantics
+ public void BeginTransaction()
+ {
+ _transactionDepth++;
+
+ if (_transactionDepth == 1)
+ {
+ OpenSharedConnection();
+ _transaction = _sharedConnection.BeginTransaction();
+ _transactionCancelled = false;
+ OnBeginTransaction();
+ }
+
+ }
+
+ // Internal helper to cleanup transaction stuff
+ void CleanupTransaction()
+ {
+ OnEndTransaction();
+
+ if (_transactionCancelled)
+ _transaction.Rollback();
+ else
+ _transaction.Commit();
+
+ _transaction.Dispose();
+ _transaction = null;
+
+ CloseSharedConnection();
+ }
+
+ // Abort the entire outer most transaction scope
+ public void AbortTransaction()
+ {
+ _transactionCancelled = true;
+ if ((--_transactionDepth) == 0)
+ CleanupTransaction();
+ }
+
+ // Complete the transaction
+ public void CompleteTransaction()
+ {
+ if ((--_transactionDepth) == 0)
+ CleanupTransaction();
+ }
+
+ // Helper to handle named parameters from object properties
+ static Regex rxParams = new Regex(@"(? args_dest)
+ {
+ return rxParams.Replace(_sql, m =>
+ {
+ string param = m.Value.Substring(1);
+
+ object arg_val;
+
+ int paramIndex;
+ if (int.TryParse(param, out paramIndex))
+ {
+ // Numbered parameter
+ if (paramIndex < 0 || paramIndex >= args_src.Length)
+ throw new ArgumentOutOfRangeException(string.Format("Parameter '@{0}' specified but only {1} parameters supplied (in `{2}`)", paramIndex, args_src.Length, _sql));
+ arg_val = args_src[paramIndex];
+ }
+ else
+ {
+ // Look for a property on one of the arguments with this name
+ bool found = false;
+ arg_val = null;
+ foreach (var o in args_src)
+ {
+ var pi = o.GetType().GetProperty(param);
+ if (pi != null)
+ {
+ arg_val = pi.GetValue(o, null);
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ throw new ArgumentException(string.Format("Parameter '@{0}' specified but none of the passed arguments have a property with this name (in '{1}')", param, _sql));
+ }
+
+ // Expand collections to parameter lists
+ if ((arg_val as System.Collections.IEnumerable) != null &&
+ (arg_val as string) == null &&
+ (arg_val as byte[]) == null)
+ {
+ var sb = new StringBuilder();
+ foreach (var i in arg_val as System.Collections.IEnumerable)
+ {
+ sb.Append((sb.Length == 0 ? "@" : ",@") + args_dest.Count.ToString());
+ args_dest.Add(i);
+ }
+ return sb.ToString();
+ }
+ else
+ {
+ args_dest.Add(arg_val);
+ return "@" + (args_dest.Count - 1).ToString();
+ }
+ }
+ );
+ }
+
+ // Add a parameter to a DB command
+ void AddParam(IDbCommand cmd, object item, string ParameterPrefix)
+ {
+ // Convert value to from poco type to db type
+ if (Database.Mapper != null && item != null)
+ {
+ var fn = Database.Mapper.GetToDbConverter(item.GetType());
+ if (fn != null)
+ item = fn(item);
+ }
+
+ // Support passed in parameters
+ var idbParam = item as IDbDataParameter;
+ if (idbParam != null)
+ {
+ idbParam.ParameterName = string.Format("{0}{1}", ParameterPrefix, cmd.Parameters.Count);
+ cmd.Parameters.Add(idbParam);
+ return;
+ }
+ var p = cmd.CreateParameter();
+ p.ParameterName = string.Format("{0}{1}", ParameterPrefix, cmd.Parameters.Count);
+
+ if (item == null)
+ {
+ p.Value = DBNull.Value;
+ }
+ else
+ {
+ var t = item.GetType();
+ if (t.IsEnum) // PostgreSQL .NET driver wont cast enum to int
+ {
+ p.Value = (int)item;
+ }
+ else if (t == typeof(Guid))
+ {
+ p.Value = item.ToString();
+ p.DbType = DbType.String;
+ p.Size = 40;
+ }
+ else if (t == typeof(string))
+ {
+ p.Size = Math.Max((item as string).Length + 1, 4000); // Help query plan caching by using common size
+ p.Value = item;
+ }
+ else if (t == typeof(AnsiString))
+ {
+ // Thanks @DataChomp for pointing out the SQL Server indexing performance hit of using wrong string type on varchar
+ p.Size = Math.Max((item as AnsiString).Value.Length + 1, 4000);
+ p.Value = (item as AnsiString).Value;
+ p.DbType = DbType.AnsiString;
+ }
+ else if (t == typeof(bool) && _dbType != DBType.PostgreSQL)
+ {
+ p.Value = ((bool)item) ? 1 : 0;
+ }
+ else if (item.GetType().Name == "SqlGeography") //SqlGeography is a CLR Type
+ {
+ p.GetType().GetProperty("UdtTypeName").SetValue(p, "geography", null); //geography is the equivalent SQL Server Type
+ p.Value = item;
+ }
+
+ else if (item.GetType().Name == "SqlGeometry") //SqlGeometry is a CLR Type
+ {
+ p.GetType().GetProperty("UdtTypeName").SetValue(p, "geometry", null); //geography is the equivalent SQL Server Type
+ p.Value = item;
+ }
+ else
+ {
+ p.Value = item;
+ }
+ }
+
+ cmd.Parameters.Add(p);
+ }
+
+ // Create a command
+ static Regex rxParamsPrefix = new Regex(@"(? _paramPrefix + m.Value.Substring(1));
+ sql = sql.Replace("@@", "@"); // <- double @@ escapes a single @
+
+ // Create the command and add parameters
+ IDbCommand cmd = _factory == null ? connection.CreateCommand() : _factory.CreateCommand();
+ cmd.Connection = connection;
+ cmd.CommandText = sql;
+ cmd.Transaction = _transaction;
+
+ foreach (var item in args)
+ {
+ AddParam(cmd, item, _paramPrefix);
+ }
+
+ if (_dbType == DBType.Oracle)
+ {
+ cmd.GetType().GetProperty("BindByName").SetValue(cmd, true, null);
+ }
+
+ if (!String.IsNullOrEmpty(sql))
+ DoPreExecute(cmd);
+
+ return cmd;
+ }
+
+ // Create a command
+ IDbCommand CreateCommand(IDbConnection connection, string sql, params object[] args)
+ {
+ var sqlStatement = new Sql(sql, args);
+ return CreateCommand(connection, sqlStatement);
+ }
+
+ // Override this to log/capture exceptions
+ public virtual void OnException(Exception x)
+ {
+ System.Diagnostics.Debug.WriteLine(x.ToString());
+ System.Diagnostics.Debug.WriteLine(LastCommand);
+ }
+
+ // Override this to log commands, or modify command before execution
+ public virtual void OnExecutingCommand(IDbCommand cmd) { }
+ public virtual void OnExecutedCommand(IDbCommand cmd) { }
+
+ // Execute a non-query command
+ public int Execute(string sql, params object[] args)
+ {
+ return Execute(new Sql(sql, args));
+ }
+
+ public int Execute(Sql sql)
+ {
+ try
+ {
+ OpenSharedConnection();
+ try
+ {
+ using (var cmd = CreateCommand(_sharedConnection, sql))
+ {
+ var result = cmd.ExecuteNonQuery();
+ OnExecutedCommand(cmd);
+ return result;
+ }
+ }
+ finally
+ {
+ CloseSharedConnection();
+ }
+ }
+ catch (Exception x)
+ {
+ OnException(x);
+ throw;
+ }
+ }
+
+ // Execute and cast a scalar property
+ public T ExecuteScalar(string sql, params object[] args)
+ {
+ return ExecuteScalar(new Sql(sql, args));
+ }
+
+ public T ExecuteScalar(Sql sql)
+ {
+ try
+ {
+ OpenSharedConnection();
+ try
+ {
+ using (var cmd = CreateCommand(_sharedConnection, sql))
+ {
+ object val = cmd.ExecuteScalar();
+ OnExecutedCommand(cmd);
+ return (T)Convert.ChangeType(val, typeof(T));
+ }
+ }
+ finally
+ {
+ CloseSharedConnection();
+ }
+ }
+ catch (Exception x)
+ {
+ OnException(x);
+ throw;
+ }
+ }
+
+ Regex rxSelect = new Regex(@"\A\s*(SELECT|EXECUTE|CALL)\s", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Multiline);
+ Regex rxFrom = new Regex(@"\A\s*FROM\s", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Multiline);
+ string AddSelectClause(string sql)
+ {
+ if (sql.StartsWith(";"))
+ return sql.Substring(1);
+
+ if (!rxSelect.IsMatch(sql))
+ {
+ var pd = PocoData.ForType(typeof(T));
+ var tableName = EscapeTableName(pd.TableInfo.TableName);
+ string cols = string.Join(", ", (from c in pd.QueryColumns select EscapeSqlIdentifier(c)).ToArray());
+ if (!rxFrom.IsMatch(sql))
+ sql = string.Format("SELECT {0} FROM {1} {2}", cols, tableName, sql);
+ else
+ sql = string.Format("SELECT {0} {1}", cols, sql);
+ }
+ return sql;
+ }
+
+ public bool ForceDateTimesToUtc { get; set; }
+ public bool EnableAutoSelect { get; set; }
+
+ // Return a typed list of pocos
+ public List Fetch(string sql, params object[] args)
+ {
+ if (EnableAutoSelect)
+ sql = AddSelectClause(sql);
+
+ return Fetch(new Sql(sql, args));
+ }
+
+ public List Fetch(Sql sql)
+ {
+ return Query(sql).ToList();
+ }
+
+ public List Fetch(long page, long itemsPerPage, string sql, params object[] args)
+ {
+ string sqlCount, sqlPage;
+ BuildPageQueries(page, itemsPerPage, sql, ref args, out sqlCount, out sqlPage);
+ return Fetch(sqlPage, args);
+ }
+
+ public List Fetch(long page, long itemsPerPage, Sql sql)
+ {
+ return Fetch(page, itemsPerPage, sql.SQL, sql.Arguments);
+ }
+
+ public List Fetch()
+ {
+ return Fetch(AddSelectClause(""));
+ }
+
+ static Regex rxColumns = new Regex(@"\A\s*SELECT\s+((?:\((?>\((?)|\)(?<-depth>)|.?)*(?(depth)(?!))\)|.)*?)(?\((?)|\)(?<-depth>)|.?)*(?(depth)(?!))\)|[\w\(\)\.])+(?:\s+(?:ASC|DESC))?(?:\s*,\s*(?:\((?>\((?)|\)(?<-depth>)|.?)*(?(depth)(?!))\)|[\w\(\)\.])+(?:\s+(?:ASC|DESC))?)*", RegexOptions.IgnoreCase | RegexOptions.Multiline | RegexOptions.Singleline | RegexOptions.Compiled);
+ public static bool SplitSqlForPaging(string sql, out string sqlCount, out string sqlSelectRemoved, out string sqlOrderBy)
+ {
+ sqlSelectRemoved = null;
+ sqlCount = null;
+ sqlOrderBy = null;
+
+ // Extract the columns from "SELECT FROM"
+ var m = rxColumns.Match(sql);
+ if (!m.Success)
+ return false;
+
+ // Save column list and replace with COUNT(*)
+ Group g = m.Groups[1];
+ sqlCount = sql.Substring(0, g.Index) + "COUNT(*) " + sql.Substring(g.Index + g.Length);
+ sqlSelectRemoved = sql.Substring(g.Index);
+
+ // Look for an "ORDER BY " clause
+ m = rxOrderBy.Match(sqlCount);
+ if (!m.Success)
+ return false;
+
+ g = m.Groups[0];
+ sqlOrderBy = g.ToString();
+ sqlCount = sqlCount.Substring(0, g.Index) + sqlCount.Substring(g.Index + g.Length);
+
+ return true;
+ }
+
+ public void BuildPageQueries(long page, long itemsPerPage, string sql, ref object[] args, out string sqlCount, out string sqlPage)
+ {
+ // Add auto select clause
+ sql = AddSelectClause(sql);
+
+ // Split the SQL into the bits we need
+ string sqlSelectRemoved, sqlOrderBy;
+ if (!SplitSqlForPaging(sql, out sqlCount, out sqlSelectRemoved, out sqlOrderBy))
+ throw new Exception("Unable to parse SQL statement for paged query");
+ if (_dbType == DBType.Oracle && sqlSelectRemoved.StartsWith("*"))
+ throw new Exception("Query must alias '*' when performing a paged query.\neg. select t.* from table t order by t.id");
+
+ // Build the SQL for the actual final result
+ if (_dbType == DBType.SqlServer || _dbType == DBType.Oracle)
+ {
+ sqlSelectRemoved = rxOrderBy.Replace(sqlSelectRemoved, "");
+ sqlPage = string.Format("SELECT * FROM (SELECT ROW_NUMBER() OVER ({0}) peta_rn, {1}) peta_paged WHERE peta_rn>@{2} AND peta_rn<=@{3}",
+ sqlOrderBy, sqlSelectRemoved, args.Length, args.Length + 1);
+ args = args.Concat(new object[] { (page - 1) * itemsPerPage, page * itemsPerPage }).ToArray();
+ }
+ else if (_dbType == DBType.SqlServerCE)
+ {
+ sqlPage = string.Format("{0}\nOFFSET @{1} ROWS FETCH NEXT @{2} ROWS ONLY", sql, args.Length, args.Length + 1);
+ args = args.Concat(new object[] { (page - 1) * itemsPerPage, itemsPerPage }).ToArray();
+ }
+ else
+ {
+ sqlPage = string.Format("{0}\nLIMIT @{1} OFFSET @{2}", sql, args.Length, args.Length + 1);
+ args = args.Concat(new object[] { itemsPerPage, (page - 1) * itemsPerPage }).ToArray();
+ }
+
+ }
+
+ // Fetch a page
+ public Page Page(long page, long itemsPerPage, string sql, params object[] args)
+ {
+ string sqlCount, sqlPage;
+ BuildPageQueries(page, itemsPerPage, sql, ref args, out sqlCount, out sqlPage);
+
+ // Save the one-time command time out and use it for both queries
+ int saveTimeout = OneTimeCommandTimeout;
+
+ // Setup the paged result
+ var result = new Page();
+ result.CurrentPage = page;
+ result.ItemsPerPage = itemsPerPage;
+ result.TotalItems = ExecuteScalar(sqlCount, args);
+ result.TotalPages = result.TotalItems / itemsPerPage;
+ if ((result.TotalItems % itemsPerPage) != 0)
+ result.TotalPages++;
+
+ OneTimeCommandTimeout = saveTimeout;
+
+ // Get the records
+ result.Items = Fetch(sqlPage, args);
+
+ // Done
+ return result;
+ }
+
+ public Page Page(long page, long itemsPerPage, Sql sql)
+ {
+ return Page(page, itemsPerPage, sql.SQL, sql.Arguments);
+ }
+
+ // Return an enumerable collection of pocos
+ public IEnumerable Query(string sql, params object[] args)
+ {
+ if (EnableAutoSelect)
+ sql = AddSelectClause(sql);
+
+ return Query(new Sql(sql, args));
+ }
+
+ public IEnumerable Query(Sql sql)
+ {
+ OpenSharedConnection();
+ try
+ {
+ using (var cmd = CreateCommand(_sharedConnection, sql))
+ {
+ IDataReader r;
+ var pd = PocoData.ForType(typeof(T));
+ try
+ {
+ if (_sharedConnection.State != ConnectionState.Open)
+ _sharedConnection.Open();
+
+ r = cmd.ExecuteReader();
+ OnExecutedCommand(cmd);
+ }
+ catch (Exception x)
+ {
+ OnException(x);
+ throw;
+ }
+
+ using (r)
+ {
+ var factory = pd.GetFactory(cmd.CommandText, _sharedConnection.ConnectionString, ForceDateTimesToUtc, 0, r.FieldCount, r) as Func;
+ while (true)
+ {
+ T poco;
+ try
+ {
+ if (!r.Read())
+ yield break;
+ poco = factory(r);
+ }
+ catch (Exception x)
+ {
+ OnException(x);
+ throw;
+ }
+
+ yield return poco;
+ }
+ }
+ }
+ }
+ finally
+ {
+ CloseSharedConnection();
+ }
+ }
+
+ // Multi Fetch
+ public List Fetch(Func cb, string sql, params object[] args) { return Query(cb, sql, args).ToList(); }
+ public List Fetch(Func cb, string sql, params object[] args) { return Query(cb, sql, args).ToList(); }
+ public List Fetch(Func cb, string sql, params object[] args) { return Query(cb, sql, args).ToList(); }
+
+ // Multi Query
+ public IEnumerable Query(Func cb, string sql, params object[] args) { return Query(new Type[] { typeof(T1), typeof(T2) }, cb, sql, args); }
+ public IEnumerable Query(Func cb, string sql, params object[] args) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3) }, cb, sql, args); }
+ public IEnumerable Query(Func cb, string sql, params object[] args) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4) }, cb, sql, args); }
+
+ // Multi Fetch (SQL builder)
+ public List Fetch(Func cb, Sql sql) { return Query(cb, sql.SQL, sql.Arguments).ToList(); }
+ public List Fetch(Func cb, Sql sql) { return Query(cb, sql.SQL, sql.Arguments).ToList(); }
+ public List Fetch(Func cb, Sql sql) { return Query(cb, sql.SQL, sql.Arguments).ToList(); }
+
+ // Multi Query (SQL builder)
+ public IEnumerable Query(Func cb, Sql sql) { return Query(new Type[] { typeof(T1), typeof(T2) }, cb, sql.SQL, sql.Arguments); }
+ public IEnumerable Query(Func cb, Sql sql) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3) }, cb, sql.SQL, sql.Arguments); }
+ public IEnumerable Query(Func cb, Sql sql) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4) }, cb, sql.SQL, sql.Arguments); }
+
+ // Multi Fetch (Simple)
+ public List Fetch(string sql, params object[] args) { return Query(sql, args).ToList(); }
+ public List Fetch(string sql, params object[] args) { return Query(sql, args).ToList(); }
+ public List Fetch(string sql, params object[] args) { return Query(sql, args).ToList(); }
+
+ // Multi Query (Simple)
+ public IEnumerable Query(string sql, params object[] args) { return Query(new Type[] { typeof(T1), typeof(T2) }, null, sql, args); }
+ public IEnumerable Query(string sql, params object[] args) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3) }, null, sql, args); }
+ public IEnumerable Query(string sql, params object[] args) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4) }, null, sql, args); }
+
+ // Multi Fetch (Simple) (SQL builder)
+ public List Fetch(Sql sql) { return Query(sql.SQL, sql.Arguments).ToList(); }
+ public List Fetch(Sql sql) { return Query(sql.SQL, sql.Arguments).ToList(); }
+ public List Fetch(Sql sql) { return Query(sql.SQL, sql.Arguments).ToList(); }
+
+ // Multi Query (Simple) (SQL builder)
+ public IEnumerable Query(Sql sql) { return Query(new Type[] { typeof(T1), typeof(T2) }, null, sql.SQL, sql.Arguments); }
+ public IEnumerable Query(Sql sql) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3) }, null, sql.SQL, sql.Arguments); }
+ public IEnumerable Query(Sql sql) { return Query(new Type[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4) }, null, sql.SQL, sql.Arguments); }
+
+ // Automagically guess the property relationships between various POCOs and create a delegate that will set them up
+ object GetAutoMapper(Type[] types)
+ {
+ // Build a key
+ var kb = new StringBuilder();
+ foreach (var t in types)
+ {
+ kb.Append(t.ToString());
+ kb.Append(":");
+ }
+ var key = kb.ToString();
+
+ // Check cache
+ RWLock.EnterReadLock();
+ try
+ {
+ object mapper;
+ if (AutoMappers.TryGetValue(key, out mapper))
+ return mapper;
+ }
+ finally
+ {
+ RWLock.ExitReadLock();
+ }
+
+ // Create it
+ RWLock.EnterWriteLock();
+ try
+ {
+ // Try again
+ object mapper;
+ if (AutoMappers.TryGetValue(key, out mapper))
+ return mapper;
+
+ // Create a method
+ var m = new DynamicMethod("petapoco_automapper", types[0], types, true);
+ var il = m.GetILGenerator();
+
+ for (int i = 1; i < types.Length; i++)
+ {
+ bool handled = false;
+ for (int j = i - 1; j >= 0; j--)
+ {
+ // Find the property
+ var candidates = from p in types[j].GetProperties() where p.PropertyType == types[i] select p;
+ if (candidates.Count() == 0)
+ continue;
+ if (candidates.Count() > 1)
+ throw new InvalidOperationException(string.Format("Can't auto join {0} as {1} has more than one property of type {0}", types[i], types[j]));
+
+ // Generate code
+ il.Emit(OpCodes.Ldarg_S, j);
+ il.Emit(OpCodes.Ldarg_S, i);
+ il.Emit(OpCodes.Callvirt, candidates.First().GetSetMethod(true));
+ handled = true;
+ }
+
+ if (!handled)
+ throw new InvalidOperationException(string.Format("Can't auto join {0}", types[i]));
+ }
+
+ il.Emit(OpCodes.Ldarg_0);
+ il.Emit(OpCodes.Ret);
+
+ // Cache it
+ var del = m.CreateDelegate(Expression.GetFuncType(types.Concat(types.Take(1)).ToArray()));
+ AutoMappers.Add(key, del);
+ return del;
+ }
+ finally
+ {
+ RWLock.ExitWriteLock();
+ }
+ }
+
+ // Find the split point in a result set for two different pocos and return the poco factory for the first
+ Delegate FindSplitPoint(Type typeThis, Type typeNext, string sql, IDataReader r, ref int pos)
+ {
+ // Last?
+ if (typeNext == null)
+ return PocoData.ForType(typeThis).GetFactory(sql, _sharedConnection.ConnectionString, ForceDateTimesToUtc, pos, r.FieldCount - pos, r);
+
+ // Get PocoData for the two types
+ PocoData pdThis = PocoData.ForType(typeThis);
+ PocoData pdNext = PocoData.ForType(typeNext);
+
+ // Find split point
+ int firstColumn = pos;
+ var usedColumns = new Dictionary();
+ for (; pos < r.FieldCount; pos++)
+ {
+ // Split if field name has already been used, or if the field doesn't exist in current poco but does in the next
+ string fieldName = r.GetName(pos);
+ if (usedColumns.ContainsKey(fieldName) || (!pdThis.Columns.ContainsKey(fieldName) && pdNext.Columns.ContainsKey(fieldName)))
+ {
+ return pdThis.GetFactory(sql, _sharedConnection.ConnectionString, ForceDateTimesToUtc, firstColumn, pos - firstColumn, r);
+ }
+ usedColumns.Add(fieldName, true);
+ }
+
+ throw new InvalidOperationException(string.Format("Couldn't find split point between {0} and {1}", typeThis, typeNext));
+ }
+
+ // Instance data used by the Multipoco factory delegate - essentially a list of the nested poco factories to call
+ class MultiPocoFactory
+ {
+ public List m_Delegates;
+ public Delegate GetItem(int index) { return m_Delegates[index]; }
+ }
+
+ // Create a multi-poco factory
+ Func CreateMultiPocoFactory(Type[] types, string sql, IDataReader r)
+ {
+ var m = new DynamicMethod("petapoco_multipoco_factory", typeof(TRet), new Type[] { typeof(MultiPocoFactory), typeof(IDataReader), typeof(object) }, typeof(MultiPocoFactory));
+ var il = m.GetILGenerator();
+
+ // Load the callback
+ il.Emit(OpCodes.Ldarg_2);
+
+ // Call each delegate
+ var dels = new List();
+ int pos = 0;
+ for (int i = 0; i < types.Length; i++)
+ {
+ // Add to list of delegates to call
+ var del = FindSplitPoint(types[i], i + 1 < types.Length ? types[i + 1] : null, sql, r, ref pos);
+ dels.Add(del);
+
+ // Get the delegate
+ il.Emit(OpCodes.Ldarg_0); // callback,this
+ il.Emit(OpCodes.Ldc_I4, i); // callback,this,Index
+ il.Emit(OpCodes.Callvirt, typeof(MultiPocoFactory).GetMethod("GetItem")); // callback,Delegate
+ il.Emit(OpCodes.Ldarg_1); // callback,delegate, datareader
+
+ // Call Invoke
+ var tDelInvoke = del.GetType().GetMethod("Invoke");
+ il.Emit(OpCodes.Callvirt, tDelInvoke); // Poco left on stack
+ }
+
+ // By now we should have the callback and the N pocos all on the stack. Call the callback and we're done
+ il.Emit(OpCodes.Callvirt, Expression.GetFuncType(types.Concat(new Type[] { typeof(TRet) }).ToArray()).GetMethod("Invoke"));
+ il.Emit(OpCodes.Ret);
+
+ // Finish up
+ return (Func)m.CreateDelegate(typeof(Func