paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 06:29:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r36383 into '.':

Browse Source 
U    packages/fcl-db/src/base/database.inc
--- Recording mergeinfo for merge of r36383 into '.':
 U   .

# revisions: 36383

git-svn-id: branches/fixes_3_0@36384 -
This commit is contained in:
marco 2017-06-01 08:16:31 +00:00
parent 32124fd64c
commit fb0e43122c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-db/src/base/database.inc
View File

@ -525,10 +525,12 @@ begin
begin begin
GetLoginParams(ADatabaseName, AUserName, APassword); GetLoginParams(ADatabaseName, AUserName, APassword);
if Assigned(FOnLogin) then if Assigned(FOnLogin) then
FOnLogin(Self, AUserName, APassword) FOnLogin(Self, AUserName, APassword) // by value
else if Assigned(LoginDialogExProc) then else if Assigned(LoginDialogExProc) then
LoginDialogExProc(ADatabaseName, AUserName, APassword, False); begin
SetLoginParams(ADatabaseName, AUserName, APassword); LoginDialogExProc(ADatabaseName, AUserName, APassword, False); // by reference
SetLoginParams(ADatabaseName, AUserName, APassword);
end;
end; end;
end; end;
@ -572,7 +574,7 @@ begin
if IsPublishedProp(Self,'UserName') then if IsPublishedProp(Self,'UserName') then
AUserName := GetStrProp(Self,'UserName'); AUserName := GetStrProp(Self,'UserName');
if IsPublishedProp(Self,'Password') then if IsPublishedProp(Self,'Password') then
APassword := 'Password'; APassword := GetStrProp(Self,'Password');
end; end;
procedure TCustomConnection.SetLoginParams(const ADatabaseName, AUserName, APassword: string); procedure TCustomConnection.SetLoginParams(const ADatabaseName, AUserName, APassword: string);