# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1457555600 -3600
# Node ID c0c1af0b3ddbbba3806a1b59861438b0ba95e814
# Parent  ab557e83c712483b1e9e474b947493e1d3e700a6
Fixed various result and query column/value errors.

diff -r ab557e83c712 -r c0c1af0b3ddb imiptools/period.py
--- a/imiptools/period.py	Wed Mar 09 21:32:29 2016 +0100
+++ b/imiptools/period.py	Wed Mar 09 21:33:20 2016 +0100
@@ -869,7 +869,7 @@
                 })
         self.cursor.execute(query, values)
         result = self.cursor.fetchone()
-        return result and result[0] or 0
+        return result and int(result[0]) or 0
 
     def __getitem__(self, i):
         return list(iter(self))[i]
@@ -923,20 +923,22 @@
         else:
             columns, values = ["object_uid"], [uid]
 
-        query, values = self.get_query(
+        query, _values = self.get_query(
             "select %(columns)s from %(table)s :condition" % {
-                "columns" : ", ".join(self.period_columns),
+                "columns" : self.columnlist(self.period_columns),
                 "table" : self.table_name
                 },
             columns, values)
 
-        self.cursor.execute(query, values)
+        self.cursor.execute(query, _values)
         removed = self.cursor.fetchall()
 
-        query = "delete from %(table)s %(condition)s" % {
-            "table" : self.table_name,
-            "condition" : condition
-            }
+        query, values = self.get_query(
+            "delete from %(table)s :condition" % {
+                "table" : self.table_name
+                },
+            columns, values)
+
         self.cursor.execute(query, values)
 
         return map(lambda t: FreeBusyPeriod(*t), removed)
@@ -958,20 +960,20 @@
         if recurrenceids is None:
             columns, values = ["object_uid", "object_recurrenceid is not null"], [uid]
         else:
-            columns, values = ["object_uid", "object_recurrenceid not in", "object_recurrenceid is not null"], [uid, recurrenceid]
+            columns, values = ["object_uid", "object_recurrenceid not in ?", "object_recurrenceid is not null"], [uid, tuple(recurrenceids)]
 
-        query, values = self.get_query(
+        query, _values = self.get_query(
             "select %(columns)s from %(table)s :condition" % {
-                "columns" : ", ".join(self.period_columns),
+                "columns" : self.columnlist(self.period_columns),
                 "table" : self.table_name
                 },
             columns, values)
 
-        self.cursor.execute(query, values)
+        self.cursor.execute(query, _values)
         removed = self.cursor.fetchall()
 
-        query = self.get_query(
-            "delete from %(table)s %(condition)s" % {
+        query, values = self.get_query(
+            "delete from %(table)s :condition" % {
                 "table" : self.table_name
                 },
             columns, values)
@@ -998,14 +1000,14 @@
 
         columns, values = ["object_uid", "start", "object_recurrenceid is null"], [uid, start]
 
-        query, values = self.get_query(
+        query, _values = self.get_query(
             "select %(columns)s from %(table)s :condition" % {
-                "columns" : ", ".join(self.period_columns),
+                "columns" : self.columnlist(self.period_columns),
                 "table" : self.table_name
                 },
             columns, values)
 
-        self.cursor.execute(query, values)
+        self.cursor.execute(query, _values)
         removed = self.cursor.fetchall()
 
         query, values = self.get_query(
@@ -1026,7 +1028,7 @@
 
         query, values = self.get_query(
             "select %(columns)s from %(table)s :condition" % {
-                "columns" : ", ".join(self.period_columns),
+                "columns" : self.columnlist(self.period_columns),
                 "table" : self.table_name
                 },
             columns, values)
@@ -1043,7 +1045,7 @@
 
         query, values = self.get_query(
             "select %(columns)s from %(table)s :condition" % {
-                "columns" : ", ".join(self.period_columns),
+                "columns" : self.columnlist(self.period_columns),
                 "table" : self.table_name
                 },
             columns, values)
@@ -1063,7 +1065,7 @@
 
         query, values = self.get_query(
             "select %(columns)s from %(table)s :condition" % {
-                "columns" : ", ".join(self.period_columns),
+                "columns" : self.columnlist(self.period_columns),
                 "table" : self.table_name
                 },
             columns, values)