Index: Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsCreateScript.cs
===================================================================
diff -u -r22d820ab9e0333ce64e9ea74ac19867042906298 -rf21480a6b28a6637ecab0e2dd3e75240cabd9c9a
--- Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsCreateScript.cs	(.../RingtoetsCreateScript.cs)	(revision 22d820ab9e0333ce64e9ea74ac19867042906298)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration/RingtoetsCreateScript.cs	(.../RingtoetsCreateScript.cs)	(revision f21480a6b28a6637ecab0e2dd3e75240cabd9c9a)
@@ -32,6 +32,8 @@
     /// </summary>
     public class RingtoetsCreateScript : CreateScript
     {
+        private readonly string createQuery;
+
         /// <summary>
         /// Creates a new instance of the <see cref="RingtoetsCreateScript"/> class.
         /// </summary>
@@ -42,7 +44,14 @@
         /// <item><paramref name="version"/> is empty or <c>null</c>,</item>
         /// <item><paramref name="query"/> is empty, <c>null</c>, or consist out of only whitespace characters.</item>
         /// </list></exception>
-        public RingtoetsCreateScript(string version, string query) : base(version, query) {}
+        public RingtoetsCreateScript(string version, string query) : base(version)
+        {
+            if (string.IsNullOrWhiteSpace(query))
+            {
+                throw new ArgumentException(@"Query must have a value.", nameof(query));
+            }
+            createQuery = query;
+        }
 
         protected override IVersionedFile GetEmptyVersionedFile(string location)
         {
@@ -51,7 +60,7 @@
                 using (var databaseFile = new RingtoetsDatabaseFile(location))
                 {
                     databaseFile.OpenDatabaseConnection();
-                    databaseFile.ExecuteQuery(CreateQuery);
+                    databaseFile.ExecuteQuery(createQuery);
                 }
                 return new RingtoetsVersionedFile(location);
             }
Index: Migration/Scripts/src/Migration.Scripts.Data/CreateScript.cs
===================================================================
diff -u -rf53b3c70d87b9e66c3a46981b8d8a471b95e2adc -rf21480a6b28a6637ecab0e2dd3e75240cabd9c9a
--- Migration/Scripts/src/Migration.Scripts.Data/CreateScript.cs	(.../CreateScript.cs)	(revision f53b3c70d87b9e66c3a46981b8d8a471b95e2adc)
+++ Migration/Scripts/src/Migration.Scripts.Data/CreateScript.cs	(.../CreateScript.cs)	(revision f21480a6b28a6637ecab0e2dd3e75240cabd9c9a)
@@ -30,31 +30,21 @@
     /// </summary>
     public abstract class CreateScript
     {
-        protected readonly string CreateQuery;
         private readonly string version;
 
         /// <summary>
         /// Creates a new instance of the <see cref="CreateScript"/> class.
         /// </summary>
-        /// <param name="version">The version <paramref name="query"/> was designed for.</param>
-        /// <param name="query">The SQL query that belongs to <paramref name="version"/>.</param>
-        /// <exception cref="ArgumentException">Thrown when:
-        /// <list type="bullet">
-        /// <item><paramref name="version"/> is empty or <c>null</c>,</item>
-        /// <item><paramref name="query"/> is empty, <c>null</c>, or consist out of only whitespace characters.</item>
-        /// </list></exception>
-        protected CreateScript(string version, string query)
+        /// <param name="version">The version for this <see cref="CreateScript"/>.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="version"/> is empty 
+        /// or <c>null</c>.</exception>
+        protected CreateScript(string version)
         {
             if (string.IsNullOrEmpty(version))
             {
                 throw new ArgumentException(@"Version must have a value.", nameof(version));
             }
-            if (string.IsNullOrWhiteSpace(query))
-            {
-                throw new ArgumentException(@"Query must have a value.", nameof(query));
-            }
             this.version = version;
-            CreateQuery = query;
         }
 
         /// <summary>
Index: Migration/Scripts/test/Migration.Scripts.Data.Test/CreateScriptTest.cs
===================================================================
diff -u -r26906345dc00fdf928cf38a1356bd1b251c79422 -rf21480a6b28a6637ecab0e2dd3e75240cabd9c9a
--- Migration/Scripts/test/Migration.Scripts.Data.Test/CreateScriptTest.cs	(.../CreateScriptTest.cs)	(revision 26906345dc00fdf928cf38a1356bd1b251c79422)
+++ Migration/Scripts/test/Migration.Scripts.Data.Test/CreateScriptTest.cs	(.../CreateScriptTest.cs)	(revision f21480a6b28a6637ecab0e2dd3e75240cabd9c9a)
@@ -35,43 +35,22 @@
         [TestCase(null)]
         public void Constructor_InvalidVersion_ThrowsArgumentException(string version)
         {
-            // Setup
-            const string query = "Valid query";
-
             // Call
-            TestDelegate call = () => new TestCreateScript(version, query);
+            TestDelegate call = () => new TestCreateScript(version);
 
             // Assert
             string paramName = Assert.Throws<ArgumentException>(call).ParamName;
             Assert.AreEqual("version", paramName);
         }
 
         [Test]
-        [TestCase("")]
-        [TestCase("   ")]
-        [TestCase(null)]
-        public void Constructor_InvalidQuery_ThrowsArgumentException(string query)
-        {
-            // Setup
-            const string version = "Valid version";
-
-            // Call
-            TestDelegate call = () => new TestCreateScript(version, query);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentException>(call).ParamName;
-            Assert.AreEqual("query", paramName);
-        }
-
-        [Test]
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
-            const string query = "Valid query";
             const string version = "Valid version";
 
             // Call
-            var createScript = new TestCreateScript(version, query);
+            var createScript = new TestCreateScript(version);
 
             // Assert
             Assert.AreEqual(version, createScript.Version());
@@ -81,12 +60,11 @@
         public void CreateEmptyVersionedFile_FileDoesNotExist_ReturnsVersionedFile()
         {
             // Setup
-            const string query = ";";
             const string version = "Valid version";
 
             string targetFilename = Path.GetRandomFileName();
             string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, targetFilename);
-            var createScript = new TestCreateScript(version, query);
+            var createScript = new TestCreateScript(version);
 
             // Call
             IVersionedFile versionedFile = createScript.CreateEmptyVersionedFile(filePath);
@@ -103,9 +81,8 @@
         public void CreateEmptyVersionedFile_InvalidPath_ThrowsArgumentException(string filePath)
         {
             // Setup
-            const string query = ";";
             const string version = "Valid version";
-            var createScript = new TestCreateScript(version, query);
+            var createScript = new TestCreateScript(version);
 
             // Call
             TestDelegate call = () => createScript.CreateEmptyVersionedFile(filePath);
@@ -119,12 +96,11 @@
         public void CreateEmptyVersionedFile_FileExistsButNotWritable_ThrowsArgumentException()
         {
             // Setup
-            const string query = ";";
             const string version = "Valid version";
 
             string filename = Path.GetRandomFileName();
             string filePath = TestHelper.GetTestDataPath(TestDataPath.Migration.Core.Storage, filename);
-            var createScript = new TestCreateScript(version, query);
+            var createScript = new TestCreateScript(version);
 
             using (new FileDisposeHelper(filePath))
             {
Index: Migration/Scripts/test/Migration.Scripts.Data.Test/FileMigrationScriptTest.cs
===================================================================
diff -u -r26906345dc00fdf928cf38a1356bd1b251c79422 -rf21480a6b28a6637ecab0e2dd3e75240cabd9c9a
--- Migration/Scripts/test/Migration.Scripts.Data.Test/FileMigrationScriptTest.cs	(.../FileMigrationScriptTest.cs)	(revision 26906345dc00fdf928cf38a1356bd1b251c79422)
+++ Migration/Scripts/test/Migration.Scripts.Data.Test/FileMigrationScriptTest.cs	(.../FileMigrationScriptTest.cs)	(revision f21480a6b28a6637ecab0e2dd3e75240cabd9c9a)
@@ -47,7 +47,7 @@
         public void Constructor_UpgradeScriptNull_ThrowsArgumentNullException()
         {
             // Setup
-            var createScript = new TestCreateScript("1", ";");
+            var createScript = new TestCreateScript("1");
 
             // Call
             TestDelegate call = () => new FileMigrationScript(createScript, null);
@@ -61,7 +61,7 @@
         public void Constructor_ValidParameters_ExpectedProperties()
         {
             // Setup
-            var createScript = new TestCreateScript("2", ";");
+            var createScript = new TestCreateScript("2");
             var upgradeScript = new TestUpgradeScript("1", "2");
 
             // Call
@@ -76,7 +76,7 @@
         public void Upgrade_VersionedFileNull_ThrowsArgumentNullException()
         {
             // Setup
-            var createScript = new TestCreateScript("2", ";");
+            var createScript = new TestCreateScript("2");
             var upgradeScript = new TestUpgradeScript("1", "2");
             var migrationScript = new FileMigrationScript(createScript, upgradeScript);
 
@@ -96,7 +96,7 @@
             var versionedFile = mockRepository.Stub<IVersionedFile>();
             mockRepository.ReplayAll();
 
-            var createScript = new TestCreateScript("2", ";");
+            var createScript = new TestCreateScript("2");
             var upgradeScript = new TestUpgradeScript("1", "2");
             var migrationScript = new FileMigrationScript(createScript, upgradeScript);
 
Index: Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/TestCreateScriptTest.cs
===================================================================
diff -u -r26906345dc00fdf928cf38a1356bd1b251c79422 -rf21480a6b28a6637ecab0e2dd3e75240cabd9c9a
--- Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/TestCreateScriptTest.cs	(.../TestCreateScriptTest.cs)	(revision 26906345dc00fdf928cf38a1356bd1b251c79422)
+++ Migration/Scripts/test/Migration.Scripts.Data.TestUtil.Test/TestCreateScriptTest.cs	(.../TestCreateScriptTest.cs)	(revision f21480a6b28a6637ecab0e2dd3e75240cabd9c9a)
@@ -33,7 +33,7 @@
         public void Constructor_VersionEmptyOrNull_ThrowsException(string version)
         {
             // Call
-            TestDelegate call = () => new TestCreateScript(version, "query");
+            TestDelegate call = () => new TestCreateScript(version);
 
             // Assert
             string paramName = Assert.Throws<ArgumentException>(call).ParamName;
@@ -44,7 +44,7 @@
         public void Constructor_ValidParameters_ExpectedProperties()
         {
             // Call
-            var createScript = new TestCreateScript("version", "query");
+            var createScript = new TestCreateScript("version");
 
             // Assert
             Assert.IsInstanceOf<CreateScript>(createScript);
Index: Migration/Scripts/test/Migration.Scripts.Data.TestUtil/TestCreateScript.cs
===================================================================
diff -u -re96e647dc81e8ecefa335ae514b50f68aa280b9e -rf21480a6b28a6637ecab0e2dd3e75240cabd9c9a
--- Migration/Scripts/test/Migration.Scripts.Data.TestUtil/TestCreateScript.cs	(.../TestCreateScript.cs)	(revision e96e647dc81e8ecefa335ae514b50f68aa280b9e)
+++ Migration/Scripts/test/Migration.Scripts.Data.TestUtil/TestCreateScript.cs	(.../TestCreateScript.cs)	(revision f21480a6b28a6637ecab0e2dd3e75240cabd9c9a)
@@ -31,14 +31,10 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestCreateScript"/>.
         /// </summary>
-        /// <param name="version">The version <paramref name="query"/> was designed for.</param>
-        /// <param name="query">The SQL query that belongs to <paramref name="version"/>.</param>
-        /// <exception cref="ArgumentException">Thrown when:
-        /// <list type="bullet">
-        /// <item><paramref name="version"/> is empty or <c>null</c>,</item>
-        /// <item><paramref name="query"/> is empty, <c>null</c>, or consist out of only whitespace characters.</item>
-        /// </list></exception>
-        public TestCreateScript(string version, string query) : base(version, query) {}
+        /// <param name="version">The version for this <see cref="TestCreateScript"/>.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="version"/> is empty 
+        /// or <c>null</c>.</exception>
+        public TestCreateScript(string version) : base(version) {}
 
         protected override IVersionedFile GetEmptyVersionedFile(string location)
         {