github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.Oracle: added default POSIX names for OCI libraries (libclntsh.so)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3755 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
rylek 2011-08-08 08:58:36 +00:00
parent a483a0f9f7
commit 4e71ffdc56
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/Oracle/Oci7.cpp
View file

@ -16,7 +16,12 @@ typedef byte text;
NAMESPACE_UPP
#define DLLFILENAME "ociw32.dll"
#ifdef PLATFORM_WIN32
#define DLLFILENAME "ociw32.dll"
#else
#define DLLFILENAME "libclntsh.so"
#endif
#define DLIMODULE OCI7
#define DLIHEADER <Oracle/Oci7.dli>
#include <Core/dli_source.h>

11
uppsrc/Oracle/Oci8.cpp
View file

@ -7,7 +7,12 @@ NAMESPACE_UPP
#define LLOG(x) RLOG(x)
//#define DLLFILENAME "ora803.dll"
#define DLLFILENAME "oci.dll"
#ifdef PLATFORM_WIN32
#define DLLFILENAME "oci.dll"
#else
#define DLLFILENAME "libclntsh.so"
#endif
#define DLIMODULE OCI8
#define DLIHEADER <Oracle/Oci8.dli>
#include <Core/dli_source.h>
@ -1495,7 +1500,7 @@ void OracleBlob::Write(int64 at, const void *ptr, dword size) {
void OracleBlob::Assign(Oracle8& s, int64 blob) {
session = &s;
locp = (OCILobLocator *)blob;
locp = (OCILobLocator *)(ptrdiff_t)blob;
ub4 n;
OpenInit(READWRITE,
session->oci8.OCILobGetLength(session->svchp, session->errhp, locp, &n) == OCI_SUCCESS ? n : 0);
@ -1669,7 +1674,7 @@ void OracleClob::Write(const WString& w)
void OracleClob::Assign(Oracle8& s, int64 blob) {
session = &s;
locp = (OCILobLocator *)blob;
locp = (OCILobLocator *)(ptrdiff_t)blob;
ub4 n;
OpenInit(READWRITE,
session->oci8.OCILobGetLength(session->svchp, session->errhp, locp, &n) == OCI_SUCCESS

5
uppsrc/Sql/MassInsert.cpp
View file

@ -1,6 +1,6 @@
#include "Sql.h"
namespace Upp {
NAMESPACE_UPP
SqlMassInsert::~SqlMassInsert()
{
@ -84,4 +84,5 @@ void SqlMassInsert::Flush()
pos = 0;
}
};
END_UPP_NAMESPACE