Skip to content

Commit

Permalink
Update Powershell to pass in ValueFromRemainingArguments parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
lajones committed Mar 26, 2020
1 parent 2823e3b commit 87afef9
Showing 1 changed file with 43 additions and 8 deletions.
51 changes: 43 additions & 8 deletions src/EFCore.Tools/tools/EntityFrameworkCore.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ function Add-Migration
[string] $OutputDir,
[string] $Context,
[string] $Project,
[string] $StartupProject)
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

WarnIfEF6 'Add-Migration'

Expand All @@ -62,6 +64,7 @@ function Add-Migration
}

$params += GetParams $Context
$params += $RemainingArguments

# NB: -join is here to support ConvertFrom-Json on PowerShell 3.0
$result = (EF $dteProject $dteStartupProject $params) -join "`n" | ConvertFrom-Json
Expand Down Expand Up @@ -109,7 +112,12 @@ Register-TabExpansion Drop-Database @{
function Drop-Database
{
[CmdletBinding(PositionalBinding = $false, SupportsShouldProcess = $true, ConfirmImpact = 'High')]
param([string] $Context, [string] $Project, [string] $StartupProject)
param(
[string] $Context,
[string] $Project,
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

$dteProject = GetProject $Project
$dteStartupProject = GetStartupProject $StartupProject $dteProject
Expand All @@ -120,6 +128,7 @@ function Drop-Database
{
$params = 'database', 'drop', '--force'
$params += GetParams $Context
$params += $RemainingArguments

EF $dteProject $dteStartupProject $params -skipBuild
}
Expand Down Expand Up @@ -167,7 +176,12 @@ Register-TabExpansion Get-DbContext @{
function Get-DbContext
{
[CmdletBinding(PositionalBinding = $false)]
param([string] $Context, [string] $Project, [string] $StartupProject)
param(
[string] $Context,
[string] $Project,
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

$dteProject = GetProject $Project
$dteStartupProject = GetStartupProject $StartupProject $dteProject
Expand All @@ -176,6 +190,7 @@ function Get-DbContext
{
$params = 'dbcontext', 'info', '--json'
$params += GetParams $Context
$params += $RemainingArguments
# NB: -join is here to support ConvertFrom-Json on PowerShell 3.0
return (EF $dteProject $dteStartupProject $params) -join "`n" | ConvertFrom-Json
}
Expand Down Expand Up @@ -223,7 +238,13 @@ Register-TabExpansion Remove-Migration @{
function Remove-Migration
{
[CmdletBinding(PositionalBinding = $false)]
param([switch] $Force, [string] $Context, [string] $Project, [string] $StartupProject)
param(
[switch] $Force,
[string] $Context,
[string] $Project,
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

$dteProject = GetProject $Project
$dteStartupProject = GetStartupProject $StartupProject $dteProject
Expand All @@ -236,6 +257,7 @@ function Remove-Migration
}

$params += GetParams $Context
$params += $RemainingArguments

# NB: -join is here to support ConvertFrom-Json on PowerShell 3.0
$result = (EF $dteProject $dteStartupProject $params) -join "`n" | ConvertFrom-Json
Expand Down Expand Up @@ -325,7 +347,9 @@ function Scaffold-DbContext
[switch] $UseDatabaseNames,
[switch] $Force,
[string] $Project,
[string] $StartupProject)
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

$dteProject = GetProject $Project
$dteStartupProject = GetStartupProject $StartupProject $dteProject
Expand Down Expand Up @@ -365,6 +389,8 @@ function Scaffold-DbContext
$params += '--force'
}

$params += $RemainingArguments

# NB: -join is here to support ConvertFrom-Json on PowerShell 3.0
$result = (EF $dteProject $dteStartupProject $params) -join "`n" | ConvertFrom-Json

Expand Down Expand Up @@ -413,7 +439,9 @@ function Script-DbContext
[string] $Output,
[string] $Context,
[string] $Project,
[string] $StartupProject)
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

$dteProject = GetProject $Project
$dteStartupProject = GetStartupProject $StartupProject $dteProject
Expand All @@ -438,6 +466,7 @@ function Script-DbContext
$params = 'dbcontext', 'script', '--output', $Output

$params += GetParams $Context
$params += $RemainingArguments

EF $dteProject $dteStartupProject $params

Expand Down Expand Up @@ -502,7 +531,9 @@ function Script-Migration
[string] $Output,
[string] $Context,
[string] $Project,
[string] $StartupProject)
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

$dteProject = GetProject $Project
$dteStartupProject = GetStartupProject $StartupProject $dteProject
Expand Down Expand Up @@ -542,6 +573,7 @@ function Script-Migration
}

$params += GetParams $Context
$params += $RemainingArguments

EF $dteProject $dteStartupProject $params

Expand Down Expand Up @@ -595,7 +627,9 @@ function Update-Database
[string] $Connection,
[string] $Context,
[string] $Project,
[string] $StartupProject)
[string] $StartupProject,
[Parameter(ValueFromRemainingArguments)]
[string[]] $RemainingArguments)

WarnIfEF6 'Update-Database'

Expand All @@ -615,6 +649,7 @@ function Update-Database
}

$params += GetParams $Context
$params += $RemainingArguments

EF $dteProject $dteStartupProject $params
}
Expand Down

0 comments on commit 87afef9

Please sign in to comment.