1.1 --- a/imiptools/period.py Wed Mar 09 21:32:29 2016 +0100
1.2 +++ b/imiptools/period.py Wed Mar 09 21:33:20 2016 +0100
1.3 @@ -869,7 +869,7 @@
1.4 })
1.5 self.cursor.execute(query, values)
1.6 result = self.cursor.fetchone()
1.7 - return result and result[0] or 0
1.8 + return result and int(result[0]) or 0
1.9
1.10 def __getitem__(self, i):
1.11 return list(iter(self))[i]
1.12 @@ -923,20 +923,22 @@
1.13 else:
1.14 columns, values = ["object_uid"], [uid]
1.15
1.16 - query, values = self.get_query(
1.17 + query, _values = self.get_query(
1.18 "select %(columns)s from %(table)s :condition" % {
1.19 - "columns" : ", ".join(self.period_columns),
1.20 + "columns" : self.columnlist(self.period_columns),
1.21 "table" : self.table_name
1.22 },
1.23 columns, values)
1.24
1.25 - self.cursor.execute(query, values)
1.26 + self.cursor.execute(query, _values)
1.27 removed = self.cursor.fetchall()
1.28
1.29 - query = "delete from %(table)s %(condition)s" % {
1.30 - "table" : self.table_name,
1.31 - "condition" : condition
1.32 - }
1.33 + query, values = self.get_query(
1.34 + "delete from %(table)s :condition" % {
1.35 + "table" : self.table_name
1.36 + },
1.37 + columns, values)
1.38 +
1.39 self.cursor.execute(query, values)
1.40
1.41 return map(lambda t: FreeBusyPeriod(*t), removed)
1.42 @@ -958,20 +960,20 @@
1.43 if recurrenceids is None:
1.44 columns, values = ["object_uid", "object_recurrenceid is not null"], [uid]
1.45 else:
1.46 - columns, values = ["object_uid", "object_recurrenceid not in", "object_recurrenceid is not null"], [uid, recurrenceid]
1.47 + columns, values = ["object_uid", "object_recurrenceid not in ?", "object_recurrenceid is not null"], [uid, tuple(recurrenceids)]
1.48
1.49 - query, values = self.get_query(
1.50 + query, _values = self.get_query(
1.51 "select %(columns)s from %(table)s :condition" % {
1.52 - "columns" : ", ".join(self.period_columns),
1.53 + "columns" : self.columnlist(self.period_columns),
1.54 "table" : self.table_name
1.55 },
1.56 columns, values)
1.57
1.58 - self.cursor.execute(query, values)
1.59 + self.cursor.execute(query, _values)
1.60 removed = self.cursor.fetchall()
1.61
1.62 - query = self.get_query(
1.63 - "delete from %(table)s %(condition)s" % {
1.64 + query, values = self.get_query(
1.65 + "delete from %(table)s :condition" % {
1.66 "table" : self.table_name
1.67 },
1.68 columns, values)
1.69 @@ -998,14 +1000,14 @@
1.70
1.71 columns, values = ["object_uid", "start", "object_recurrenceid is null"], [uid, start]
1.72
1.73 - query, values = self.get_query(
1.74 + query, _values = self.get_query(
1.75 "select %(columns)s from %(table)s :condition" % {
1.76 - "columns" : ", ".join(self.period_columns),
1.77 + "columns" : self.columnlist(self.period_columns),
1.78 "table" : self.table_name
1.79 },
1.80 columns, values)
1.81
1.82 - self.cursor.execute(query, values)
1.83 + self.cursor.execute(query, _values)
1.84 removed = self.cursor.fetchall()
1.85
1.86 query, values = self.get_query(
1.87 @@ -1026,7 +1028,7 @@
1.88
1.89 query, values = self.get_query(
1.90 "select %(columns)s from %(table)s :condition" % {
1.91 - "columns" : ", ".join(self.period_columns),
1.92 + "columns" : self.columnlist(self.period_columns),
1.93 "table" : self.table_name
1.94 },
1.95 columns, values)
1.96 @@ -1043,7 +1045,7 @@
1.97
1.98 query, values = self.get_query(
1.99 "select %(columns)s from %(table)s :condition" % {
1.100 - "columns" : ", ".join(self.period_columns),
1.101 + "columns" : self.columnlist(self.period_columns),
1.102 "table" : self.table_name
1.103 },
1.104 columns, values)
1.105 @@ -1063,7 +1065,7 @@
1.106
1.107 query, values = self.get_query(
1.108 "select %(columns)s from %(table)s :condition" % {
1.109 - "columns" : ", ".join(self.period_columns),
1.110 + "columns" : self.columnlist(self.period_columns),
1.111 "table" : self.table_name
1.112 },
1.113 columns, values)