aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantin Michael <constantin@codesynthesis.com>2011-11-16 11:46:26 +0200
committerConstantin Michael <constantin@codesynthesis.com>2011-11-16 11:47:16 +0200
commit2cf8874cc29fa5b9869c6048987971beb8911114 (patch)
tree3ad15ce6b70c39217d8208858b29dabd758651ca
parentc94ffe778485970621a709ccf1312568ddaf7943 (diff)
Allocate position context in oracle::lob struct instead of in Oracle LOB image
-rw-r--r--odb/relational/oracle/header.cxx1
-rw-r--r--odb/relational/oracle/source.cxx7
2 files changed, 2 insertions, 6 deletions
diff --git a/odb/relational/oracle/header.cxx b/odb/relational/oracle/header.cxx
index 17c1103..25efea3 100644
--- a/odb/relational/oracle/header.cxx
+++ b/odb/relational/oracle/header.cxx
@@ -216,7 +216,6 @@ namespace relational
<< "sb2 " << mi.var << "indicator;"
<< "oracle::lob " << mi.var << "lob;"
<< "mutable oracle::lob_context " << mi.var << "context;"
- << "ub4 " << mi.var << "position_context;"
<< endl;
}
diff --git a/odb/relational/oracle/source.cxx b/odb/relational/oracle/source.cxx
index 5c66154..1ca35fd 100644
--- a/odb/relational/oracle/source.cxx
+++ b/odb/relational/oracle/source.cxx
@@ -301,12 +301,9 @@ namespace relational
{
os << b << ".type = " <<
lob_buffer_types[mi.st->type - sql_type::BLOB] << ";"
- << arg << "." << mi.var << "lob.position_context = &" << arg <<
- "." << mi.var << "position_context;"
<< b << ".buffer = &" << arg << "." << mi.var << "lob;"
<< b << ".indicator = &" << arg << "." << mi.var << "indicator;"
- << b << ".callback = &" << arg << "." << mi.var <<
- "callback;"
+ << b << ".callback = &" << arg << "." << mi.var << "callback;"
<< b << ".context = &" << arg << "." << mi.var << "context;"
<< endl;
}
@@ -587,7 +584,7 @@ namespace relational
virtual void
traverse_lob (member_info& mi)
{
- os << "i." << mi.var << "position_context = 0;"
+ os << "i." << mi.var << "lob.position = 0;"
<< traits << "::set_image (" << endl
<< "i." << mi.var << "callback.param," << endl
<< "i." << mi.var << "context.param," << endl