Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/Microsoft/SqlServer/Management/Smo/LoginBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,7 @@ public DatabaseMapping[] EnumDatabaseMappings()
{
CheckObjectState();

DatabaseMapping[] mapping = null;
DatabaseMapping[] mapping = new DatabaseMapping[0];
if (!this.IsDesignMode)
{
Urn uMappings = this.Urn.ToString() + "/DatabaseMapping";
Expand All @@ -1434,18 +1434,13 @@ public DatabaseMapping[] EnumDatabaseMappings()
if (dt.Rows.Count > 0)
{
mapping = new DatabaseMapping[dt.Rows.Count];
}
else
{
return null;
}

for (int iRow = 0; iRow < dt.Rows.Count; iRow++)
{
DataRow dr = dt.Rows[iRow];
mapping[iRow] = new DatabaseMapping(Convert.ToString(dr["LoginName"], SmoApplication.DefaultCulture),
Convert.ToString(dr["DBName"], SmoApplication.DefaultCulture),
Convert.ToString(dr["UserName"], SmoApplication.DefaultCulture));
for (int iRow = 0; iRow < dt.Rows.Count; iRow++)
{
DataRow dr = dt.Rows[iRow];
mapping[iRow] = new DatabaseMapping(Convert.ToString(dr["LoginName"], SmoApplication.DefaultCulture),
Convert.ToString(dr["DBName"], SmoApplication.DefaultCulture),
Convert.ToString(dr["UserName"], SmoApplication.DefaultCulture));
}
}
}
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ begin
</prefix>
<version min_major = '7' max_major = '8'>
<prefix>
exec('use ' + @db_name + ' INSERT #loginmappings select suser_sname(u.sid), db_name(), u.name, null from dbo.sysusers u where suser_sname(u.sid) is not null')
exec('use ' + @db_name + ' INSERT #loginmappings select login_name, db_name(), u.name, null from dbo.sysusers u CROSS APPLY (SELECT suser_sname(u.sid) AS login_name) AS ln where ln.login_name is not null')
</prefix>
</version>
<version min_major = '9' >
<prefix>
exec('use ' + @db_name + ' INSERT #loginmappings select suser_sname(u.sid), db_name(), u.name, null from sys.database_principals AS u where suser_sname(u.sid) is not null')
exec('use ' + @db_name + ' INSERT #loginmappings select login_name, db_name(), u.name, null from sys.database_principals AS u CROSS APPLY (SELECT suser_sname(u.sid) AS login_name) AS ln where ln.login_name is not null')
</prefix>
</version>
<prefix>
Expand Down