' Right-side area (e.g., user info / login)
diff --git a/core/autoload_core.asp b/core/autoload_core.asp
index 8854d46..6b406b8 100644
--- a/core/autoload_core.asp
+++ b/core/autoload_core.asp
@@ -19,3 +19,5 @@
+
+
diff --git a/core/databaseConnection.asp b/core/databaseConnection.asp
new file mode 100644
index 0000000..7d5e297
--- /dev/null
+++ b/core/databaseConnection.asp
@@ -0,0 +1,127 @@
+<%
+'------------------------------------------------------------------------------
+' DatabaseConnection.Class.inc
+' A singleton VBScript "factory" for ADODB.Connection to multiple databases
+' Enhanced with separate error handling for creation and open operations
+'------------------------------------------------------------------------------
+
+' Singleton holder
+Dim DatabaseConnection__Singleton
+Set DatabaseConnection__Singleton = Nothing
+
+' Factory function
+Function DatabaseConnection()
+ If DatabaseConnection__Singleton Is Nothing Then
+ Set DatabaseConnection__Singleton = New DatabaseConnection_Class
+ End If
+ Set DatabaseConnection = DatabaseConnection__Singleton
+End Function
+
+'------------------------------------------------------------------------------
+' Class definition
+'------------------------------------------------------------------------------
+Class DatabaseConnection_Class
+ Private conn ' holds the ADODB.Connection instance
+
+ '----------------------------------------
+ ' Connect to an Access (.mdb/.accdb) file
+ '----------------------------------------
+ Public Function ConnectToAccessDatabase(dataSource, provider)
+ If IsEmpty(provider) Or provider = "" Then
+ provider = "Microsoft.Jet.OLEDB.4.0"
+ End If
+ Dim connStr
+ connStr = "Provider=" & provider & ";" & _
+ "Data Source=" & dataSource & ";" & _
+ "Persist Security Info=False;"
+ Set ConnectToAccessDatabase = Me.Connect(connStr)
+ End Function
+
+ '----------------------------------------
+ ' Connect to SQL Server
+ '----------------------------------------
+ Public Function ConnectToSQLServer(server, database, uid, pwd, useTrusted)
+ Dim connStr
+ If useTrusted = True Then
+ connStr = "Provider=SQLOLEDB;" & _
+ "Server=" & server & ";" & _
+ "Database=" & database & ";" & _
+ "Trusted_Connection=Yes;"
+ Else
+ connStr = "Provider=SQLOLEDB;" & _
+ "Server=" & server & ";" & _
+ "Database=" & database & ";" & _
+ "User ID=" & uid & ";" & _
+ "Password=" & pwd & ";"
+ End If
+ Set ConnectToSQLServer = Me.Connect(connStr)
+ End Function
+
+ '----------------------------------------
+ ' Connect via ODBC DSN
+ '----------------------------------------
+ Public Function ConnectToODBC(dsnName, uid, pwd)
+ Dim connStr
+ connStr = "DSN=" & dsnName & ";"
+ If Not IsEmpty(uid) Then connStr = connStr & "UID=" & uid & ";"
+ If Not IsEmpty(pwd) Then connStr = connStr & "PWD=" & pwd & ";"
+ Set ConnectToODBC = Me.Connect(connStr)
+ End Function
+
+ '----------------------------------------
+ ' Generic Connect: opens and returns an ADODB.Connection
+ ' Includes separate handling for creation and open errors
+ '----------------------------------------
+ Public Function Connect(connectionString)
+ On Error Resume Next
+
+ ' Dispose previous connection if any
+ If Not conn Is Nothing Then
+ conn.Close
+ Set conn = Nothing
+ End If
+
+ ' Create ADO Connection object
+ Set conn = Server.CreateObject("ADODB.Connection")
+ If conn Is Nothing Then
+ Err.Clear
+ On Error GoTo 0
+ Err.Raise 50000, _
+ "DatabaseConnection_Class.Connect", _
+ "Could not create ADODB.Connection. Ensure ADO is installed and registered."
+ End If
+
+ ' Clear any prior errors before opening
+ Err.Clear
+
+ ' Open database connection
+ conn.Open connectionString
+ If Err.Number <> 0 Then
+ Dim lastErrNum, lastErrDesc
+ lastErrNum = Err.Number
+ lastErrDesc = Err.Description
+ Err.Clear
+ On Error GoTo 0
+ Err.Raise lastErrNum, _
+ "DatabaseConnection_Class.Connect", _
+ "Failed to open connection (" & connectionString & _
+ ") - Error " & lastErrNum & ": " & lastErrDesc
+ End If
+
+ On Error GoTo 0
+ Set Connect = conn
+ End Function
+
+ '----------------------------------------
+ ' Close & clean up
+ '----------------------------------------
+ Public Sub Close()
+ On Error Resume Next
+ If Not conn Is Nothing Then
+ conn.Close
+ Set conn = Nothing
+ End If
+ On Error GoTo 0
+ End Sub
+End Class
+%>
diff --git a/core/lib.ControllerRegistry.asp b/core/lib.ControllerRegistry.asp
index 0b563d8..581c173 100644
--- a/core/lib.ControllerRegistry.asp
+++ b/core/lib.ControllerRegistry.asp
@@ -15,6 +15,9 @@ Class ControllerRegistry_Class
' Format: m_controllers.Add "controllername", True
RegisterController "homecontroller"
RegisterController "errorcontroller"
+ RegisterController "territorycontroller"
+ RegisterController "householdcontroller"
+ RegisterController "householdernamecontroller"
End Sub
Private Sub Class_Terminate()
diff --git a/core/lib.ad.auth.asp b/core/lib.ad.auth.asp
new file mode 100644
index 0000000..edb615c
--- /dev/null
+++ b/core/lib.ad.auth.asp
@@ -0,0 +1,52 @@
+<%
+'==========================
+' AD_Auth_Class.asp
+'==========================
+Class AD_Auth_Class
+ Public DomainName ' e.g. yourdomain.local
+ Public ContainerDN ' e.g. DC=yourdomain,DC=local
+ Public Username
+ Public Password
+ Public ErrorMessage
+ Public IsAuthenticated
+ Public UserObject
+
+ Private Sub Class_Initialize()
+ IsAuthenticated = False
+ ErrorMessage = ""
+ Set UserObject = Nothing
+ End Sub
+
+ Public Function Authenticate()
+ On Error Resume Next
+
+ Dim ldapPath, userCredential
+ ldapPath = "LDAP://" & ContainerDN ' Must be DC=yourdomain,DC=local
+ userCredential = DomainName & "\" & Username
+
+ ' Try to bind to Active Directory
+ Dim rootDSE : Set rootDSE = GetObject("LDAP:")
+ Set UserObject = rootDSE.OpenDSObject(ldapPath, userCredential, Password, 1)
+
+ If Err.Number <> 0 Then
+ ErrorMessage = "Authentication failed: " & Err.Description
+ IsAuthenticated = False
+ Set UserObject = Nothing
+ Else
+ IsAuthenticated = True
+ ErrorMessage = ""
+ End If
+
+ Authenticate = IsAuthenticated
+ On Error GoTo 0
+ End Function
+End Class
+
+dim AD_Auth_Class__Singleton
+Function AdAuth()
+ if IsEmpty(AD_Auth_Class__Singleton) then
+ set AD_Auth_Class__Singleton = new AD_Auth_Class
+ end if
+ set AdAuth = AD_Auth_Class__Singleton
+End Function
+%>
diff --git a/db/migrations/20260324110000_add_do_not_call_fields_to_households.asp b/db/migrations/20260324110000_add_do_not_call_fields_to_households.asp
new file mode 100644
index 0000000..f187469
--- /dev/null
+++ b/db/migrations/20260324110000_add_do_not_call_fields_to_households.asp
@@ -0,0 +1,23 @@
+<%
+'=======================================================================================================================
+' MIGRATION: add_do_not_call_fields_to_households
+'=======================================================================================================================
+
+Sub Migration_Up(migration)
+ migration.AddColumn "Households", "DoNotCall", "SMALLINT"
+ migration.AddColumn "Households", "DoNotCallDate", "DATETIME"
+ migration.AddColumn "Households", "DoNotCallNotes", "LONGTEXT"
+ migration.AddColumn "Households", "DoNotCallPrivateNotes", "LONGTEXT"
+
+ migration.ExecuteSQL "UPDATE Households SET DoNotCall = 0 WHERE DoNotCall IS NULL"
+ migration.CreateIndex "IX_Households_DoNotCall", "Households", "DoNotCall"
+End Sub
+
+Sub Migration_Down(migration)
+ migration.DropIndex "IX_Households_DoNotCall", "Households"
+ migration.DropColumn "Households", "DoNotCallPrivateNotes"
+ migration.DropColumn "Households", "DoNotCallNotes"
+ migration.DropColumn "Households", "DoNotCallDate"
+ migration.DropColumn "Households", "DoNotCall"
+End Sub
+%>
diff --git a/public/Default.asp b/public/Default.asp
index cb1ef11..be3a941 100644
--- a/public/Default.asp
+++ b/public/Default.asp
@@ -3,10 +3,38 @@
<%
' Define application routes
router.AddRoute "GET", "/home", "homeController", "Index"
- router.AddRoute "GET", "/", "homeController", "Index"
- router.AddRoute "GET", "", "homeController", "Index"
+ router.AddRoute "GET", "/", "TerritoryController", "Index"
+ router.AddRoute "GET", "", "TerritoryController", "Index"
router.AddRoute "GET", "/404", "ErrorController", "NotFound"
+ ' Territory routes
+ router.AddRoute "GET", "/territories", "TerritoryController", "Index"
+ router.AddRoute "GET", "/territories/new", "TerritoryController", "Create"
+ router.AddRoute "POST", "/territories", "TerritoryController", "Store"
+ router.AddRoute "GET", "/territories/:id", "TerritoryController", "Show"
+ router.AddRoute "GET", "/territories/:id/edit", "TerritoryController", "Edit"
+ router.AddRoute "POST", "/territories/:id", "TerritoryController", "Update"
+ router.AddRoute "POST", "/territories/:id/delete", "TerritoryController", "Delete"
+
+ ' Household routes
+ router.AddRoute "GET", "/households", "HouseholdController", "Index"
+ router.AddRoute "GET", "/households/new", "HouseholdController", "Create"
+ router.AddRoute "POST", "/households", "HouseholdController", "Store"
+ router.AddRoute "GET", "/households/:id", "HouseholdController", "Show"
+ router.AddRoute "GET", "/households/:id/edit", "HouseholdController", "Edit"
+ router.AddRoute "POST", "/households/:id", "HouseholdController", "Update"
+ router.AddRoute "POST", "/households/:id/delete", "HouseholdController", "Delete"
+ router.AddRoute "POST", "/households/:id/mark-returned", "HouseholdController", "MarkReturned"
+
+ ' Householder Name routes
+ router.AddRoute "GET", "/householder-names", "HouseholderNameController", "Index"
+ router.AddRoute "GET", "/householder-names/new", "HouseholderNameController", "Create"
+ router.AddRoute "POST", "/householder-names", "HouseholderNameController", "Store"
+ router.AddRoute "GET", "/householder-names/:id", "HouseholderNameController", "Show"
+ router.AddRoute "GET", "/householder-names/:id/edit", "HouseholderNameController", "Edit"
+ router.AddRoute "POST", "/householder-names/:id", "HouseholderNameController", "Update"
+ router.AddRoute "POST", "/householder-names/:id/delete", "HouseholderNameController", "Delete"
+
' Dispatch the request (resolves route and executes controller action)
MVC.DispatchRequest Request.ServerVariables("REQUEST_METHOD"), _
TrimQueryParams(Request.ServerVariables("HTTP_X_ORIGINAL_URL"))
diff --git a/scripts/deploy-iis-git.ps1 b/scripts/deploy-iis-git.ps1
new file mode 100644
index 0000000..3326f8a
--- /dev/null
+++ b/scripts/deploy-iis-git.ps1
@@ -0,0 +1,324 @@
+<#
+ Deploy asp-territory to an existing IIS site, locally or over SSH.
+
+ Remote mode:
+ - Copies this script to the remote Windows host with scp
+ - Executes it remotely via ssh in -RunRemoteCore mode
+ - Preserves the remote site's current DB path unless -DbPath is passed
+ - Can run standard migrations and an optional legacy migration script
+
+ Local / remote core behavior:
+ - Infers IIS site/app pool/work dir from the existing site when possible
+ - Stops the site/app pool while deploying
+ - Clones/pulls and hard-resets to origin/
+ - Points IIS at \public
+ - Reapplies the effective DB path in public\web.config
+ - Grants IIS AppPool rights to the DB folder
+ - Runs migrations
+ - Restarts the site/app pool and smoke tests key routes
+#>
+
+param(
+ [string]$Repo = 'git@onefortheroadgit.sytes.net:dcovington/asp-classic-unified-framework.git',
+ [string]$Branch = 'main',
+ [string]$SiteName = 'ttasp',
+ [string]$AppPool = '',
+ [string]$WorkDir = '',
+ [string]$PublicDir = '',
+ [string]$BaseUrl = '',
+ [string]$DbPath = '',
+
+ [switch]$RunMigrations = $true,
+ [switch]$SkipLegacyIsBusinessMigration,
+ [string]$LegacyMigrationScript = 'scripts\migrate_isbusiness_to_households.vbs',
+
+ [switch]$UseRemoteSsh,
+ [string]$RemoteTarget = '',
+ [int]$RemotePort = 22,
+ [string]$SshExe = 'ssh',
+ [string]$ScpExe = 'scp',
+ [switch]$RunRemoteCore
+)
+
+$ErrorActionPreference = 'Stop'
+
+function Ensure-Dir {
+ param([string]$Path)
+ if([string]::IsNullOrWhiteSpace($Path)){ return }
+ if(!(Test-Path $Path)){
+ New-Item -ItemType Directory -Force -Path $Path | Out-Null
+ }
+}
+
+function Ensure-Command {
+ param([string]$Name)
+ if(!(Get-Command $Name -ErrorAction SilentlyContinue)){
+ throw "$Name not found on PATH"
+ }
+}
+
+function Get-DefaultRemoteTargetFromInfo {
+ $infoPath = Join-Path $PSScriptRoot 'depolyinfo.txt'
+ if(!(Test-Path $infoPath)){ return '' }
+
+ $sshLine = Get-Content $infoPath | Where-Object { $_ -match '^\s*ssh\s+' } | Select-Object -First 1
+ if([string]::IsNullOrWhiteSpace($sshLine)){ return '' }
+
+ return ($sshLine -replace '^\s*ssh\s+', '').Trim()
+}
+
+function ConvertTo-PowerShellLiteral {
+ param([AllowNull()][string]$Value)
+ if($null -eq $Value){ return "''" }
+ return "'" + ($Value -replace "'", "''") + "'"
+}
+
+function ConvertTo-CmdDoubleQuoted {
+ param([AllowNull()][string]$Value)
+ if($null -eq $Value){ return '""' }
+ return '"' + ($Value -replace '"', '""') + '"'
+}
+
+function Get-DataSourceFromConfig {
+ param([string]$ConfigPath)
+ if(!(Test-Path $ConfigPath)){ return '' }
+
+ $raw = Get-Content $ConfigPath -Raw
+ $match = [regex]::Match($raw, 'Data Source=([^;]+);', [System.Text.RegularExpressions.RegexOptions]::IgnoreCase)
+ if($match.Success){
+ return $match.Groups[1].Value.Trim()
+ }
+
+ return ''
+}
+
+function Set-DataSourceInConfig {
+ param(
+ [string]$ConfigPath,
+ [string]$EffectiveDbPath
+ )
+
+ if(!(Test-Path $ConfigPath)){ return }
+
+ $raw = Get-Content $ConfigPath -Raw
+ $updated = [regex]::Replace(
+ $raw,
+ 'Data Source=[^;]*;',
+ ('Data Source=' + $EffectiveDbPath + ';'),
+ [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
+ )
+
+ if($updated -ne $raw){
+ Set-Content -Path $ConfigPath -Value $updated -Encoding UTF8
+ Write-Host "Updated ConnectionString Data Source to $EffectiveDbPath"
+ }
+}
+
+function Get-BaseUrlFromSite {
+ param($Site)
+
+ $httpBind = $Site.Bindings.Collection | Where-Object { $_.protocol -eq 'http' } | Select-Object -First 1
+ if($httpBind){
+ $parts = $httpBind.bindingInformation.Split(':')
+ $port = $parts[1]
+ if([string]::IsNullOrWhiteSpace($port)){ $port = '80' }
+ return ('http://127.0.0.1:' + $port)
+ }
+
+ return 'http://127.0.0.1'
+}
+
+function Invoke-DeployCore {
+ Ensure-Command git
+ Import-Module WebAdministration
+
+ $site = Get-Website -Name $SiteName
+ if(!$site){ throw "IIS site not found: $SiteName" }
+
+ if([string]::IsNullOrWhiteSpace($AppPool)){
+ $AppPool = $site.applicationPool
+ }
+
+ if([string]::IsNullOrWhiteSpace($PublicDir)){
+ $PublicDir = $site.physicalPath
+ }
+
+ if([string]::IsNullOrWhiteSpace($WorkDir)){
+ $pd = [Environment]::ExpandEnvironmentVariables($PublicDir)
+ $pd = $pd.Trim().Trim('"')
+ $pd = $pd.TrimEnd('\','/')
+
+ if((Split-Path $pd -Leaf).ToLower() -eq 'public'){
+ $WorkDir = Split-Path $pd -Parent
+ } else {
+ $WorkDir = $pd
+ }
+ }
+
+ if([string]::IsNullOrWhiteSpace($BaseUrl)){
+ $BaseUrl = Get-BaseUrlFromSite -Site $site
+ }
+
+ $currentPublicDir = $PublicDir
+ $currentConfigPath = Join-Path $currentPublicDir 'web.config'
+ $effectiveDbPath = $DbPath
+ if([string]::IsNullOrWhiteSpace($effectiveDbPath)){
+ $effectiveDbPath = Get-DataSourceFromConfig -ConfigPath $currentConfigPath
+ }
+
+ if([string]::IsNullOrWhiteSpace($effectiveDbPath)){
+ throw 'No database path was provided and no existing Data Source could be read from the current web.config'
+ }
+
+ Write-Host "Stopping IIS site $SiteName and app pool $AppPool"
+ try { Stop-Website -Name $SiteName } catch { }
+ try { Stop-WebAppPool -Name $AppPool } catch { }
+
+ Ensure-Dir (Split-Path $WorkDir -Parent)
+ if((Test-Path $WorkDir) -and !(Test-Path (Join-Path $WorkDir '.git'))){
+ $bak = ($WorkDir.TrimEnd('\') + '_pre_git_' + (Get-Date -Format 'yyyyMMdd_HHmmss'))
+ Write-Host "Existing non-git folder detected. Moving to $bak"
+ Move-Item -Force $WorkDir $bak
+ }
+
+ if(!(Test-Path $WorkDir)){
+ Write-Host "Cloning $Repo -> $WorkDir"
+ git clone $Repo $WorkDir
+ }
+
+ Push-Location $WorkDir
+ try {
+ Write-Host "Updating to origin/$Branch"
+ git fetch origin
+ git checkout $Branch
+ & git reset --hard ("origin/" + $Branch)
+ } finally {
+ Pop-Location
+ }
+
+ if((Split-Path $WorkDir -Leaf).ToLower() -eq 'public'){
+ $WorkDir = Split-Path $WorkDir -Parent
+ }
+
+ $PublicDir = Join-Path $WorkDir 'public'
+ $cfg = Join-Path $PublicDir 'web.config'
+
+ Set-ItemProperty ('IIS:\Sites\' + $SiteName) -Name physicalPath -Value $PublicDir
+ Set-ItemProperty ('IIS:\Sites\' + $SiteName) -Name applicationPool -Value $AppPool
+ Set-ItemProperty ('IIS:\AppPools\' + $AppPool) -Name processModel.identityType -Value NetworkService
+
+ Set-DataSourceInConfig -ConfigPath $cfg -EffectiveDbPath $effectiveDbPath
+
+ $dbFolder = Split-Path $effectiveDbPath -Parent
+ if(!(Test-Path $dbFolder)){
+ Ensure-Dir $dbFolder
+ }
+ icacls $dbFolder /grant ("IIS AppPool\" + $AppPool + ":(OI)(CI)(M)") /T | Out-Null
+
+ Push-Location $WorkDir
+ try {
+ if($RunMigrations){
+ Write-Host 'Running standard migrations'
+ cscript //nologo scripts\runMigrations.vbs up
+ }
+
+ if(-not $SkipLegacyIsBusinessMigration){
+ $legacyPath = Join-Path $WorkDir $LegacyMigrationScript
+ if(!(Test-Path $legacyPath)){
+ throw "Legacy migration script not found: $legacyPath"
+ }
+
+ Write-Host 'Running legacy IsBusiness migration'
+ cscript //nologo $legacyPath $effectiveDbPath
+ }
+ } finally {
+ Pop-Location
+ }
+
+ if((Get-WebAppPoolState -Name $AppPool).Value -eq 'Started'){
+ Restart-WebAppPool -Name $AppPool
+ } else {
+ Start-WebAppPool -Name $AppPool
+ }
+ Start-Website $SiteName
+
+ Start-Sleep -Seconds 1
+
+ $paths = @('/','/territories','/households','/householder-names')
+ foreach($path in $paths){
+ $url = $BaseUrl + $path
+ $response = Invoke-WebRequest -UseBasicParsing -Uri $url -TimeoutSec 30
+ Write-Host ("OK " + $path + ' -> ' + $response.StatusCode)
+ }
+
+ Write-Host 'Deploy complete.'
+}
+
+if($UseRemoteSsh -and !$RunRemoteCore -and [string]::IsNullOrWhiteSpace($RemoteTarget)){
+ $RemoteTarget = Get-DefaultRemoteTargetFromInfo
+}
+
+if($UseRemoteSsh -and !$RunRemoteCore -and -not [string]::IsNullOrWhiteSpace($RemoteTarget)){
+ Ensure-Command $SshExe
+ Ensure-Command $ScpExe
+
+ $remoteScriptPath = 'C:\Windows\Temp\deploy-test-territory-git.ps1'
+ $scpDestination = "${RemoteTarget}:C:/Windows/Temp/deploy-test-territory-git.ps1"
+
+ Write-Host "Copying deploy script to $RemoteTarget"
+ & $ScpExe -P $RemotePort $PSCommandPath $scpDestination
+ if($LASTEXITCODE -ne 0){ throw 'scp failed' }
+
+ $remoteCommand = New-Object System.Collections.Generic.List[string]
+ @(
+ 'powershell',
+ '-NoProfile',
+ '-ExecutionPolicy', 'Bypass',
+ '-File', (ConvertTo-CmdDoubleQuoted $remoteScriptPath),
+ '-RunRemoteCore',
+ '-Repo', (ConvertTo-CmdDoubleQuoted $Repo),
+ '-Branch', (ConvertTo-CmdDoubleQuoted $Branch),
+ '-SiteName', (ConvertTo-CmdDoubleQuoted $SiteName)
+ ) | ForEach-Object { [void]$remoteCommand.Add($_) }
+
+ if(-not [string]::IsNullOrWhiteSpace($AppPool)){
+ [void]$remoteCommand.Add('-AppPool')
+ [void]$remoteCommand.Add((ConvertTo-CmdDoubleQuoted $AppPool))
+ }
+
+ if(-not [string]::IsNullOrWhiteSpace($WorkDir)){
+ [void]$remoteCommand.Add('-WorkDir')
+ [void]$remoteCommand.Add((ConvertTo-CmdDoubleQuoted $WorkDir))
+ }
+
+ if(-not [string]::IsNullOrWhiteSpace($PublicDir)){
+ [void]$remoteCommand.Add('-PublicDir')
+ [void]$remoteCommand.Add((ConvertTo-CmdDoubleQuoted $PublicDir))
+ }
+
+ if(-not [string]::IsNullOrWhiteSpace($BaseUrl)){
+ [void]$remoteCommand.Add('-BaseUrl')
+ [void]$remoteCommand.Add((ConvertTo-CmdDoubleQuoted $BaseUrl))
+ }
+
+ if(-not [string]::IsNullOrWhiteSpace($DbPath)){
+ [void]$remoteCommand.Add('-DbPath')
+ [void]$remoteCommand.Add((ConvertTo-CmdDoubleQuoted $DbPath))
+ }
+
+ if(-not [string]::IsNullOrWhiteSpace($LegacyMigrationScript)){
+ [void]$remoteCommand.Add('-LegacyMigrationScript')
+ [void]$remoteCommand.Add((ConvertTo-CmdDoubleQuoted $LegacyMigrationScript))
+ }
+
+ if($RunMigrations){ $remoteCommand += '-RunMigrations' }
+ if($SkipLegacyIsBusinessMigration){ $remoteCommand += '-SkipLegacyIsBusinessMigration' }
+
+ Write-Host "Executing remote deploy on $RemoteTarget"
+ & $SshExe -p $RemotePort $RemoteTarget ($remoteCommand -join ' ')
+ if($LASTEXITCODE -ne 0){ throw 'remote deploy failed' }
+
+ exit 0
+}
+
+Invoke-DeployCore
diff --git a/scripts/migrate_isbusiness_to_households.vbs b/scripts/migrate_isbusiness_to_households.vbs
new file mode 100644
index 0000000..5f0a8b9
--- /dev/null
+++ b/scripts/migrate_isbusiness_to_households.vbs
@@ -0,0 +1,90 @@
+' migrate_isbusiness_to_households.vbs
+' Moves IsBusiness from HouseholderNames to Households.
+'
+' Usage:
+' cscript //nologo scripts\migrate_isbusiness_to_households.vbs "C:\path\to\myAccessFile.accdb"
+'
+' What it does:
+' 1) Adds Households.IsBusiness (SMALLINT) if missing
+' 2) Copies data: sets Households.IsBusiness=1 if any related HouseholderNames.IsBusiness<>0
+' 3) Sets NULLs to 0
+' 4) Drops HouseholderNames.IsBusiness if present
+'
+Option Explicit
+
+Dim dbPath
+If WScript.Arguments.Count < 1 Then
+ WScript.Echo "ERROR: missing db path."
+ WScript.Echo "Usage: cscript //nologo scripts\migrate_isbusiness_to_households.vbs ""C:\path\to\db.accdb"""
+ WScript.Quit 1
+End If
+
+dbPath = WScript.Arguments(0)
+
+Dim conn
+Set conn = CreateObject("ADODB.Connection")
+conn.Open "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=" & dbPath & ";Persist Security Info=False;"
+
+On Error Resume Next
+
+If Not ColumnExists(conn, "Households", "IsBusiness") Then
+ Exec conn, "ALTER TABLE [Households] ADD COLUMN [IsBusiness] SMALLINT"
+ If Err.Number <> 0 Then
+ WScript.Echo "ERROR adding Households.IsBusiness: " & Err.Description
+ WScript.Quit 1
+ End If
+ WScript.Echo "Added Households.IsBusiness"
+Else
+ WScript.Echo "Households.IsBusiness already exists"
+End If
+
+' Copy data (only if the old column exists)
+If ColumnExists(conn, "HouseholderNames", "IsBusiness") Then
+ ' Normalize all existing households first so the column is never left NULL.
+ Exec conn, "UPDATE [Households] SET [IsBusiness]=0"
+ If Err.Number <> 0 Then
+ WScript.Echo "ERROR initializing Households.IsBusiness: " & Err.Description
+ WScript.Quit 1
+ End If
+
+ ' Promote households to business when any related name was previously marked as a business.
+ Exec conn, "UPDATE [Households] SET [IsBusiness]=1 WHERE [Id] IN (SELECT [HouseholdId] FROM [HouseholderNames] WHERE [IsBusiness]<>0)"
+ If Err.Number <> 0 Then
+ WScript.Echo "ERROR copying IsBusiness to Households: " & Err.Description
+ WScript.Quit 1
+ End If
+ WScript.Echo "Copied IsBusiness values to Households"
+
+ Exec conn, "ALTER TABLE [HouseholderNames] DROP COLUMN [IsBusiness]"
+ If Err.Number <> 0 Then
+ WScript.Echo "ERROR dropping HouseholderNames.IsBusiness: " & Err.Description
+ WScript.Quit 1
+ End If
+ WScript.Echo "Dropped HouseholderNames.IsBusiness"
+Else
+ WScript.Echo "HouseholderNames.IsBusiness does not exist; nothing to drop"
+End If
+
+conn.Close
+Set conn = Nothing
+WScript.Echo "Done."
+
+' --- helpers ---
+Sub Exec(c, sql)
+ Err.Clear
+ c.Execute sql
+End Sub
+
+Function ColumnExists(c, tableName, colName)
+ Dim rs
+ ColumnExists = False
+ Err.Clear
+ Set rs = c.OpenSchema(4, Array(Empty, Empty, tableName, colName)) ' adSchemaColumns=4
+ If Err.Number <> 0 Then
+ Err.Clear
+ Exit Function
+ End If
+ If Not rs.EOF Then ColumnExists = True
+ rs.Close
+ Set rs = Nothing
+End Function