Merge branch 'release-0.2.13' into main

Author: entrotech

.github/workflows/docker.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - develop
+      - main
   release:
     types:
       - published

db/flyway-config.js

@@ -18,14 +18,14 @@ module.exports = function () {
 
   return {
     flywayArgs: {
-      url: `jdbc:sqlserver://${origin};databaseName={${databaseName}}`,
+      url: `jdbc:sqlserver://${origin};databaseName="${databaseName}"`,
       locations: `filesystem:${__dirname}/migration`,
       user: username,
       password: password,
       sqlMigrationSuffixes: ".sql",
       baselineOnMigrate: true,
       baselineVersion: "0002", // Do not change this baseline version number
-      baselineDescription: "setup_db_baseline_data_as_of_07012020",
+      baselineDescription: "setup_db_baseline_data_as_of_07012020"
     }
   };
 };

db/migration/V0008__delete_obsolete_strategies_478.sql

@@ -9,7 +9,7 @@ OR code IN ('PTS_TRANSIT_ACCESS_2', 'STRATEGY_TRANSIT_ACCESS_2');
 
 -- Delete Accessibility, Mobility Hubs, and duplicate Telecommute from CalculationPanel
 DELETE FROM CalculationPanel 
-WHERE calculationId = 1 and [id] IN (13, 21, 33); 
+WHERE calculationId = 1 and [id] IN (13, 21); 
 
 -- Remove <<PTS_ACCESS>> and <<PTS_MOBILITY_HUBS>>
 UPDATE CalculationRule

db/migration/V0012__put_warehouse_calculation_panel_back_478.sql

@@ -1,16 +1,16 @@
 SET IDENTITY_INSERT CalculationPanel ON;
 
-INSERT INTO dbo.CalculationPanel
-           (id, calculationId
-           ,name
-           ,cssClass
-           ,displayOrder)
-     VALUES
-           (33, 1
-           ,'Warehouse Space'
-           ,'landUse'
-           ,350
-           )
-GO
+-- INSERT INTO dbo.CalculationPanel
+--            (id, calculationId
+--            ,name
+--            ,cssClass
+--            ,displayOrder)
+--      VALUES
+--            (33, 1
+--            ,'Warehouse Space'
+--            ,'landUse'
+--            ,350
+--            )
+-- GO
 
 SET IDENTITY_INSERT CalculationPanel OFF;