some work in branches/join_models

added: ModelEnv class - now Model has a pointer to ModelEnv
       and ModelEnv has a pointer to ModelData, model_connector_mode, table_index and doc_field_pointer
       



git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1191 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2019-05-13 17:59:28 +00:00
parent 34ddf11351
commit b37a577713
9 changed files with 441 additions and 237 deletions

View File

@@ -35,6 +35,8 @@
#ifndef headerfile_morm_modeldata
#define headerfile_morm_modeldata
#include "queryresult.h"
namespace morm
{
@@ -47,6 +49,7 @@ public:
{
morm_current_max_column = 1;
current_column = 1;
query_result = nullptr;
}
virtual ~ModelData()
@@ -55,7 +58,12 @@ public:
bool has_autogenerated_select;
QueryResult * query_result;
// int table_index;
// can be moved to another struct?
// let ModelData be only for user stuff
PT::TextStream morm_finder_join_tables;
std::list<std::string> morm_foreign_keys;
int morm_current_max_column;
@@ -69,6 +77,9 @@ public:
virtual void prepare_to_new_select()
{
has_autogenerated_select = false;
query_result = nullptr;
// table_index = 1;
morm_current_max_column = 1;
morm_finder_join_tables.clear();