firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:03:02 +01:00
Code Issues

Fixed my yesterday's commit.

Browse Source
This commit is contained in:
dimitr 2015-01-28 08:15:42 +00:00
parent 0c20b47e2c
commit 865f30b7d4
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/EngineInterface.h
View File

@ -158,12 +158,9 @@ public:
void setDelayedOutputFormat(Firebird::CheckStatusWrapper* status, Firebird::IMessageMetadata* format);
public:
JResultSet(DsqlCursor* handle, StableAttachmentPart* sa);
JResultSet(DsqlCursor* handle, JStatement* aStatement);
StableAttachmentPart* getAttachment()
{
return sAtt;
}
StableAttachmentPart* getAttachment();
DsqlCursor* getHandle() throw()
{
@ -172,7 +169,7 @@ public:
private:
DsqlCursor* cursor;
Firebird::RefPtr<StableAttachmentPart> sAtt;
Firebird::RefPtr<JStatement> statement;
int state;
void freeEngineData(Firebird::CheckStatusWrapper* status);

10
src/jrd/jrd.cpp
View File

@ -318,8 +318,8 @@ JTransaction::JTransaction(JTransaction* from)
}
JResultSet::JResultSet(DsqlCursor* handle, StableAttachmentPart* sa)
: cursor(handle), sAtt(sa), state(-1)
JResultSet::JResultSet(DsqlCursor* handle, JStatement* aStatement)
: cursor(handle), statement(aStatement), state(-1)
{
}
@ -4497,7 +4497,7 @@ JResultSet* JStatement::openCursor(CheckStatusWrapper* user_status, ITransaction
inMetadata, static_cast<UCHAR*>(inBuffer),
outMetadata, flags);
rs = new JResultSet(cursor, getAttachment());
rs = new JResultSet(cursor, this);
rs->addRef();
}
catch (const Exception& ex)
@ -4846,6 +4846,10 @@ void JResultSet::freeEngineData(CheckStatusWrapper* user_status)
successful_completion(user_status);
}
StableAttachmentPart* JResultSet::getAttachment()
{
return statement->getAttachment();
}
IMessageMetadata* JResultSet::getMetadata(CheckStatusWrapper* user_status)
{