Skip to content

Commit

Permalink
Sqlcollaborative -> Dataplat, sqlcollaborative -> dataplat (#8632)
Browse files Browse the repository at this point in the history
  • Loading branch information
potatoqualitee authored Nov 8, 2022
1 parent a8b9cd6 commit 04c15d5
Show file tree
Hide file tree
Showing 158 changed files with 1,982 additions and 1,982 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ blank_issues_enabled: false
contact_links:
- name: Issues found with dbatools.io?
url: https://github.com/dataplat/web/issues/new
about: Website is hosted via GitHub Pages under sqlcollaborative/web
about: Website is hosted via GitHub Pages under dataplat/web
- name: Issues found with docs.dbatools.io?
url: https://github.com/dataplat/docs/issues/new
about: Website is hosted under sqlcollaborative/docs
about: Website is hosted under dataplat/docs
- name: Ask a question about dbatools or get support
url: https://github.com/dataplat/dbatools/discussions/new
about: Get support via forums
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: 👥 Clone appveyor repo
working-directory: /tmp
run: |
gh repo clone sqlcollaborative/appveyor-lab
gh repo clone dataplat/appveyor-lab
- name: Run tests
env:
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code of Conduct

SQLCollaborative Organization and the dbatools team is dedicated to providing a positive and harassment-free experience for everyone, regardless of age, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, ethnicity, race, religion, nationality, or level of experience. We do not tolerate harassment in any form, nor do we tolerate any behavior that would reasonably lead to someone being made to feel unsafe, insecure, or frightened for their physical or emotional well-being.
The Data Platform Community Organization and the dbatools team is dedicated to providing a positive and harassment-free experience for everyone, regardless of age, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, ethnicity, race, religion, nationality, or level of experience. We do not tolerate harassment in any form, nor do we tolerate any behavior that would reasonably lead to someone being made to feel unsafe, insecure, or frightened for their physical or emotional well-being.

This applies to all interactions here on GitHub, Slack, YouTube comments and YouTube chat. All communication should be appropriate for a professional audience including people of many different backgrounds.

Expand Down
2 changes: 1 addition & 1 deletion bin/dbatools-index.json.REMOVED.git-id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dd3f591362f6ac11490b76095057c2be87e82f34
77e9759849937c68ae385cf5a4c1696723440291
2,600 changes: 1,300 additions & 1,300 deletions bin/dbatools.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bin/library.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ if ($ImportLibrary) {
}

#region PowerShell TypeData
#Update-TypeData -TypeName "Sqlcollaborative.Dbatools.dbaSystem.DbatoolsException" -SerializationDepth 2 -ErrorAction Ignore
#Update-TypeData -TypeName "Sqlcollaborative.Dbatools.dbaSystem.DbatoolsExceptionRecord" -SerializationDepth 2 -ErrorAction Ignore
#Update-TypeData -TypeName "Dataplat.Dbatools.dbaSystem.DbatoolsException" -SerializationDepth 2 -ErrorAction Ignore
#Update-TypeData -TypeName "Dataplat.Dbatools.dbaSystem.DbatoolsExceptionRecord" -SerializationDepth 2 -ErrorAction Ignore
#endregion PowerShell TypeData
} catch {
#region Warning
Expand Down
2 changes: 1 addition & 1 deletion bin/type-extensions.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Only update on first import
if (-not ([Sqlcollaborative.Dbatools.dbaSystem.SystemHost]::ModuleImported)) {
if (-not ([Dataplat.Dbatools.dbaSystem.SystemHost]::ModuleImported)) {
# Implement query accelerator for the server object
Update-TypeData -TypeName Microsoft.SqlServer.Management.Smo.Server -MemberName Query -MemberType ScriptMethod -Value {
param (
Expand Down
40 changes: 20 additions & 20 deletions bin/typealiases.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ $TAType = [psobject].Assembly.GetType("System.Management.Automation.TypeAccelera

# Define our type aliases
$TypeAliasTable = @{
DbaInstance = "Sqlcollaborative.Dbatools.Parameter.DbaInstanceParameter"
DbaCmConnectionParameter = "Sqlcollaborative.Dbatools.Parameter.DbaCmConnectionParameter"
DbaInstanceParameter = "Sqlcollaborative.Dbatools.Parameter.DbaInstanceParameter"
dbargx = "Sqlcollaborative.Dbatools.Utility.RegexHelper"
dbatime = "Sqlcollaborative.Dbatools.Utility.DbaTime"
dbadatetime = "Sqlcollaborative.Dbatools.Utility.DbaDateTime"
dbadate = "Sqlcollaborative.Dbatools.Utility.DbaDate"
dbatimespan = "Sqlcollaborative.Dbatools.Utility.DbaTimeSpan"
prettytimespan = "Sqlcollaborative.Dbatools.Utility.DbaTimeSpanPretty"
dbasize = "Sqlcollaborative.Dbatools.Utility.Size"
dbavalidate = "Sqlcollaborative.Dbatools.Utility.Validation"
DbaMode = "Sqlcollaborative.Dbatools.General.ExecutionMode"
DbaCredential = "Sqlcollaborative.Dbatools.Parameter.DbaCredentialparameter"
DbaCredentialParameter = "Sqlcollaborative.Dbatools.Parameter.DbaCredentialparameter"
DbaDatabaseSmo = "SqlCollaborative.Dbatools.Parameter.DbaDatabaseSmoParameter"
DbaDatabaseSmoParameter = "SqlCollaborative.Dbatools.Parameter.DbaDatabaseSmoParameter"
DbaDatabase = "SqlCollaborative.Dbatools.Parameter.DbaDatabaseParameter"
DbaDatabaseParameter = "SqlCollaborative.Dbatools.Parameter.DbaDatabaseParameter"
DbaValidatePattern = "Sqlcollaborative.Dbatools.Utility.DbaValidatePatternAttribute"
DbaValidateScript = "Sqlcollaborative.Dbatools.Utility.DbaValidateScriptAttribute"
DbaInstance = "Dataplat.Dbatools.Parameter.DbaInstanceParameter"
DbaCmConnectionParameter = "Dataplat.Dbatools.Parameter.DbaCmConnectionParameter"
DbaInstanceParameter = "Dataplat.Dbatools.Parameter.DbaInstanceParameter"
dbargx = "Dataplat.Dbatools.Utility.RegexHelper"
dbatime = "Dataplat.Dbatools.Utility.DbaTime"
dbadatetime = "Dataplat.Dbatools.Utility.DbaDateTime"
dbadate = "Dataplat.Dbatools.Utility.DbaDate"
dbatimespan = "Dataplat.Dbatools.Utility.DbaTimeSpan"
prettytimespan = "Dataplat.Dbatools.Utility.DbaTimeSpanPretty"
dbasize = "Dataplat.Dbatools.Utility.Size"
dbavalidate = "Dataplat.Dbatools.Utility.Validation"
DbaMode = "Dataplat.Dbatools.General.ExecutionMode"
DbaCredential = "Dataplat.Dbatools.Parameter.DbaCredentialparameter"
DbaCredentialParameter = "Dataplat.Dbatools.Parameter.DbaCredentialparameter"
DbaDatabaseSmo = "Dataplat.Dbatools.Parameter.DbaDatabaseSmoParameter"
DbaDatabaseSmoParameter = "Dataplat.Dbatools.Parameter.DbaDatabaseSmoParameter"
DbaDatabase = "Dataplat.Dbatools.Parameter.DbaDatabaseParameter"
DbaDatabaseParameter = "Dataplat.Dbatools.Parameter.DbaDatabaseParameter"
DbaValidatePattern = "Dataplat.Dbatools.Utility.DbaValidatePatternAttribute"
DbaValidateScript = "Dataplat.Dbatools.Utility.DbaValidateScriptAttribute"
}

# Add all type aliases
Expand Down
26 changes: 13 additions & 13 deletions dbatools.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ if ($IsLinux -or $IsMacOS) {
$env:COMPUTERNAME = hostname
}

if ('Sqlcollaborative.Dbatools.dbaSystem.DebugHost' -as [Type]) {
if ('Dataplat.Dbatools.dbaSystem.DebugHost' -as [Type]) {
# If we've already got for module import,
[Sqlcollaborative.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Clear() # clear it (since we're clearly re-importing)
[Dataplat.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Clear() # clear it (since we're clearly re-importing)
}

#region Import helper functions
Expand Down Expand Up @@ -97,18 +97,18 @@ function Write-ImportTime {
$script:dbatools_ImportPerformance = New-Object Collections.ArrayList
}

if (-not ('Sqlcollaborative.Dbatools.Configuration.Config' -as [type])) {
if (-not ('Dataplat.Dbatools.Configuration.Config' -as [type])) {
$script:dbatools_ImportPerformance.AddRange(@(New-Object PSObject -Property @{ Time = $timestamp; Action = $Text }))
} else {
if ([Sqlcollaborative.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Count -eq 0) {
if ([Dataplat.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Count -eq 0) {
foreach ($entry in $script:dbatools_ImportPerformance) {
$te = New-Object Sqlcollaborative.Dbatools.dbaSystem.StartTimeEntry($entry.Action, $entry.Time, [Management.Automation.Runspaces.Runspace]::DefaultRunspace.InstanceId)
[Sqlcollaborative.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Add($te)
$te = New-Object Dataplat.Dbatools.dbaSystem.StartTimeEntry($entry.Action, $entry.Time, [Management.Automation.Runspaces.Runspace]::DefaultRunspace.InstanceId)
[Dataplat.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Add($te)
}
$script:dbatools_ImportPerformance.Clear()
}
$te = New-Object Sqlcollaborative.Dbatools.dbaSystem.StartTimeEntry($Text, $timestamp, ([Management.Automation.Runspaces.Runspace]::DefaultRunspace.InstanceId))
[Sqlcollaborative.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Add($te)
$te = New-Object Dataplat.Dbatools.dbaSystem.StartTimeEntry($Text, $timestamp, ([Management.Automation.Runspaces.Runspace]::DefaultRunspace.InstanceId))
[Dataplat.Dbatools.dbaSystem.DebugHost]::ImportTimeEntries.Add($te)
}
}

Expand Down Expand Up @@ -222,7 +222,7 @@ whether the modulebase has been set (first thing it does after loading library t
Theoretically, there's a minor cuncurrency collision risk with that, but since the cost is only
a little import time loss if that happens ...
#>
if ((-not ('Sqlcollaborative.Dbatools.dbaSystem.DebugHost' -as [type])) -or (-not [Sqlcollaborative.Dbatools.dbaSystem.SystemHost]::ModuleBase)) {
if ((-not ('Dataplat.Dbatools.dbaSystem.DebugHost' -as [type])) -or (-not [Dataplat.Dbatools.dbaSystem.SystemHost]::ModuleBase)) {
. $script:psScriptRoot\internal\scripts\libraryimport.ps1
Write-ImportTime -Text "Starting import SMO libraries"
}
Expand All @@ -243,7 +243,7 @@ if ((-not ('Sqlcollaborative.Dbatools.dbaSystem.DebugHost' -as [type])) -or (-no
Write-ImportTime -Text "Loading dbatools library"

# Tell the library where the module is based, just in case
[Sqlcollaborative.Dbatools.dbaSystem.SystemHost]::ModuleBase = $script:PSModuleRoot
[Dataplat.Dbatools.dbaSystem.SystemHost]::ModuleBase = $script:PSModuleRoot

if ($script:multiFileImport -or -not (Test-Path -Path "$psScriptRoot\allcommands.ps1")) {
# All internal functions privately available within the toolset
Expand Down Expand Up @@ -279,8 +279,8 @@ Write-ImportTime -Text "Configuration System"

# Resolving the path was causing trouble when it didn't exist yet
# Not converting the path separators based on OS was also an issue.
if (-not ([Sqlcollaborative.Dbatools.Message.LogHost]::LoggingPath)) {
[Sqlcollaborative.Dbatools.Message.LogHost]::LoggingPath = Join-DbaPath $script:AppData "PowerShell" "dbatools"
if (-not ([Dataplat.Dbatools.Message.LogHost]::LoggingPath)) {
[Dataplat.Dbatools.Message.LogHost]::LoggingPath = Join-DbaPath $script:AppData "PowerShell" "dbatools"
}

# Run all optional code
Expand Down Expand Up @@ -1138,7 +1138,7 @@ if ($loadedModuleNames -contains 'sqlserver' -or $loadedModuleNames -contains 's
}
}

[Sqlcollaborative.Dbatools.dbaSystem.SystemHost]::ModuleImported = $true
[Dataplat.Dbatools.dbaSystem.SystemHost]::ModuleImported = $true
#endregion Post-Import Cleanup

# Removal of runspaces is needed to successfully close PowerShell ISE
Expand Down
2 changes: 1 addition & 1 deletion en-us/dbatools-help.xml.REMOVED.git-id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6cbf9801ae8e9318b79a6194f346750835b12a1e
108e76d6281f06ee8af1ab2091ba1356c9206020
2 changes: 1 addition & 1 deletion en-us/dbatools.dll-help.xml
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@
<command:returnValues>
<command:returnValue>
<dev:type>
<maml:name>Sqlcollaborative.Dbatools.Configuration.Config</maml:name>
<maml:name>Dataplat.Dbatools.Configuration.Config</maml:name>
</dev:type>
<maml:description>
<maml:para></maml:para>
Expand Down
2 changes: 1 addition & 1 deletion functions/Add-DbaDbRoleMember.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function Add-DbaDbRoleMember {
foreach ($input in $InputObject) {
$inputType = $input.GetType().FullName
switch ($inputType) {
'Sqlcollaborative.Dbatools.Parameter.DbaInstanceParameter' {
'Dataplat.Dbatools.Parameter.DbaInstanceParameter' {
Write-Message -Level Verbose -Message "Processing DbaInstanceParameter through InputObject"
$dbRoles = Get-DbaDBRole -SqlInstance $input -SqlCredential $SqlCredential -Database $Database -Role $Role
}
Expand Down
2 changes: 1 addition & 1 deletion functions/Add-DbaServerRoleMember.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function Add-DbaServerRoleMember {
}

switch ($inputType) {
'Sqlcollaborative.Dbatools.Parameter.DbaInstanceParameter' {
'Dataplat.Dbatools.Parameter.DbaInstanceParameter' {
Write-Message -Level Verbose -Message "Processing DbaInstanceParameter through InputObject"
try {
$serverRoles = Get-DbaServerRole -SqlInstance $input -SqlCredential $SqlCredential -ServerRole $ServerRole -EnableException
Expand Down
18 changes: 9 additions & 9 deletions functions/Connect-DbaInstance.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ function Connect-DbaInstance {
[switch]$AzureUnsupported,
[string]$BatchSeparator,
[string]$ClientName = (Get-DbatoolsConfigValue -FullName 'sql.connection.clientname'),
[int]$ConnectTimeout = ([Sqlcollaborative.Dbatools.Connection.ConnectionHost]::SqlConnectionTimeout),
[int]$ConnectTimeout = ([Dataplat.Dbatools.Connection.ConnectionHost]::SqlConnectionTimeout),
[switch]$EncryptConnection = (Get-DbatoolsConfigValue -FullName 'sql.connection.encrypt'),
[string]$FailoverPartner,
[int]$LockTimeout,
Expand Down Expand Up @@ -355,7 +355,7 @@ function Connect-DbaInstance {
return
}

if ($ENV:APPVEYOR_BUILD_FOLDER -or ([Sqlcollaborative.Dbatools.Message.MEssageHost]::DeveloperMode)) { Stop-Function -Message }
if ($ENV:APPVEYOR_BUILD_FOLDER -or ([Dataplat.Dbatools.Message.MEssageHost]::DeveloperMode)) { Stop-Function -Message }
else {
Write-Message -Level Warning -Message "Failed TEPP Caching: $($scriptBlock.ToString() | Select-String '"(.*?)"' | ForEach-Object { $_.Matches[0].Groups[1].Value })" -ErrorRecord $_ 3>$null
}
Expand Down Expand Up @@ -991,21 +991,21 @@ function Connect-DbaInstance {
$server

# Register the connected instance, so that the TEPP updater knows it's been connected to and starts building the cache
[Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::SetInstance($instance.FullSmoName.ToLowerInvariant(), $server.ConnectionContext.Copy(), ($server.ConnectionContext.FixedServerRoles -match "SysAdmin"))
[Dataplat.Dbatools.TabExpansion.TabExpansionHost]::SetInstance($instance.FullSmoName.ToLowerInvariant(), $server.ConnectionContext.Copy(), ($server.ConnectionContext.FixedServerRoles -match "SysAdmin"))

# Update cache for instance names
if ([Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::Cache["sqlinstance"] -notcontains $instance.FullSmoName.ToLowerInvariant()) {
[Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::Cache["sqlinstance"] += $instance.FullSmoName.ToLowerInvariant()
if ([Dataplat.Dbatools.TabExpansion.TabExpansionHost]::Cache["sqlinstance"] -notcontains $instance.FullSmoName.ToLowerInvariant()) {
[Dataplat.Dbatools.TabExpansion.TabExpansionHost]::Cache["sqlinstance"] += $instance.FullSmoName.ToLowerInvariant()
}

# Update lots of registered stuff
# Default for [Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::TeppSyncDisabled is $true, so will not run by default
# Must be explicitly activated with [Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::TeppSyncDisabled = $false to run
if (-not [Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::TeppSyncDisabled) {
# Default for [Dataplat.Dbatools.TabExpansion.TabExpansionHost]::TeppSyncDisabled is $true, so will not run by default
# Must be explicitly activated with [Dataplat.Dbatools.TabExpansion.TabExpansionHost]::TeppSyncDisabled = $false to run
if (-not [Dataplat.Dbatools.TabExpansion.TabExpansionHost]::TeppSyncDisabled) {
# Variable $FullSmoName is used inside the script blocks, so we have to set
$FullSmoName = $instance.FullSmoName.ToLowerInvariant()
Write-Message -Level Debug -Message "Will run Invoke-TEPPCacheUpdate for FullSmoName = $FullSmoName"
foreach ($scriptBlock in ([Sqlcollaborative.Dbatools.TabExpansion.TabExpansionHost]::TeppGatherScriptsFast)) {
foreach ($scriptBlock in ([Dataplat.Dbatools.TabExpansion.TabExpansionHost]::TeppGatherScriptsFast)) {
Invoke-TEPPCacheUpdate -ScriptBlock $scriptBlock
}
}
Expand Down
4 changes: 2 additions & 2 deletions functions/ConvertTo-DbaDataTable.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function ConvertTo-DbaDataTable {
# I couldn't decide on what to convert it to so the user can decide.
# If the parameter is not used, TotalMilliseconds will be used as default.
# Ticks are more accurate but I think milliseconds are more useful most of the time.
if (($type -eq 'System.TimeSpan') -or ($type -eq 'Sqlcollaborative.Dbatools.Utility.DbaTimeSpan') -or ($type -eq 'Sqlcollaborative.Dbatools.Utility.DbaTimeSpanPretty')) {
if (($type -eq 'System.TimeSpan') -or ($type -eq 'Dataplat.Dbatools.Utility.DbaTimeSpan') -or ($type -eq 'Dataplat.Dbatools.Utility.DbaTimeSpanPretty')) {
$special = $true
if ($timespantype -eq 'String') {
$value = $value.ToString()
Expand All @@ -149,7 +149,7 @@ function ConvertTo-DbaDataTable {
$type = 'System.Int64'
}
$specialType = 'Timespan'
} elseif ($type -eq 'Sqlcollaborative.Dbatools.Utility.Size') {
} elseif ($type -eq 'Dataplat.Dbatools.Utility.Size') {
$special = $true
switch ($sizetype) {
'Int64' {
Expand Down
2 changes: 1 addition & 1 deletion functions/ConvertTo-DbaTimeline.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function ConvertTo-DbaTimeline {
if ($InputObject[0].TypeName -eq 'AgentJobHistory') {
$CallerName = "Get-DbaAgentJobHistory"
$data = $InputObject | Select-Object @{ Name = "SqlInstance"; Expression = { $_.SqlInstance } }, @{ Name = "InstanceName"; Expression = { $_.InstanceName } }, @{ Name = "vLabel"; Expression = { "[" + $($_.SqlInstance -replace "\\", "\\\") + "] " + $_.Job -replace "\'", '' } }, @{ Name = "hLabel"; Expression = { $_.Status } }, @{ Name = "Style"; Expression = { $(Convert-DbaTimelineStatusColor($_.Status)) } }, @{ Name = "StartDate"; Expression = { $(ConvertTo-JsDate($_.StartDate)) } }, @{ Name = "EndDate"; Expression = { $(ConvertTo-JsDate($_.EndDate)) } }
} elseif ($InputObject[0] -is [Sqlcollaborative.Dbatools.Database.BackupHistory]) {
} elseif ($InputObject[0] -is [Dataplat.Dbatools.Database.BackupHistory]) {
$CallerName = " Get-DbaDbBackupHistory"
$data = $InputObject | Select-Object @{ Name = "SqlInstance"; Expression = { $_.SqlInstance } }, @{ Name = "InstanceName"; Expression = { $_.InstanceName } }, @{ Name = "vLabel"; Expression = { "[" + $($_.SqlInstance -replace "\\", "\\\") + "] " + $_.Database } }, @{ Name = "hLabel"; Expression = { $_.Type } }, @{ Name = "StartDate"; Expression = { $(ConvertTo-JsDate($_.Start)) } }, @{ Name = "EndDate"; Expression = { $(ConvertTo-JsDate($_.End)) } }
} else {
Expand Down
Loading

0 comments on commit 04c15d5

Please sign in to comment.