From 45cc282c454766fad0ed2bb236dfe95c591c4415 Mon Sep 17 00:00:00 2001
From: rylek <rylek@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 4 Aug 2010 13:07:11 +0000
Subject: [PATCH] .Oracle: BulkExecute continued ...

git-svn-id: svn://ultimatepp.org/upp/trunk@2593 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Oracle/Oci8.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/uppsrc/Oracle/Oci8.cpp b/uppsrc/Oracle/Oci8.cpp
index 76605844d..4dcc06896 100644
--- a/uppsrc/Oracle/Oci8.cpp
+++ b/uppsrc/Oracle/Oci8.cpp
@@ -441,7 +441,6 @@ bool OCI8Connection::BulkExecute(const char *stmt, const Vector< Vector<Value> >
 
 	for(int a = 0; a < args; a++) {
 		int max_row_len = 1;
-		unsigned sum_len = 0;
 		int sql_type = 0;
 		for(int r = 0; r < nrows; r++) {
 			Value v = (a < param_rows[r].GetCount() ? param_rows[r][a] : Value());
@@ -490,15 +489,11 @@ bool OCI8Connection::BulkExecute(const char *stmt, const Vector< Vector<Value> >
 			}
 			if(len > max_row_len)
 				max_row_len = len;
-			sum_len += len;
 		}
 
-		if(sql_type == 0) {
+		if(sql_type == 0)
 			sql_type = SQLT_STR;
-			sum_len = nrows;
-		}
-		if(sql_type != SQLT_STR)
-			sum_len = nrows * max_row_len;
+		int sum_len = nrows * max_row_len;
 		Item& p = param.Add(new Item(oci8));
 		p.Alloc(nrows, session->envhp, sql_type, sum_len, 0);
 		p.dyna_vtype = VOID_V;
@@ -548,11 +543,11 @@ bool OCI8Connection::BulkExecute(const char *stmt, const Vector< Vector<Value> >
 						s = ToUtf8(param_rows[r].GetCount() > a ? (WString)param_rows[r][a] : WString());
 					else
 						s = (param_rows[r].GetCount() > a ? (String)param_rows[r][a] : String());
-					*indp++ = IsNull(s) ? -1 : 0;
+					*indp++ = (IsNull(s) ? -1 : 0);
 					int rawlen = s.GetLength() + 1;
 					*lenp++ = rawlen;
 					memcpy(datp, s, rawlen);
-					datp += rawlen;
+					datp += max_row_len;
 				}
 				ASSERT((unsigned)(datp - (byte *)p.Data()) <= sum_len);
 				break;