Tidy SQL statements into sub-dirs

28 files changed, 44 insertions, 49 deletions

diff --git a/p2pvr/daemon/maintenance/events.cpp b/p2pvr/daemon/maintenance/events.cpp
index b4b3c92..0f4cf4e 100644
--- a/p2pvr/daemon/maintenance/events.cpp
+++ b/p2pvr/daemon/maintenance/events.cpp
@@ -7,7 +7,7 @@
 #include <tablepatch.h>
 #include <sqlWriter.h>
 #include <slicer/modelPartsTypes.impl.h>
-#include "sql/Maint_pruneEvents.sql.h"
+#include "sql/maintenance/pruneEvents.sql.h"
 
 class SiEventsStream : public Slicer::Stream<DVBSI::EventPtr> {
 	private:
@@ -84,7 +84,7 @@ Maintenance::UpdateEvents(const Ice::Current & ice)
 	Slicer::SerializeAny<Slicer::SqlTablePatchSerializer>(stream, dbc.get(), tp);
 
 
-	P2PVR::sql::Maint_pruneEvents.modify(dbc.get())->execute();
+	P2PVR::sql::maintenance::pruneEvents.modify(dbc.get())->execute();
 	logger->messagebf(LOG::INFO, "%s: Updated events", __PRETTY_FUNCTION__);
 
 	auto sch = P2PVR::SchedulesPrx::checkedCast(ice.adapter->createProxy(ic->stringToIdentity("Schedules")));
diff --git a/p2pvr/daemon/recordings.cpp b/p2pvr/daemon/recordings.cpp
index 7c5125b..5570d4c 100644
--- a/p2pvr/daemon/recordings.cpp
+++ b/p2pvr/daemon/recordings.cpp
@@ -4,9 +4,8 @@
 #include <slicer/slicer.h>
 #include <slicer/db/sqlSelectDeserializer.h>
 #include <slicer/db/sqlInsertSerializer.h>
-#include <sql/Recordings_delete.sql.h>
-#include <sql/Recordings_getAll.sql.h>
-#include <sql/Recordings_getStorage.sql.h>
+#include <sql/recordings/deleteById.sql.h>
+#include <sql/recordings/getAll.sql.h>
 
 IceTray::Logging::LoggerPtr Recordings::logger(LOGMANAGER()->getLogger<Recordings>());
 
@@ -31,7 +30,7 @@ Recordings::DeleteRecording(int id, const Ice::Current &)
 {
 	auto dbc = db->get();
 	logger->messagebf(LOG::INFO, "%s: Deleting recording Id: %d", __PRETTY_FUNCTION__, id);
-	auto del = P2PVR::sql::Recordings_delete.modify(dbc.get());
+	auto del = P2PVR::sql::recordings::deleteById.modify(dbc.get());
 	del->bindParamI(0, id);
 	del->execute();
 }
@@ -40,6 +39,6 @@ P2PVR::RecordingList
 Recordings::GetRecordings(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::RecordingList>(P2PVR::sql::Recordings_getAll);
+	return fetch<P2PVR::RecordingList>(P2PVR::sql::recordings::getAll);
 }
 
diff --git a/p2pvr/daemon/schedules.cpp b/p2pvr/daemon/schedules.cpp
index f343e91..389a979 100644
--- a/p2pvr/daemon/schedules.cpp
+++ b/p2pvr/daemon/schedules.cpp
@@ -11,11 +11,11 @@
 #include <tablepatch.h>
 #include <p2pvr-int.h>
 
-#include "sql/Schedules_getCandidates.sql.h"
-#include "sql/Schedules_delete.sql.h"
-#include "sql/Schedules_selectAll.sql.h"
-#include "sql/Schedules_selectById.sql.h"
-#include "sql/Schedules_scheduledToRecord.sql.h"
+#include "sql/schedules/getCandidates.sql.h"
+#include "sql/schedules/deleteById.sql.h"
+#include "sql/schedules/selectAll.sql.h"
+#include "sql/schedules/selectById.sql.h"
+#include "sql/schedules/scheduledToRecord.sql.h"
 
 namespace po = boost::program_options;
 
@@ -197,7 +197,7 @@ Schedules::DoReschedule(const Ice::Current & ice)
 	unsigned int tunerCount = devs->TunerCount();
 
 	// Load list from database
-	auto episodes = fetch<P2PVR::ScheduleCandidates>(P2PVR::sql::Schedules_getCandidates);
+	auto episodes = fetch<P2PVR::ScheduleCandidates>(P2PVR::sql::schedules::getCandidates);
 
 	Episodes scheduleList;
 	Showings allShowings;
@@ -301,7 +301,7 @@ void
 Schedules::DeleteSchedule(int id, const Ice::Current & ice)
 {
 	auto dbc = db->get();
-	auto del = P2PVR::sql::Schedules_delete.modify(dbc.get());
+	auto del = P2PVR::sql::schedules::deleteById.modify(dbc.get());
 	del->bindParamI(0, id);
 	del->execute();
 	DoReschedule(ice);
@@ -311,14 +311,14 @@ P2PVR::ScheduleList
 Schedules::GetSchedules(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::ScheduleList>(P2PVR::sql::Schedules_selectAll);
+	return fetch<P2PVR::ScheduleList>(P2PVR::sql::schedules::selectAll);
 }
 
 P2PVR::SchedulePtr
 Schedules::GetSchedule(int id, const Ice::Current &)
 {
 	logger->messagebf(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
-	auto schedules = fetch<P2PVR::ScheduleList>(P2PVR::sql::Schedules_selectById, id);
+	auto schedules = fetch<P2PVR::ScheduleList>(P2PVR::sql::schedules::selectById, id);
 	if (schedules.empty()) throw P2PVR::NotFound();
 	return schedules.front();
 }
@@ -327,7 +327,7 @@ P2PVR::ScheduledToRecordList
 Schedules::GetScheduledToRecord(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::ScheduledToRecordList>(P2PVR::sql::Schedules_scheduledToRecord);
+	return fetch<P2PVR::ScheduledToRecordList>(P2PVR::sql::schedules::scheduledToRecord);
 }
 
 Ice::Int
diff --git a/p2pvr/daemon/si.cpp b/p2pvr/daemon/si.cpp
index 1186547..bee7fa7 100644
--- a/p2pvr/daemon/si.cpp
+++ b/p2pvr/daemon/si.cpp
@@ -6,20 +6,20 @@
 #include <slicer/slicer.h>
 #include <logger.h>
 
-#include "sql/SI_allNetworks.sql.h"
-#include "sql/SI_allDeliveries.sql.h"
-#include "sql/SI_deliveryForTransport.sql.h"
-#include "sql/SI_deliveryForService.sql.h"
-#include "sql/SI_serviceNextUsed.sql.h"
-#include "sql/SI_servicesSelectAll.sql.h"
-#include "sql/SI_servicesSelectById.sql.h"
-#include "sql/SI_eventByUid.sql.h"
-#include "sql/SI_eventById.sql.h"
-#include "sql/SI_eventsOnNow.sql.h"
-#include "sql/SI_eventsInSchedule.sql.h"
-#include "sql/SI_eventsInSchedules.sql.h"
-#include "sql/SI_eventsInRange.sql.h"
-#include "sql/SI_eventSearch.sql.h"
+#include "sql/si/allNetworks.sql.h"
+#include "sql/si/allDeliveries.sql.h"
+#include "sql/si/deliveryForTransport.sql.h"
+#include "sql/si/deliveryForService.sql.h"
+#include "sql/si/serviceNextUsed.sql.h"
+#include "sql/si/servicesSelectAll.sql.h"
+#include "sql/si/servicesSelectById.sql.h"
+#include "sql/si/eventByUid.sql.h"
+#include "sql/si/eventById.sql.h"
+#include "sql/si/eventsOnNow.sql.h"
+#include "sql/si/eventsInSchedule.sql.h"
+#include "sql/si/eventsInSchedules.sql.h"
+#include "sql/si/eventsInRange.sql.h"
+#include "sql/si/eventSearch.sql.h"
 
 IceTray::Logging::LoggerPtr SI::logger(LOGMANAGER()->getLogger<SI>());
 
@@ -32,14 +32,14 @@ DVBSI::Networks
 SI::GetNetworks(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<DVBSI::Networks>(P2PVR::sql::SI_allNetworks);
+	return fetch<DVBSI::Networks>(P2PVR::sql::si::allNetworks);
 }
 
 P2PVR::Deliveries
 SI::GetAllDeliveries(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	auto rtn = fetch<P2PVR::Deliveries>("delivery_type", P2PVR::sql::SI_allDeliveries);
+	auto rtn = fetch<P2PVR::Deliveries>("delivery_type", P2PVR::sql::si::allDeliveries);
 	logger->messagebf(LOG::DEBUG, "%s: Found %d delivery methods", __PRETTY_FUNCTION__, rtn.size());
 	return rtn;
 }
@@ -49,7 +49,7 @@ SI::GetDeliveryForTransport(int id, const Ice::Current&)
 {
 	try {
 		logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
-		return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::SI_deliveryForTransport, id);
+		return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::si::deliveryForTransport, id);
 	}
 	catch (const Slicer::NoRowsReturned &) {
 		throw P2PVR::NotFound();
@@ -61,7 +61,7 @@ SI::GetDeliveryForSi(const Ice::Current&)
 {
 	try {
 		logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-		return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::SI_serviceNextUsed);
+		return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::si::serviceNextUsed);
 	}
 	catch (const Slicer::NoRowsReturned &) {
 		return NULL;
@@ -73,7 +73,7 @@ SI::GetDeliveryForService(int id, const Ice::Current&)
 {
 	try {
 		logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
-		return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::SI_deliveryForService, id);
+		return fetch<DVBSI::DeliveryPtr>("delivery_type", P2PVR::sql::si::deliveryForService, id);
 	}
 	catch (const Slicer::NoRowsReturned &) {
 		throw P2PVR::NotFound();
@@ -84,14 +84,14 @@ DVBSI::ServiceList
 SI::GetServices(const Ice::Current&)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<DVBSI::ServiceList>(P2PVR::sql::SI_servicesSelectAll);
+	return fetch<DVBSI::ServiceList>(P2PVR::sql::si::servicesSelectAll);
 }
 
 DVBSI::ServicePtr
 SI::GetService(int id, const Ice::Current&)
 {
 	logger->messagef(LOG::DEBUG, "%s(%d)", __PRETTY_FUNCTION__, id);
-	auto rtn = fetch<DVBSI::ServiceList>(P2PVR::sql::SI_servicesSelectById, id);
+	auto rtn = fetch<DVBSI::ServiceList>(P2PVR::sql::si::servicesSelectById, id);
 	if (rtn.empty()) throw P2PVR::NotFound();
 	return rtn.front();
 }
@@ -102,7 +102,7 @@ SI::GetEvents(const P2PVR::IntSequence & eventUids, const Ice::Current &)
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
 	P2PVR::Events rtn;
 	for (const auto & uid : eventUids) {
-		auto list = fetch<P2PVR::Events>(P2PVR::sql::SI_eventByUid, uid);
+		auto list = fetch<P2PVR::Events>(P2PVR::sql::si::eventByUid, uid);
 		std::copy(list.begin(), list.end(), std::back_inserter(rtn));
 	}
 	if (rtn.size() != eventUids.size()) throw P2PVR::NotFound();
@@ -113,7 +113,7 @@ P2PVR::EventPtr
 SI::GetEvent(int serviceId, int eventId, const Ice::Current &)
 {
 	logger->messagef(LOG::DEBUG, "%s(s=%d, e=%d)", __PRETTY_FUNCTION__, serviceId, eventId);
-	auto rtn = fetch<P2PVR::Events>(P2PVR::sql::SI_eventById, serviceId, eventId);
+	auto rtn = fetch<P2PVR::Events>(P2PVR::sql::si::eventById, serviceId, eventId);
 	if (rtn.empty()) throw P2PVR::NotFound();
 	return rtn.front();
 }
@@ -122,7 +122,7 @@ P2PVR::Events
 SI::EventsOnNow(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsOnNow);
+	return fetch<P2PVR::Events>(P2PVR::sql::si::eventsOnNow);
 }
 
 namespace IceTray {
@@ -142,7 +142,7 @@ P2PVR::Events
 SI::EventsInRange(const Common::DateTime & from, const Common::DateTime & to, const Ice::Current &)
 {
 	logger->messagebf(LOG::DEBUG, "%s([%s]-[%s])", from, to, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsInRange, from, to);
+	return fetch<P2PVR::Events>(P2PVR::sql::si::eventsInRange, from, to);
 }
 
 P2PVR::Events
@@ -150,20 +150,20 @@ SI::EventSearch(const IceUtil::Optional<std::string> & keywords, const IceUtil::
 {
 	logger->messagebf(LOG::DEBUG, "%s(keywords=%s,serviceId=%s,from=%s,to=%s)",
 			keywords, serviceId, from, to, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::Events>(P2PVR::sql::SI_eventSearch, from, to, serviceId, serviceId, keywords, keywords, keywords, keywords);
+	return fetch<P2PVR::Events>(P2PVR::sql::si::eventSearch, from, to, serviceId, serviceId, keywords, keywords, keywords, keywords);
 }
 
 P2PVR::Events
 SI::EventsInSchedules(const Ice::Current &)
 {
 	logger->message(LOG::DEBUG, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsInSchedules);
+	return fetch<P2PVR::Events>(P2PVR::sql::si::eventsInSchedules);
 }
 
 P2PVR::Events
 SI::EventsInSchedule(int scheduleId, const Ice::Current &)
 {
 	logger->messagebf(LOG::DEBUG, "%s(%d)", scheduleId, __PRETTY_FUNCTION__);
-	return fetch<P2PVR::Events>(P2PVR::sql::SI_eventsInSchedule, scheduleId);
+	return fetch<P2PVR::Events>(P2PVR::sql::si::eventsInSchedule, scheduleId);
 }
 
diff --git a/p2pvr/daemon/sql/Recordings_getStorage.sql b/p2pvr/daemon/sql/Recordings_getStorage.sql
deleted file mode 100644
index fdaf58d..0000000
--- a/p2pvr/daemon/sql/Recordings_getStorage.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-SELECT storageAddress, guid
-FROM recordings
-WHERE recordingId = ?
-
diff --git a/p2pvr/daemon/sql/Maint_pruneEvents.sql b/p2pvr/daemon/sql/maintenance/pruneEvents.sql
index b6f1d1b..b6f1d1b 100644
--- a/p2pvr/daemon/sql/Maint_pruneEvents.sql
+++ b/p2pvr/daemon/sql/maintenance/pruneEvents.sql
diff --git a/p2pvr/daemon/sql/Recordings_delete.sql b/p2pvr/daemon/sql/recordings/deleteById.sql
index 3395376..3395376 100644
--- a/p2pvr/daemon/sql/Recordings_delete.sql
+++ b/p2pvr/daemon/sql/recordings/deleteById.sql
diff --git a/p2pvr/daemon/sql/Recordings_getAll.sql b/p2pvr/daemon/sql/recordings/getAll.sql
index 3c3ff51..3c3ff51 100644
--- a/p2pvr/daemon/sql/Recordings_getAll.sql
+++ b/p2pvr/daemon/sql/recordings/getAll.sql
diff --git a/p2pvr/daemon/sql/Schedules_delete.sql b/p2pvr/daemon/sql/schedules/deleteById.sql
index e14edc3..e14edc3 100644
--- a/p2pvr/daemon/sql/Schedules_delete.sql
+++ b/p2pvr/daemon/sql/schedules/deleteById.sql
diff --git a/p2pvr/daemon/sql/Schedules_getCandidates.sql b/p2pvr/daemon/sql/schedules/getCandidates.sql
index 0bb7bd8..0bb7bd8 100644
--- a/p2pvr/daemon/sql/Schedules_getCandidates.sql
+++ b/p2pvr/daemon/sql/schedules/getCandidates.sql
diff --git a/p2pvr/daemon/sql/Schedules_pendingRecord.sql b/p2pvr/daemon/sql/schedules/pendingRecord.sql
index ba4d7d8..ba4d7d8 100644
--- a/p2pvr/daemon/sql/Schedules_pendingRecord.sql
+++ b/p2pvr/daemon/sql/schedules/pendingRecord.sql
diff --git a/p2pvr/daemon/sql/Schedules_scheduledToRecord.sql b/p2pvr/daemon/sql/schedules/scheduledToRecord.sql
index 3695bb5..3695bb5 100644
--- a/p2pvr/daemon/sql/Schedules_scheduledToRecord.sql
+++ b/p2pvr/daemon/sql/schedules/scheduledToRecord.sql
diff --git a/p2pvr/daemon/sql/Schedules_selectAll.sql b/p2pvr/daemon/sql/schedules/selectAll.sql
index 56778a9..56778a9 100644
--- a/p2pvr/daemon/sql/Schedules_selectAll.sql
+++ b/p2pvr/daemon/sql/schedules/selectAll.sql
diff --git a/p2pvr/daemon/sql/Schedules_selectById.sql b/p2pvr/daemon/sql/schedules/selectById.sql
index 291398c..291398c 100644
--- a/p2pvr/daemon/sql/Schedules_selectById.sql
+++ b/p2pvr/daemon/sql/schedules/selectById.sql
diff --git a/p2pvr/daemon/sql/SI_allDeliveries.sql b/p2pvr/daemon/sql/si/allDeliveries.sql
index 2efa70a..2efa70a 100644
--- a/p2pvr/daemon/sql/SI_allDeliveries.sql
+++ b/p2pvr/daemon/sql/si/allDeliveries.sql
diff --git a/p2pvr/daemon/sql/SI_allNetworks.sql b/p2pvr/daemon/sql/si/allNetworks.sql
index 37d7e64..37d7e64 100644
--- a/p2pvr/daemon/sql/SI_allNetworks.sql
+++ b/p2pvr/daemon/sql/si/allNetworks.sql
diff --git a/p2pvr/daemon/sql/SI_deliveryForService.sql b/p2pvr/daemon/sql/si/deliveryForService.sql
index cf4115f..cf4115f 100644
--- a/p2pvr/daemon/sql/SI_deliveryForService.sql
+++ b/p2pvr/daemon/sql/si/deliveryForService.sql
diff --git a/p2pvr/daemon/sql/SI_deliveryForTransport.sql b/p2pvr/daemon/sql/si/deliveryForTransport.sql
index 1805d7a..1805d7a 100644
--- a/p2pvr/daemon/sql/SI_deliveryForTransport.sql
+++ b/p2pvr/daemon/sql/si/deliveryForTransport.sql
diff --git a/p2pvr/daemon/sql/SI_eventById.sql b/p2pvr/daemon/sql/si/eventById.sql
index b751ad6..b751ad6 100644
--- a/p2pvr/daemon/sql/SI_eventById.sql
+++ b/p2pvr/daemon/sql/si/eventById.sql
diff --git a/p2pvr/daemon/sql/SI_eventByUid.sql b/p2pvr/daemon/sql/si/eventByUid.sql
index 1d559ec..1d559ec 100644
--- a/p2pvr/daemon/sql/SI_eventByUid.sql
+++ b/p2pvr/daemon/sql/si/eventByUid.sql
diff --git a/p2pvr/daemon/sql/SI_eventSearch.sql b/p2pvr/daemon/sql/si/eventSearch.sql
index ffbe93f..ffbe93f 100644
--- a/p2pvr/daemon/sql/SI_eventSearch.sql
+++ b/p2pvr/daemon/sql/si/eventSearch.sql
diff --git a/p2pvr/daemon/sql/SI_eventsInRange.sql b/p2pvr/daemon/sql/si/eventsInRange.sql
index 1d0eb17..1d0eb17 100644
--- a/p2pvr/daemon/sql/SI_eventsInRange.sql
+++ b/p2pvr/daemon/sql/si/eventsInRange.sql
diff --git a/p2pvr/daemon/sql/SI_eventsInSchedule.sql b/p2pvr/daemon/sql/si/eventsInSchedule.sql
index 72ae26e..72ae26e 100644
--- a/p2pvr/daemon/sql/SI_eventsInSchedule.sql
+++ b/p2pvr/daemon/sql/si/eventsInSchedule.sql
diff --git a/p2pvr/daemon/sql/SI_eventsInSchedules.sql b/p2pvr/daemon/sql/si/eventsInSchedules.sql
index 880b28a..880b28a 100644
--- a/p2pvr/daemon/sql/SI_eventsInSchedules.sql
+++ b/p2pvr/daemon/sql/si/eventsInSchedules.sql
diff --git a/p2pvr/daemon/sql/SI_eventsOnNow.sql b/p2pvr/daemon/sql/si/eventsOnNow.sql
index 391e8de..391e8de 100644
--- a/p2pvr/daemon/sql/SI_eventsOnNow.sql
+++ b/p2pvr/daemon/sql/si/eventsOnNow.sql
diff --git a/p2pvr/daemon/sql/SI_serviceNextUsed.sql b/p2pvr/daemon/sql/si/serviceNextUsed.sql
index e5fbbf1..e5fbbf1 100644
--- a/p2pvr/daemon/sql/SI_serviceNextUsed.sql
+++ b/p2pvr/daemon/sql/si/serviceNextUsed.sql
diff --git a/p2pvr/daemon/sql/SI_servicesSelectAll.sql b/p2pvr/daemon/sql/si/servicesSelectAll.sql
index 513a076..513a076 100644
--- a/p2pvr/daemon/sql/SI_servicesSelectAll.sql
+++ b/p2pvr/daemon/sql/si/servicesSelectAll.sql
diff --git a/p2pvr/daemon/sql/SI_servicesSelectById.sql b/p2pvr/daemon/sql/si/servicesSelectById.sql
index f0bda72..f0bda72 100644
--- a/p2pvr/daemon/sql/SI_servicesSelectById.sql
+++ b/p2pvr/daemon/sql/si/servicesSelectById.sql