- Correção de busca de .dll do postgres e padronização de busca pelos motores DAC.

Author: mobius1qwe

dac/lazarus/dac.firebird.zeos.pas

@@ -76,14 +76,14 @@ function TDAC.GetDefaultLibDir: string;
   Result := '';
   DefaultDir := ExtractFileDir(ParamStr(0));
   // Firebird depende de fbembed.dll ou fbclient.dll
-  if FileExists(DefaultDir + 'fbclient.dll') then
-    Result := DefaultDir + 'fbclient.dll'
-  else if FileExists(DefaultDir + 'fbembed.dll') then
-    Result := DefaultDir + 'fbembed.dll'
-  else if FileExists(DefaultDir + '\lib\fbclient.dll') then
+  if FileExists(DefaultDir + '\lib\fbclient.dll') then
     Result := DefaultDir + '\lib\fbclient.dll'
   else if FileExists(DefaultDir + '\lib\fbembed.dll') then
     Result := DefaultDir + '\lib\fbembed.dll'
+  else if FileExists(DefaultDir + 'fbclient.dll') then
+    Result := DefaultDir + 'fbclient.dll'
+  else if FileExists(DefaultDir + 'fbembed.dll') then
+    Result := DefaultDir + 'fbembed.dll'
   else
     raise Exception.Create('fbclient.dll ou fbembed.dll' +
       ' precisa estar na raiz do executável ou na pasta \lib\');

dac/lazarus/dac.mysql.zeos.pas

@@ -76,20 +76,19 @@ function TDAC.GetDefaultLibDir: string;
   Result := '';
   DefaultDir := ExtractFileDir(ParamStr(0));
   // libmysql.dll, libmariadb or libmysqld.dll
-  // procurando no diretório do exe primeiro, depois no diretório \lib\
 
-  if FileExists(DefaultDir + 'libmysql.dll') then
-    Result := DefaultDir + 'libmysql.dll'
-  else if FileExists(DefaultDir + 'libmariadb.dll') then
-    Result := DefaultDir + 'libmariadb.dll'
-  else if FileExists(DefaultDir + 'libmysqld.dll') then
-    Result := DefaultDir + 'libmysqld.dll'
-  else if FileExists(DefaultDir + '\lib\libmysql.dll') then
+  if FileExists(DefaultDir + '\lib\libmysql.dll') then
     Result := DefaultDir + '\lib\libmysql.dll'
   else if FileExists(DefaultDir + '\lib\libmariadb.dll') then
     Result := DefaultDir + '\lib\libmariadb.dll'
   else if FileExists(DefaultDir + '\lib\libmysqld.dll') then
     Result := DefaultDir + '\lib\libmysqld.dll'
+  else if FileExists(DefaultDir + 'libmysql.dll') then
+    Result := DefaultDir + 'libmysql.dll'
+  else if FileExists(DefaultDir + 'libmariadb.dll') then
+    Result := DefaultDir + 'libmariadb.dll'
+  else if FileExists(DefaultDir + 'libmysqld.dll') then
+    Result := DefaultDir + 'libmysqld.dll'
   else
     raise Exception.Create('libmysql.dll, libmariadb.dll ou libmysqld.dll' +
       ' precisam estar na raiz do executável ou na pasta \lib\');

dac/lazarus/dac.postgres.sqldb.pas

@@ -47,8 +47,8 @@ function TDAC.GetDefaultLibDir: string;
 
   if FileExists(DefaultDir + '\lib\libpq.dll') then
     Result := DefaultDir + '\lib\libpq.dll'
-  else if FileExists(DefaultDir + '\lib\libpq.dll') then
-    Result := DefaultDir + '\lib\libpq.dll'
+  else if FileExists(DefaultDir + 'libpq.dll') then
+    Result := DefaultDir + 'libpq.dll'
   else
     raise Exception.Create('libpq.dll' +
       ' precisa estar na raiz do executável ou na pasta \lib\');

dac/lazarus/dac.postgres.zeos.pas

@@ -107,8 +107,8 @@ function TDAC.GetDefaultLibDir: string;
 
   if FileExists(DefaultDir + '\lib\libpq.dll') then
     Result := DefaultDir + '\lib\libpq.dll'
-  else if FileExists(DefaultDir + '\lib\libpq.dll') then
-    Result := DefaultDir + '\lib\libpq.dll'
+  else if FileExists(DefaultDir + 'libpq.dll') then
+    Result := DefaultDir + 'libpq.dll'
   else
     raise Exception.Create('libpq.dll' +
       ' precisa estar na raiz do executável ou na pasta \lib\');