Commit 4b7b2f9a authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

[master] Use consistent case in SQLite3 naming

parent 9bb9dbe6
...@@ -47,12 +47,12 @@ checkConfig(ConstElementPtr config, ElementPtr errors) { ...@@ -47,12 +47,12 @@ checkConfig(ConstElementPtr config, ElementPtr errors) {
bool result = true; bool result = true;
if (!config || config->getType() != Element::map) { if (!config || config->getType() != Element::map) {
addError(errors, "Base config for SQlite3 backend must be a map"); addError(errors, "Base config for SQLite3 backend must be a map");
result = false; result = false;
} else { } else {
if (!config->contains(CONFIG_ITEM_DATABASE_FILE)) { if (!config->contains(CONFIG_ITEM_DATABASE_FILE)) {
addError(errors, addError(errors,
"Config for SQlite3 backend does not contain a '" + "Config for SQLite3 backend does not contain a '" +
string(CONFIG_ITEM_DATABASE_FILE) + string(CONFIG_ITEM_DATABASE_FILE) +
"' value"); "' value");
result = false; result = false;
...@@ -89,11 +89,11 @@ createInstance(isc::data::ConstElementPtr config, std::string& error) { ...@@ -89,11 +89,11 @@ createInstance(isc::data::ConstElementPtr config, std::string& error) {
new SQLite3Accessor(dbfile, "IN")); // XXX: avoid hardcode RR class new SQLite3Accessor(dbfile, "IN")); // XXX: avoid hardcode RR class
return (new DatabaseClient(isc::dns::RRClass::IN(), sqlite3_accessor)); return (new DatabaseClient(isc::dns::RRClass::IN(), sqlite3_accessor));
} catch (const std::exception& exc) { } catch (const std::exception& exc) {
error = std::string("Error creating sqlite3 datasource: ") + error = std::string("Error creating SQLite3 datasource: ") +
exc.what(); exc.what();
return (NULL); return (NULL);
} catch (...) { } catch (...) {
error = std::string("Error creating sqlite3 datasource, " error = std::string("Error creating SQLite3 datasource, "
"unknown exception"); "unknown exception");
return (NULL); return (NULL);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment