1.1 --- a/imiptools/period.py Wed Mar 09 00:06:08 2016 +0100
1.2 +++ b/imiptools/period.py Wed Mar 09 00:08:23 2016 +0100
1.3 @@ -835,7 +835,7 @@
1.4
1.5 period_columns = ["start", "end", "object_uid", "transp", "object_recurrenceid", "summary", "organiser", "expires"]
1.6
1.7 - def __init__(self, cursor, table_name, column_names=None, filter_values=None, mutable=True):
1.8 + def __init__(self, cursor, table_name, column_names=None, filter_values=None, mutable=True, paramstyle=None):
1.9
1.10 """
1.11 Initialise the collection with the given 'cursor' and with the
1.12 @@ -844,7 +844,7 @@
1.13 """
1.14
1.15 FreeBusyCollectionBase.__init__(self, mutable)
1.16 - DatabaseOperations.__init__(self, column_names, filter_values)
1.17 + DatabaseOperations.__init__(self, column_names, filter_values, paramstyle)
1.18 self.cursor = cursor
1.19 self.table_name = table_name
1.20
1.21 @@ -856,7 +856,7 @@
1.22 def __iter__(self):
1.23 query, values = self.get_query(
1.24 "select %(columns)s from %(table)s :condition" % {
1.25 - "columns" : ", ".join(self.period_columns),
1.26 + "columns" : self.columnlist(self.period_columns),
1.27 "table" : self.table_name
1.28 })
1.29 self.cursor.execute(query, values)