In the JobParameter table, make sure we can't store multiple rows of the same parameter name for a given job id. Added an index.

Xavier Jefferson · Xavier Jefferson · commit 97d0ae8443bf · 2019-03-11T08:15:53.000-07:00
diff --git a/Hangfire.FluentNHibernate.SampleApplication/packages.config b/Hangfire.FluentNHibernate.SampleApplication/packages.config
@@ -13,7 +13,7 @@
 	<package id="Npgsql" version="3.2.6" targetFramework="net452" />
 	<package id="Oracle.ManagedDataAccess" version="12.2.1100" targetFramework="net452" />
 	<package id="Owin" version="1.0" targetFramework="net45" />
-	<package id="Snork.FluentNHibernateTools" version="1.1.6600" targetFramework="net452" />
+	<package id="Snork.FluentNHibernateTools" version="1.1.8650" targetFramework="net452" />
 	<package id="System.Data.SQLite" version="1.0.106.0" targetFramework="net452" />
 	<package id="System.Data.SQLite.Core" version="1.0.106.0" targetFramework="net452" />
 	<package id="System.Data.SQLite.EF6" version="1.0.106.0" targetFramework="net452" />
diff --git a/Hangfire.FluentNHibernateStorage.Tests/FluentNHibernateStorageConnectionTests.cs b/Hangfire.FluentNHibernateStorage.Tests/FluentNHibernateStorageConnectionTests.cs
@@ -163,7 +163,7 @@ public void CreateExpiredJob_CreatesAJobInTheStorage_AndSetsItsParameters()
                 var job = invocationData.Deserialize();
                 Assert.Equal(typeof(FluentNHibernateStorageConnectionTests), job.Type);
                 Assert.Equal("SampleMethod", job.Method.Name);
-                Assert.Equal("\"Hello\"", job.Arguments[0]);
+                Assert.Equal("\"Hello\"", job.Args[0]);
 
                 Assert.True(createdAt.AddDays(1).AddMinutes(-1) < sqlJob.ExpireAt);
                 Assert.True(sqlJob.ExpireAt < createdAt.AddDays(1).AddMinutes(1));
diff --git a/Hangfire.FluentNHibernateStorage.Tests/FluentNHibernateStorageTests.cs b/Hangfire.FluentNHibernateStorage.Tests/FluentNHibernateStorageTests.cs
@@ -11,7 +11,7 @@ public class FluentNHibernateStorageTests : IClassFixture<TestDatabaseFixture>
     {
         public FluentNHibernateStorageTests()
         {
-            _options = new FluentNHibernateStorageOptions {PrepareSchemaIfNecessary = false};
+            _options = new FluentNHibernateStorageOptions {UpdateSchema = false};
         }
 
         private readonly FluentNHibernateStorageOptions _options;
diff --git a/Hangfire.FluentNHibernateStorage.Tests/JobQueue/FluentNHibernateFetchedJobTests.cs b/Hangfire.FluentNHibernateStorage.Tests/JobQueue/FluentNHibernateFetchedJobTests.cs
@@ -11,7 +11,7 @@ public FluentNHibernateFetchedJobTests()
         {
             _fetchedJob = new FetchedJob {Id = _id, JobId = JobId, Queue = Queue};
 
-            var options = new FluentNHibernateStorageOptions {PrepareSchemaIfNecessary = false};
+            var options = new FluentNHibernateStorageOptions {UpdateSchema = false};
             _storage = new Mock<FluentNHibernateJobStorage>(ConnectionUtils.GetPersistenceConfigurer(), options);
         }
 
diff --git a/Hangfire.FluentNHibernateStorage.Tests/StorageOptionsTests.cs b/Hangfire.FluentNHibernateStorage.Tests/StorageOptionsTests.cs
@@ -11,9 +11,9 @@ public void Ctor_SetsTheDefaultOptions()
             var options = new FluentNHibernateStorageOptions();
 
             Assert.True(options.QueuePollInterval > TimeSpan.Zero);
-            Assert.True(options.InvisibilityTimeout > TimeSpan.Zero);
+            
             Assert.True(options.JobExpirationCheckInterval > TimeSpan.Zero);
-            Assert.True(options.PrepareSchemaIfNecessary);
+            Assert.True(options.UpdateSchema);
         }
 
         [Fact]
diff --git a/Hangfire.FluentNHibernateStorage.Tests/Utils/CleanDatabaseAttribute.cs b/Hangfire.FluentNHibernateStorage.Tests/Utils/CleanDatabaseAttribute.cs
@@ -8,7 +8,7 @@ public class CleanDatabaseAttribute : BeforeAfterTestAttribute
     {
         private readonly IsolationLevel _isolationLevel;
 
-        private TransactionScope _transaction;
+        
 
         public CleanDatabaseAttribute(
             IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)
diff --git a/Hangfire.FluentNHibernateStorage.Tests/packages.config b/Hangfire.FluentNHibernateStorage.Tests/packages.config
@@ -6,7 +6,7 @@
 	<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
 	<package id="Newtonsoft.Json" version="5.0.1" targetFramework="net45" />
 	<package id="NHibernate" version="4.0.0.4000" targetFramework="net45" />
-	<package id="Snork.FluentNHibernateTools" version="1.1.6600" targetFramework="net45" />
+	<package id="Snork.FluentNHibernateTools" version="1.1.8650" targetFramework="net45" />
 	<package id="xunit" version="2.1.0" targetFramework="net45" />
 	<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
 	<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
diff --git a/Hangfire.FluentNHibernateStorage/Maps/_JobParameterMap.cs b/Hangfire.FluentNHibernateStorage/Maps/_JobParameterMap.cs
@@ -7,8 +7,8 @@ internal class _JobParameterMap : Int32IdMapBase<_JobParameter>
         public _JobParameterMap()
         {
             Table("Hangfire_JobParameter".WrapObjectName());
-            References(i => i.Job).Column(Constants.ColumnNames.JobId.WrapObjectName()).Not.Nullable().Cascade.Delete();
-            Map(i => i.Name).Column("Name".WrapObjectName()).Length(40).Not.Nullable();
+            References(i => i.Job).Column(Constants.ColumnNames.JobId.WrapObjectName()).Not.Nullable().Cascade.Delete().UniqueKey("a");
+            Map(i => i.Name).Column("Name".WrapObjectName()).Length(40).Not.Nullable().UniqueKey("a");
             Map(i => i.Value).Column("Value".WrapObjectName()).Length(Constants.VarcharMaxLength).Nullable();
         }
     }
diff --git a/Hangfire.FluentNHibernateStorage/packages.config b/Hangfire.FluentNHibernateStorage/packages.config
@@ -7,5 +7,5 @@
 	<package id="Newtonsoft.Json" version="5.0.1" targetFramework="net45" />
 	<package id="NHibernate" version="4.0.0.4000" targetFramework="net45" />
 	<package id="Owin" version="1.0" targetFramework="net45" />
-	<package id="Snork.FluentNHibernateTools" version="1.1.6600" targetFramework="net45" />
+	<package id="Snork.FluentNHibernateTools" version="1.1.8650" targetFramework="net45" />
 </packages>
diff --git a/nuspecs/Hangfire.FluentNHibernateStorage.nuspec b/nuspecs/Hangfire.FluentNHibernateStorage.nuspec
@@ -3,7 +3,7 @@
 <package>
   <metadata>
     <id>Hangfire.FluentNHibernateStorage</id>
-    <version>1.1.2105</version>
+    <version>1.1.2110</version>
     <authors>Xavier Jefferson</authors>
     <owners>XavierJefferson</owners>
     <licenseUrl>https://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A Hangfire storage provider for SQL Server, MySQL, Oracle, DB/2, PostgreSQL, and Firebird</description>
     <releaseNotes>
-       In the FluentNHibernateStorageOptions class, obsolete the PrepareSchemaIfNecessary property in favor of the UpdateSchema property.  Both will still work.
+       In the JobParameter table, make sure we can't store multiple rows of the same parameter name for a given job id.  Added an index.
     </releaseNotes>
     <copyright>Copyright © 2019 Xavier Jefferson</copyright>
     <tags>hangfire storage provider mssql mysql oracle postgresql firebird db2</tags>
@@ -23,7 +23,7 @@
 		<dependency id="Newtonsoft.Json" version="5.0.1"   />
 		<dependency id="NHibernate" version="4.0.0.4000"  />
 		<dependency id="Owin" version="1.0"  />
-    <dependency id="Snork.FluentNHibernateTools" version="1.1.6600" />
+    <dependency id="Snork.FluentNHibernateTools" version="1.1.8650" />
     </dependencies>
 
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class FluentNHibernateStorageTests : IClassFixture<TestDatabaseFixture>`
`11`	`11`	`{`
`12`	`12`	`public FluentNHibernateStorageTests()`
`13`	`13`	`{`
`14`		`- _options = new FluentNHibernateStorageOptions {PrepareSchemaIfNecessary = false};`
	`14`	`+ _options = new FluentNHibernateStorageOptions {UpdateSchema = false};`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`private readonly FluentNHibernateStorageOptions _options;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public FluentNHibernateFetchedJobTests()`
`11`	`11`	`{`
`12`	`12`	`_fetchedJob = new FetchedJob {Id = _id, JobId = JobId, Queue = Queue};`
`13`	`13`
`14`		`- var options = new FluentNHibernateStorageOptions {PrepareSchemaIfNecessary = false};`
	`14`	`+ var options = new FluentNHibernateStorageOptions {UpdateSchema = false};`
`15`	`15`	`_storage = new Mock<FluentNHibernateJobStorage>(ConnectionUtils.GetPersistenceConfigurer(), options);`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class CleanDatabaseAttribute : BeforeAfterTestAttribute`
`8`	`8`	`{`
`9`	`9`	`private readonly IsolationLevel _isolationLevel;`
`10`	`10`
`11`		`- private TransactionScope _transaction;`
	`11`	`+`
`12`	`12`
`13`	`13`	`public CleanDatabaseAttribute(`
`14`	`14`	`IsolationLevel isolationLevel = IsolationLevel.ReadCommitted)`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ internal class _JobParameterMap : Int32IdMapBase<_JobParameter>`
`7`	`7`	`public _JobParameterMap()`
`8`	`8`	`{`
`9`	`9`	`Table("Hangfire_JobParameter".WrapObjectName());`
`10`		`- References(i => i.Job).Column(Constants.ColumnNames.JobId.WrapObjectName()).Not.Nullable().Cascade.Delete();`
`11`		`- Map(i => i.Name).Column("Name".WrapObjectName()).Length(40).Not.Nullable();`
	`10`	`+ References(i => i.Job).Column(Constants.ColumnNames.JobId.WrapObjectName()).Not.Nullable().Cascade.Delete().UniqueKey("a");`
	`11`	`+ Map(i => i.Name).Column("Name".WrapObjectName()).Length(40).Not.Nullable().UniqueKey("a");`
`12`	`12`	`Map(i => i.Value).Column("Value".WrapObjectName()).Length(Constants.VarcharMaxLength).Nullable();`
`13`	`13`	`}`
`14`	`14`	`}`