Commit b4190951 authored by Pavel Vainerman's avatar Pavel Vainerman

(SQLite): немного откорректировал реализацию DBServer_SQLite

parent 3519c924
......@@ -78,11 +78,14 @@ DBServer_SQLite::~DBServer_SQLite()
{
db->close();
delete db;
db = 0;
}
}
//--------------------------------------------------------------------------------------------
void DBServer_SQLite::processingMessage( UniSetTypes::VoidMessage *msg )
{
DBServer::processingMessage(msg);
switch(msg->type)
{
case Message::Timer:
......@@ -93,13 +96,14 @@ void DBServer_SQLite::processingMessage( UniSetTypes::VoidMessage *msg )
}
default:
DBServer::processingMessage(msg);
break;
}
}
//--------------------------------------------------------------------------------------------
void DBServer_SQLite::sysCommand( UniSetTypes::SystemMessage *sm )
{
DBServer::sysCommand(sm);
switch( sm->command )
{
case SystemMessage::StartUp:
......@@ -108,7 +112,6 @@ void DBServer_SQLite::sysCommand( UniSetTypes::SystemMessage *sm )
case SystemMessage::Finish:
{
activate = false;
// db->freeResult();
db->close();
}
break;
......@@ -116,7 +119,6 @@ void DBServer_SQLite::sysCommand( UniSetTypes::SystemMessage *sm )
case SystemMessage::FoldUp:
{
activate = false;
// db->freeResult();
db->close();
}
break;
......@@ -125,7 +127,6 @@ void DBServer_SQLite::sysCommand( UniSetTypes::SystemMessage *sm )
break;
}
}
//--------------------------------------------------------------------------------------------
void DBServer_SQLite::parse( UniSetTypes::DBMessage* dbm )
{
......@@ -155,8 +156,6 @@ void DBServer_SQLite::parse( UniSetTypes::DBMessage* dbm )
if( !writeToBase(query.str()) )
{
unideb[Debug::CRIT] << myname << "(update): error: "<< db->error() << endl;
// if( dbm->qtype == DBMessage::Query )
// db->freeResult();
}
}
......@@ -181,7 +180,6 @@ void DBServer_SQLite::parse( UniSetTypes::ConfirmMessage* cem )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(update_confirm): db error: "<< db->error() << endl;
// db->freeResult();
}
}
catch( Exception& ex )
......@@ -278,7 +276,6 @@ void DBServer_SQLite::parse( UniSetTypes::SensorMessage *si )
{
if( unideb.debugging(Debug::CRIT) )
unideb[Debug::CRIT] << myname << "(insert) sensor msg error: "<< db->error() << endl;
// db->freeResult();
}
}
catch( Exception& ex )
......
......@@ -25,7 +25,38 @@ INSERT INTO main_history VALUES(NULL,0,0,0,105,20.3,1,0);
INSERT INTO main_history VALUES(NULL,0,0,0,106,20.65,1,0);
INSERT INTO main_history VALUES(NULL,0,0,0,107,20233.7,1,0);
INSERT INTO main_history VALUES(NULL,0,0,0,108,245560.67671,1,0);
DROP TABLE IF EXISTS `main_emergencylog`;
CREATE TABLE `main_emergencylog` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
`date` date NOT NULL,
`time` time NOT NULL,
`time_usec` INTEGER(5) NOT NULL,
`type_id` INTEGER(5) NOT NULL,
CONSTRAINT `type_id_refs_id_a3133ca` FOREIGN KEY (`type_id`) REFERENCES `main_emergencytype` (`id`)
);
DROP TABLE IF EXISTS `main_emergencyrecords`;
CREATE TABLE `main_emergencyrecords` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
`date` date NOT NULL,
`time` time NOT NULL,
`time_usec` INTEGER(10) NOT NULL,
`log_id` INTEGER(11) NOT NULL,
`sensor_id` INTEGER(10) NOT NULL,
`value` double NOT NULL,
CONSTRAINT `log_id_refs_id_77a37ea9` FOREIGN KEY (`log_id`) REFERENCES `main_emergencylog` (`id`),
CONSTRAINT `sensor_id_refs_id_436bab5e` FOREIGN KEY (`sensor_id`) REFERENCES `main_sensor` (`id`)
);
_EOF_
#
# KEY `main_emergencyrecords_log_id` (`log_id`),
# KEY `main_emergencyrecords_sensor_id` (`sensor_id`),
# KEY main_history_sensor_id (sensor_id)
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