Merge branch 'develop' of https://github.com/cfwheels/cfwheels into develop

Author: bpamiri

compose.yml

@@ -13,6 +13,7 @@ services:
       context: ./
       dockerfile: ./docker/lucee@5/Dockerfile
     image: cfwheels-test-lucee5:v1.0.2
+    restart: always
     volumes:
       - ./:/cfwheels-test-suite
       - ~/.CommandBox/artifacts:/root/.CommandBox/artifacts
@@ -30,6 +31,7 @@ services:
       context: ./
       dockerfile: ./docker/lucee@6/Dockerfile
     image: cfwheels-test-lucee6:v1.0.2
+    restart: always
     volumes:
       - ./:/cfwheels-test-suite
       - ~/.CommandBox/artifacts:/root/.CommandBox/artifacts
@@ -47,6 +49,7 @@ services:
       context: ./
       dockerfile: ./docker/adobe@2018/Dockerfile
     image: cfwheels-test-adobe2018:v1.0.2
+    restart: always
     volumes:
       - ./:/cfwheels-test-suite
       - ~/.CommandBox/artifacts:/root/.CommandBox/artifacts
@@ -64,6 +67,7 @@ services:
       context: ./
       dockerfile: ./docker/adobe@2021/Dockerfile
     image: cfwheels-test-adobe2021:v1.0.2
+    restart: always
     volumes:
       - ./:/cfwheels-test-suite
       - ~/.CommandBox/artifacts:/root/.CommandBox/artifacts
@@ -81,6 +85,7 @@ services:
       context: ./
       dockerfile: ./docker/adobe@2023/Dockerfile
     image: cfwheels-test-adobe2023:v1.0.1
+    restart: always
     volumes:
       - ./:/cfwheels-test-suite
       - ~/.CommandBox/artifacts:/root/.CommandBox/artifacts

docker/adobe@2018/Dockerfile

@@ -8,6 +8,7 @@ ENV HEALTHCHECK_URI         "http://127.0.0.1:62018/"
 ENV ENV_MODE                "remote"
 ENV BOX_SERVER_CFCONFIGFILE "/cfwheels-test-suite/docker/adobe@2018/CFConfig.json"
 ENV BOX_SERVER_PROFILE      "none"
+ENV BOX_INSTALL             TRUE
 
 # WARM UP THE SERVER
 RUN ${BUILD_DIR}/util/warmup-server.sh

docker/adobe@2021/Dockerfile

@@ -8,6 +8,7 @@ ENV HEALTHCHECK_URI         "http://127.0.0.1:62021/"
 ENV ENV_MODE                "remote"
 ENV BOX_SERVER_CFCONFIGFILE "./docker/adobe@2021/CFConfig.json"
 ENV BOX_SERVER_PROFILE      "none"
+ENV BOX_INSTALL             TRUE
 
 # WARM UP THE SERVER
 RUN ${BUILD_DIR}/util/warmup-server.sh

docker/adobe@2023/Dockerfile

@@ -8,6 +8,7 @@ ENV HEALTHCHECK_URI         "http://127.0.0.1:62023/"
 ENV ENV_MODE                "remote"
 ENV BOX_SERVER_CFCONFIGFILE "./docker/adobe@2023/CFConfig.json"
 ENV BOX_SERVER_PROFILE      "none"
+ENV BOX_INSTALL             TRUE
 
 # WARM UP THE SERVER
 RUN ${BUILD_DIR}/util/warmup-server.sh

docker/lucee@5/Dockerfile

@@ -11,6 +11,7 @@ ENV HEALTHCHECK_URI         "http://127.0.0.1:60005/"
 ENV ENV_MODE                "remote"
 ENV BOX_SERVER_CFCONFIGFILE "/cfwheels-test-suite/docker/lucee@5/CFConfig.json"
 ENV BOX_SERVER_PROFILE      "none"
+ENV BOX_INSTALL             TRUE
 
 # WARM UP THE SERVER
-RUN ${BUILD_DIR}/util/warmup-server.sh
+RUN ${BUILD_DIR}/util/warmup-server.sh

docker/lucee@6/Dockerfile

@@ -11,6 +11,7 @@ ENV HEALTHCHECK_URI         "http://127.0.0.1:60006/"
 ENV ENV_MODE                "remote"
 ENV BOX_SERVER_CFCONFIGFILE "/cfwheels-test-suite/docker/lucee@6/CFConfig.json"
 ENV BOX_SERVER_PROFILE      "none"
+ENV BOX_INSTALL             TRUE
 
 # WARM UP THE SERVER
 RUN ${BUILD_DIR}/util/warmup-server.sh

vendor/wheels/Migrator.cfc

@@ -22,8 +22,9 @@ component output="false" extends="wheels.Global"{
 	 * [category: General Functions]
 	 *
 	 * @version The Database schema version to migrate to
+	 * @missingMigFlag Flag for any available missing migrations
 	 */
-	public string function migrateTo(string version = "") {
+	public string function migrateTo(string version = "", boolean missingMigFlag) {
 		local.rv = "";
 		local.currentVersion = getCurrentMigrationVersion();
 		local.appKey = $appKey();
@@ -34,7 +35,7 @@ component output="false" extends="wheels.Global"{
 				DirectoryCreate(this.paths.sql);
 			}
 			local.migrations = getAvailableMigrations();
-			if (local.currentVersion > arguments.version) {
+			if (local.currentVersion > arguments.version && arguments.missingMigFlag == false) {
 				local.rv = "Migrating from #local.currentVersion# down to #arguments.version#.#Chr(13)#";
 				for (local.i = ArrayLen(local.migrations); local.i >= 1; local.i--) {
 					local.migration = local.migrations[local.i];
@@ -63,7 +64,12 @@ component output="false" extends="wheels.Global"{
 					}
 				}
 			} else {
-				local.rv = "Migrating from #local.currentVersion# up to #arguments.version#.#Chr(13)#";
+				if(arguments.missingMigFlag){
+					local.rv = "Migrating remaining migrations till #arguments.version#.#Chr(13)#";
+					$removeVersionAsMigrated(local.currentVersion);
+				} else {
+					local.rv = "Migrating from #local.currentVersion# up to #arguments.version#.#Chr(13)#";
+				}
 				for (local.migration in local.migrations) {
 					if (local.migration.version <= arguments.version && local.migration.status != "migrated") {
 						transaction {
@@ -88,6 +94,9 @@ component output="false" extends="wheels.Global"{
 						break;
 					}
 				};
+				if(arguments.missingMigFlag){
+					$setVersionAsMigrated(local.currentVersion);
+				}
 			}
 		}
 		return local.rv;

vendor/wheels/public/migrator/command.cfm

@@ -3,6 +3,8 @@ param name="request.wheels.params.command";
 param name="request.wheels.params.version";
 
 executeAction = StructKeyExists(request.wheels.params, "confirm") && request.wheels.params.confirm ? true : false;
+missingMigFlag = StructKeyExists(request.wheels.params, "missingMigFlag") && request.wheels.params.missingMigFlag ? true : false;
+
 message = "";
 result = "";
 
@@ -12,7 +14,7 @@ if (executeAction) {
 	migrator = application.wheels.migrator;
 	switch (request.wheels.params.command) {
 		case "migrateTo":
-			result = migrator.migrateTo(request.wheels.params.version);
+			result = migrator.migrateTo(request.wheels.params.version, missingMigFlag);
 			break;
 		case "migrateTolatest":
 			result = migrator.migrateToLatest();
@@ -45,7 +47,7 @@ if (executeAction) {
 	<div id="result" class="scrolling content longer">
 		<cfif !executeAction>
 			<div class="ui red message">Confirmation Required: #message#</div>
-			<div class="ui red button execute" data-data-url="#urlFor(route='wheelsMigratorCommand', command=request.wheels.params.command, version=request.wheels.params.version, params="confirm=1")#">Execute</div>
+			<div class="ui red button execute" data-data-url="#urlFor(route='wheelsMigratorCommand', command=request.wheels.params.command, version=request.wheels.params.version, params="confirm=1&missingMigFlag=#missingMigFlag#")#">Execute</div>
 		<cfelse>
 			<pre><code class="sql" style="overflow-y: scroll; height:500px;">#result#</code></pre>
 		</cfif>

vendor/wheels/public/views/migrator.cfm

@@ -10,6 +10,13 @@ try {
 	datasourceAvailable = false;
 	message = err.message;
 }
+// Get any remaining Missing Migrations
+if(currentVersion == latestVersion){
+	local.remainingMigrations = [];
+	for(local.migration in availableMigrations){
+		if(local.migration.status != "migrated") arrayAppend(local.remainingMigrations, local.migration);
+	}
+}
 </cfscript>
 <!--- cfformat-ignore-start --->
 <cfoutput>
@@ -26,8 +33,13 @@ try {
 			latestClass = currentVersion EQ latestVersion ? "disabled" : "performmigration";
 			resetClass = currentVersion EQ 0 ? "disabled" : "performmigration";
 			</cfscript>
+				<cfif structKeyExists(local, "remainingMigrations") && arrayLen(local.remainingMigrations)>
+					<div class="ui button violet performmigration"
+						data-data-url="#urlFor(route='wheelsMigratorCommand', command="migrateto", version='#local.remainingMigrations[1]["version"]#', params="missingMigFlag=1")#">Migrate Missing Migrations</div>
+				<cfelse>
 					<div class="ui button violet #latestClass#"
 						data-data-url="#urlFor(route='wheelsMigratorCommand', command="migrateto", version='#latestVersion#')#">Migrate To Latest</div>
+				</cfif>
 
 					<div class="ui button red #resetClass#"
 						data-data-url="#urlFor(route='wheelsMigratorCommand', command="migrateto", version=0)#">Reset Database</div>