diff options
author | randomdan <randomdan@localhost> | 2013-07-05 00:01:26 +0000 |
---|---|---|
committer | randomdan <randomdan@localhost> | 2013-07-05 00:01:26 +0000 |
commit | 5507f618e094554f04f61a950d9c6d2b55865d3e (patch) | |
tree | 6f3a750f79ad26047ff5322522219798d19aa64c /project2/sql/rdbmsDataSource.cpp | |
parent | Move remaining options out of environment (diff) | |
download | project2-5507f618e094554f04f61a950d9c6d2b55865d3e.tar.bz2 project2-5507f618e094554f04f61a950d9c6d2b55865d3e.tar.xz project2-5507f618e094554f04f61a950d9c6d2b55865d3e.zip |
Massive refactor to remove the appEngine and environment complication and instead have an execution context that's passed around from the original call site
Diffstat (limited to 'project2/sql/rdbmsDataSource.cpp')
-rw-r--r-- | project2/sql/rdbmsDataSource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/project2/sql/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp index 691daab..de20844 100644 --- a/project2/sql/rdbmsDataSource.cpp +++ b/project2/sql/rdbmsDataSource.cpp @@ -43,10 +43,10 @@ RdbmsDataSource::DSNSet RdbmsDataSource::changedDSNs; RdbmsDataSource::RdbmsDataSource(ScriptNodePtr p) : DataSource(p), masterDsn(p->child("masterdsn")), - preferLocal(p->value("preferlocal", true)) + preferLocal(p->value("preferlocal", true, NULL)) { BOOST_FOREACH(ScriptNodePtr node, p->childrenIn("readonly")) { - roDSNs.insert(ReadonlyDSNs::value_type(node->value("host").as<std::string>(), node)); + roDSNs.insert(ReadonlyDSNs::value_type(node->value("host", NULL).as<std::string>(), node)); } } @@ -194,8 +194,8 @@ RdbmsDataSource::RdbmsConnection::isExpired() const } RdbmsDataSource::ConnectionInfo::ConnectionInfo(ScriptNodePtr node) : - dsn(node->value("dsn").as<std::string>()), - typeId(Plugable::getLoader<ConnectionLoader, UnknownConnectionProvider>(node->value("provider"))) + dsn(node->value("dsn", NULL).as<std::string>()), + typeId(Plugable::getLoader<ConnectionLoader, UnknownConnectionProvider>(node->value("provider", NULL))) { } |