Skip to content

Commit 0876a80

Browse files
Standardize SQL syntax and improve query consistency
Updated SQL statements across multiple functions to use consistent casing for keywords (e.g., SELECT, AS, FROM, WHERE), standardized aliasing, and improved query formatting. These changes enhance code readability, maintainability, and reduce potential issues with SQL compatibility.
1 parent bbc9d63 commit 0876a80

File tree

108 files changed

+705
-704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+705
-704
lines changed

private/functions/Get-BackupAncientHistory.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function Get-BackupAncientHistory {
6767
a.Duration,
6868
a.[Path],
6969
a.Type,
70-
NULL as TotalSize,
70+
NULL AS TotalSize,
7171
a.MediaSetId,
7272
a.BackupSetID,
7373
a.Software,
@@ -76,21 +76,21 @@ function Get-BackupAncientHistory {
7676
a.database_backup_lsn,
7777
a.checkpoint_lsn,
7878
a.last_lsn,
79-
a.first_lsn as 'FirstLSN',
80-
a.database_backup_lsn as 'DatabaseBackupLsn',
81-
a.checkpoint_lsn as 'CheckpointLsn',
82-
a.last_lsn as 'Lastlsn',
79+
a.first_lsn AS 'FirstLSN',
80+
a.database_backup_lsn AS 'DatabaseBackupLsn',
81+
a.checkpoint_lsn AS 'CheckpointLsn',
82+
a.last_lsn AS 'Lastlsn',
8383
a.software_major_version,
8484
a.DeviceType,
85-
NULL as is_copy_only,
86-
NULL as last_recovery_fork_guid
85+
NULL AS is_copy_only,
86+
NULL AS last_recovery_fork_guid
8787
FROM (
8888
SELECT
8989
backupset.database_name AS [Database],
9090
(SELECT database_id FROM sys.databases WHERE name = backupset.database_name) AS DatabaseId,
9191
backupset.user_name AS Username,
9292
backupset.backup_start_date AS Start,
93-
backupset.server_name as [Server],
93+
backupset.server_name AS [Server],
9494
backupset.backup_finish_date AS [End],
9595
DATEDIFF(SECOND, backupset.backup_start_date, backupset.backup_finish_date) AS Duration,
9696
mediafamily.physical_device_name AS Path,
@@ -105,8 +105,8 @@ function Get-BackupAncientHistory {
105105
ELSE NULL
106106
END AS Type,
107107
backupset.media_set_id AS MediaSetId,
108-
mediafamily.media_family_id as mediafamilyid,
109-
backupset.backup_set_id as BackupSetID,
108+
mediafamily.media_family_id AS mediafamilyid,
109+
backupset.backup_set_id AS BackupSetID,
110110
CASE mediafamily.device_type
111111
WHEN 2 THEN 'Disk'
112112
WHEN 102 THEN 'Permanent Disk Device'
@@ -131,7 +131,7 @@ function Get-BackupAncientHistory {
131131
ON backupset.media_set_id = mediaset.media_set_id
132132
WHERE backupset.database_name = '$db'
133133
) AS a
134-
where a.backupsetid in (Select max(backup_set_id) from msdb..backupset where database_name='$db')"
134+
WHERE a.backupsetid IN (SELECT MAX(backup_set_id) FROM msdb..backupset WHERE database_name='$db')"
135135
Write-Message -Level Debug -Message $sql
136136
$results = $server.ConnectionContext.ExecuteWithResults($sql).Tables.Rows | Select-Object * -ExcludeProperty BackupSetRank, RowError, Rowstate, table, itemarray, haserrors
137137
Write-Message -Level SomewhatVerbose -Message "Processing as grouped output."
@@ -140,8 +140,8 @@ function Get-BackupAncientHistory {
140140
$groupResults = @()
141141
foreach ($group in $GroupedResults) {
142142

143-
$fileSql = "select file_type as FileType, logical_name as LogicalName, physical_name as PhysicalName
144-
from msdb.dbo.backupfile where backup_set_id='$($Group.group[0].BackupSetID)'"
143+
$fileSql = "SELECT file_type AS FileType, logical_name AS LogicalName, physical_name AS PhysicalName
144+
FROM msdb.dbo.backupfile WHERE backup_set_id='$($Group.group[0].BackupSetID)'"
145145

146146
Write-Message -Level Debug -Message "FileSQL: $fileSql"
147147

private/functions/Get-DbaDbPhysicalFile.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function Get-DbaDbPhysicalFile {
3535
return
3636
}
3737
if ($server.versionMajor -le 8) {
38-
$sql = "SELECT DB_NAME(dbid) AS name, Name AS LogicalName, filename AS PhysicalName, type FROM sysaltfiles"
38+
$sql = "SELECT DB_NAME(dbid) AS name, Name AS LogicalName, filename AS PhysicalName, type FROM sys.sysaltfiles"
3939
} else {
4040
$sql = "SELECT DB_NAME(database_id) AS Name, name AS LogicalName, physical_name AS PhysicalName, type FROM sys.master_files"
4141
}

private/functions/Get-DbaFileStreamFolder.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ function Get-DbaFileStreamFolder {
5454
return
5555
}
5656

57-
$sql = "select d.name as 'dbname', mf.Physical_Name from sys.master_files mf inner join sys.databases d on mf.database_id = d.database_id
58-
where mf.type=2"
57+
$sql = "SELECT d.name AS 'dbname', mf.Physical_Name FROM sys.master_files mf INNER JOIN sys.databases d ON mf.database_id = d.database_id
58+
WHERE mf.type=2"
5959
$databases = @()
6060
if ($null -ne $Database) {
6161
ForEach ($db in $Database) {
6262
$databases += "'$db'"
6363
}
64-
$sql = $sql + " and d.name in ( $($databases -join ',') )"
64+
$sql = $sql + " AND d.name IN ( $($databases -join ',') )"
6565
}
6666

6767
$results = $server.ConnectionContext.ExecuteWithResults($sql).Tables.Rows | Select-Object * -ExcludeProperty RowError, Rowstate, table, itemarray, haserrors

private/functions/Get-DecryptedObject.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ function Get-DecryptedObject {
2323
# key_id 102 eq service master key, thumbprint 3 means encrypted with machinekey
2424
Write-Message -Level Verbose -Message "Querying service master key"
2525
try {
26-
$sql = "SELECT substring(crypt_property,9,len(crypt_property)-8) as smk FROM sys.key_encryptions WHERE key_id=102 and thumbprint=0x0300000001"
26+
$sql = "SELECT SUBSTRING(crypt_property,9,LEN(crypt_property)-8) AS smk FROM sys.key_encryptions WHERE key_id=102 AND thumbprint=0x0300000001"
2727
$smkBytes = $server.Query($sql).smk
2828
if (-not $smkBytes) {
29-
$sql = "SELECT substring(crypt_property,9,len(crypt_property)-8) as smk FROM sys.key_encryptions WHERE key_id=102 and thumbprint=0x03"
29+
$sql = "SELECT SUBSTRING(crypt_property,9,LEN(crypt_property)-8) AS smk FROM sys.key_encryptions WHERE key_id=102 AND thumbprint=0x03"
3030
$smkBytes = $server.Query($sql).smk
3131
}
3232
} catch {
@@ -77,17 +77,17 @@ function Get-DecryptedObject {
7777
"LinkedServer" {
7878
"SELECT sysservers.srvname,
7979
syslnklgns.name,
80-
substring(syslnklgns.pwdhash,5,$ivlen) iv,
81-
substring(syslnklgns.pwdhash,$($ivlen + 5),
82-
len(syslnklgns.pwdhash)-$($ivlen + 4)) pass
80+
SUBSTRING(syslnklgns.pwdhash,5,$ivlen) AS iv,
81+
SUBSTRING(syslnklgns.pwdhash,$($ivlen + 5),
82+
LEN(syslnklgns.pwdhash)-$($ivlen + 4)) AS pass
8383
FROM master.sys.syslnklgns
84-
inner join master.sys.sysservers
85-
on syslnklgns.srvid=sysservers.srvid
86-
WHERE len(pwdhash) > 0"
84+
INNER JOIN master.sys.sysservers
85+
ON syslnklgns.srvid=sysservers.srvid
86+
WHERE LEN(pwdhash) > 0"
8787
}
8888
"Credential" {
8989
#"SELECT name,QUOTENAME(name) quotename,credential_identity,substring(imageval,5,$ivlen) iv, substring(imageval,$($ivlen + 5),len(imageval)-$($ivlen + 4)) pass from sys.credentials cred inner join sys.sysobjvalues obj on cred.credential_id = obj.objid where valclass=28 and valnum=2"
90-
"SELECT cred.name,QUOTENAME(cred.name) quotename,credential_identity,substring(imageval,5,$ivlen) iv, substring(imageval,$($ivlen + 5),len(imageval)-$($ivlen + 4)) pass,target_type as 'mappedClassType', cp.name as 'ProviderName' from sys.credentials cred inner join sys.sysobjvalues obj on cred.credential_id = obj.objid left outer join sys.cryptographic_providers cp on cred.target_id = cp.provider_id where valclass=28 and valnum=2"
90+
"SELECT cred.name,QUOTENAME(cred.name) AS quotename,credential_identity,SUBSTRING(imageval,5,$ivlen) AS iv, SUBSTRING(imageval,$($ivlen + 5),LEN(imageval)-$($ivlen + 4)) AS pass,target_type AS 'mappedClassType', cp.name AS 'ProviderName' FROM sys.credentials cred INNER JOIN sys.sysobjvalues obj ON cred.credential_id = obj.objid LEFT OUTER JOIN sys.cryptographic_providers cp ON cred.target_id = cp.provider_id WHERE valclass=28 AND valnum=2"
9191
}
9292
}
9393

private/functions/Get-LoginPasswordHash.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ function Get-LoginPasswordHash {
4747
$sql = switch ($server.VersionMajor) {
4848
8 {
4949
# SQL Server 2000
50-
"SELECT CONVERT(VARBINARY(256), password) as hashedpass FROM master.dbo.sysxlogins WHERE name = '$($Login.Name)'"
50+
"SELECT CONVERT(VARBINARY(256), password) AS hashedpass FROM master.dbo.sysxlogins WHERE name = '$($Login.Name)'"
5151
}
5252
9 {
5353
# SQL Server 2005
54-
"SELECT CONVERT(VARBINARY(256), password_hash) as hashedpass FROM sys.sql_logins WHERE name = '$($Login.Name)'"
54+
"SELECT CONVERT(VARBINARY(256), password_hash) AS hashedpass FROM sys.sql_logins WHERE name = '$($Login.Name)'"
5555
}
5656
default {
5757
# SQL Server 2008 and above
58-
"SELECT CAST(CONVERT(varchar(256), CAST(LOGINPROPERTY(name, 'PasswordHash') AS VARBINARY(256)), 1) AS NVARCHAR(max)) as hashedpass FROM sys.server_principals WHERE principal_id = $($Login.ID)"
58+
"SELECT CAST(CONVERT(VARCHAR(256), CAST(LOGINPROPERTY(name, 'PasswordHash') AS VARBINARY(256)), 1) AS NVARCHAR(MAX)) AS hashedpass FROM sys.server_principals WHERE principal_id = $($Login.ID)"
5959
}
6060
}
6161

private/functions/Get-OfflineSqlFileStructure.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Internal function. Returns dictionary object that contains file structures for S
2626
$filestream = $filelist | Where-Object { $_.Type -eq "S" }
2727

2828
if ($filestream) {
29-
$sql = "select coalesce(SERVERPROPERTY('FilestreamConfiguredLevel'),0) as fs"
29+
$sql = "SELECT COALESCE(SERVERPROPERTY('FilestreamConfiguredLevel'),0) AS fs"
3030
$fscheck = $server.databases['master'].ExecuteWithResults($sql)
3131
if ($fscheck.tables.fs -eq 0) { return $false }
3232
}

private/functions/Get-RestoreContinuableDatabase.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function Get-RestoreContinuableDatabase {
2323
return
2424
}
2525
if ($server.VersionMajor -ge 9) {
26-
$sql = "select distinct db_name(database_id) as 'Database', differential_base_lsn, redo_start_lsn, redo_start_fork_guid as 'FirstRecoveryForkID' from master.sys.master_files where redo_start_lsn is not NULL"
26+
$sql = "SELECT DISTINCT DB_NAME(database_id) AS 'Database', differential_base_lsn, redo_start_lsn, redo_start_fork_guid AS 'FirstRecoveryForkID' FROM master.sys.master_files WHERE redo_start_lsn IS NOT NULL"
2727
} else {
2828
$sql = "
2929
CREATE TABLE #db_info

private/functions/Get-SqlDefaultPaths.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function Get-SqlDefaultPaths {
3434
if ($filepath.Length -eq 0) { $filepath = $server.Information.MasterDbLogPath }
3535
# Third attempt
3636
if ($filepath.Length -eq 0) {
37-
$sql = "select SERVERPROPERTY('InstanceDefaultLogPath') as physical_name"
37+
$sql = "SELECT SERVERPROPERTY('InstanceDefaultLogPath') AS physical_name"
3838
$filepath = $server.ConnectionContext.ExecuteScalar($sql)
3939
}
4040
} else {
@@ -44,7 +44,7 @@ function Get-SqlDefaultPaths {
4444
if ($filepath.Length -eq 0) { $filepath = $server.Information.MasterDbPath }
4545
# Third attempt
4646
if ($filepath.Length -eq 0) {
47-
$sql = "select SERVERPROPERTY('InstanceDefaultDataPath') as physical_name"
47+
$sql = "SELECT SERVERPROPERTY('InstanceDefaultDataPath') AS physical_name"
4848
$filepath = $server.ConnectionContext.ExecuteScalar($sql)
4949
}
5050
}

private/functions/Get-XpDirTreeRestoreFile.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ function Get-XpDirTreeRestoreFile {
6161
}
6262
if ($server.VersionMajor -ge 14) {
6363
# this is all kinds of cool, api could be expanded sooo much here
64-
$sql = "SELECT file_or_directory_name AS subdirectory, ~CONVERT(BIT, is_directory) as [file], 1 as depth
64+
$sql = "SELECT file_or_directory_name AS subdirectory, ~CONVERT(BIT, is_directory) AS [file], 1 AS depth
6565
FROM sys.dm_os_enumerate_filesystem('$Path', '*')
66-
WHERE [level] = 0"
66+
WHERE [level] = 0"
6767
} elseif ($server.VersionMajor -lt 9) {
68-
$sql = "EXEC master..xp_dirtree '$Path',1,1;"
68+
$sql = "EXEC master..xp_dirtree '$Path', 1, 1;"
6969
} else {
70-
$sql = "EXEC master.sys.xp_dirtree '$Path',1,1;"
70+
$sql = "EXEC master.sys.xp_dirtree '$Path', 1, 1;"
7171
}
7272
#$queryResult = Invoke-DbaQuery -SqlInstance $SqlInstance -Credential $SqlCredential -Database tempdb -Query $query
7373
$queryResult = $server.Query($sql)

private/functions/Invoke-DbaDbCorruption.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function Invoke-DbaDbCorruption {
137137
return
138138
}
139139

140-
$RowCount = $db.Query("select top 1 * from $($tb.name)")
140+
$RowCount = $db.Query("SELECT TOP 1 * FROM $($tb.name)")
141141
if ($RowCount.count -eq 0) {
142142
Stop-Function -EnableException:$EnableException -Message "The table $tb has no rows" -Target $table
143143
return

0 commit comments

Comments
 (0)