Allow for more than 3 points to be added in the insert statement.

kartoza · Jun 19, 2014 · cda918c · cda918c
1 parent b400204
commit cda918c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/constants.py b/constants.py
@@ -22,6 +22,8 @@
     "AVAILABLE":"SELECT available FROM parcel_lookup WHERE parcel_id = %s;",
     "INSERT":"INSERT INTO parcel_def(parcel_id, beacon, sequence) \
               VALUES (%s, %s, %s);",
+    "INSERT_GENERAL": "INSERT INTO parcel_def(parcel_id, beacon, sequence) \
+              VALUES %s;",
     "DELETE":"DELETE FROM parcel_def WHERE parcel_id = %s;",
 }
 

diff --git a/database.py b/database.py
@@ -95,8 +95,9 @@ def queryPreview(self, query, data=None, multi_data=False):
                 sql = self.cursor.mogrify(query)
             else:
                 if multi_data:
+                    placeholders = ','.join(['%s' for dummy in data])
+                    query = query % (placeholders)
                     sql = self.cursor.mogrify(query, data)
-                    sql = sql.replace('((', '(').replace('))', ')')
                 else:
                     sql = self.cursor.mogrify(query, data)
             self.disconnect()

diff --git a/plugin.py b/plugin.py
@@ -464,11 +464,10 @@ def run(self):
                             points.append(
                                 (frm.getValues()[1]["parcel_id"], beacon, i))
                         sql = self.db.queryPreview(
-                                SQL_PARCELS["INSERT"],
+                                SQL_PARCELS["INSERT_GENERAL"],
                                 data=points,
                                 multi_data=True
                         )
-                        print sql
                         self.db.query(sql)
                         self.iface.mapCanvas().refresh()
                     else: