aboutsummaryrefslogtreecommitdiff
path: root/odb/pgsql/no-id-object-result.txx
diff options
context:
space:
mode:
Diffstat (limited to 'odb/pgsql/no-id-object-result.txx')
-rw-r--r--odb/pgsql/no-id-object-result.txx23
1 files changed, 17 insertions, 6 deletions
diff --git a/odb/pgsql/no-id-object-result.txx b/odb/pgsql/no-id-object-result.txx
index e9682b2..c406155 100644
--- a/odb/pgsql/no-id-object-result.txx
+++ b/odb/pgsql/no-id-object-result.txx
@@ -19,11 +19,24 @@ namespace odb
}
template <typename T>
+ void no_id_object_result_impl<T>::
+ invalidate ()
+ {
+ if (!this->end_)
+ {
+ statement_->free_result ();
+ this->end_ = true;
+ }
+
+ statement_.reset ();
+ }
+
+ template <typename T>
no_id_object_result_impl<T>::
no_id_object_result_impl (const query_base&,
details::shared_ptr<select_statement> statement,
statements_type& statements)
- : base_type (statements.connection ().database ()),
+ : base_type (statements.connection ()),
statement_ (statement),
statements_ (statements),
count_ (0)
@@ -64,11 +77,9 @@ namespace odb
}
}
- odb::database& db (this->database ());
-
- object_traits::callback (db, obj, callback_event::pre_load);
- object_traits::init (obj, im, &db);
- object_traits::callback (db, obj, callback_event::post_load);
+ object_traits::callback (this->db_, obj, callback_event::pre_load);
+ object_traits::init (obj, im, &this->db_);
+ object_traits::callback (this->db_, obj, callback_event::post_load);
}
template <typename T>