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

@@ -40,7 +40,7 @@
#include "textstream/textstream.h"
#include "date/date.h"
#include "morm_types.h"
#include "modeldata.h"
#include "modelenv.h"
@@ -330,13 +330,15 @@ protected:
(*out_stream) << ","; // make a virtual method
}
ModelEnv model_env_local;
m.model_env = &model_env_local;
//before_field_value(field_value);
m.set_connector(model_connector);
m.model_connector_mode = model_connector_mode;
m.model_data = model_data;
m.model_env->model_connector_mode = model_connector_mode;
m.model_env->model_data = model_data;
generate_from_model(m);
m.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
m.model_data = nullptr;
m.model_env = nullptr;
//after_field_value(field_value);
is_first = false;
}