Fix error in applyChangeset when a trigger contains space (fixes #137)

MerginMaps · Jul 27, 2021 · 42cedca · 42cedca
1 parent 5512a50
commit 42cedca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/geodiff/src/drivers/sqlitedriver.cpp b/geodiff/src/drivers/sqlitedriver.cpp
@@ -704,7 +704,7 @@ void SqliteDriver::applyChangeset( ChangesetReader &reader )
   Sqlite3Stmt statament;
   for ( std::string name : triggerNames )
   {
-    statament.prepare( mDb, "drop trigger %s", name.c_str() );
+    statament.prepare( mDb, "drop trigger '%q'", name.c_str() );
     sqlite3_step( statament.get() );
     statament.close();
   }

diff --git a/geodiff/tests/test_driver_sqlite.cpp b/geodiff/tests/test_driver_sqlite.cpp
@@ -205,6 +205,17 @@ TEST( SqliteDriverTest, apply_changeset_delete )
                     );
 }
 
+TEST( SqliteDriverTest, apply_changeset_trigger_with_spaces )
+{
+  // the testing database is just like base.gpkg, but it has an extra dummy trigger:
+  // CREATE TRIGGER "trigger with space" AFTER DELETE ON simple BEGIN DELETE FROM simple; END;
+  testApplyChangeset( "test_apply_changeset_trigger_with_spaces",
+                      pathjoin( testdir(), "quoting", "trigger-with-space.gpkg" ),
+                      pathjoin( testdir(), "1_geopackage", "base-modified_1_geom.diff" ),
+                      pathjoin( testdir(), "1_geopackage", "modified_1_geom.gpkg" )
+                    );
+}
+
 TEST( SqliteDriverTest, apply_changeset_conflict )
 {
   // the diff file contains one regular delete and one wrong delete

diff --git a/geodiff/tests/testdata/quoting/trigger-with-space.gpkg b/geodiff/tests/testdata/quoting/trigger-with-space.gpkg