|
@@ -93,6 +93,9 @@ begin
|
|
end;
|
|
end;
|
|
|
|
|
|
procedure TOracleConnection.DoInternalConnect;
|
|
procedure TOracleConnection.DoInternalConnect;
|
|
|
|
+
|
|
|
|
+var ConnectString : string;
|
|
|
|
+
|
|
begin
|
|
begin
|
|
{$IfDef LinkDynamically}
|
|
{$IfDef LinkDynamically}
|
|
InitialiseOCI;
|
|
InitialiseOCI;
|
|
@@ -106,7 +109,10 @@ begin
|
|
if OciHandleAlloc(FOciEnvironment,FOciError,OCI_HTYPE_ERROR,0,FUserMem) <> OCI_SUCCESS then
|
|
if OciHandleAlloc(FOciEnvironment,FOciError,OCI_HTYPE_ERROR,0,FUserMem) <> OCI_SUCCESS then
|
|
DatabaseError(SErrHandleAllocFailed,self);
|
|
DatabaseError(SErrHandleAllocFailed,self);
|
|
|
|
|
|
- if OCILogon2(FOciEnvironment,FOciError,FOciSvcCtx,@username[1],length(username),@password[1],length(password),@databasename[1],length(databasename),OCI_DEFAULT) = OCI_ERROR then
|
|
|
|
|
|
+ if hostname='' then connectstring := databasename
|
|
|
|
+ else connectstring := '//'+hostname+'/'+databasename;
|
|
|
|
+
|
|
|
|
+ if OCILogon2(FOciEnvironment,FOciError,FOciSvcCtx,@username[1],length(username),@password[1],length(password),@connectstring[1],length(connectstring),OCI_DEFAULT) = OCI_ERROR then
|
|
HandleError;
|
|
HandleError;
|
|
end;
|
|
end;
|
|
|
|
|