Fix applying changeset to DB with constraints on SQLite (fixes #210)

geodiff/src/changesetutils.cpp

@@ -120,6 +120,14 @@ nlohmann::json changesetEntryToJSON( const ChangesetEntry &entry )
   else if ( entry.op == ChangesetEntry::OpDelete )
     status = "delete";
 
+  // Check that the table column count matches the vector sizes to prevent
+  // out-of-bounds errors.
+  if ( ( ( entry.op == ChangesetEntry::OpUpdate || entry.op == ChangesetEntry::OpInsert )
+         && entry.table->columnCount() != entry.newValues.size() )
+       || ( ( entry.op == ChangesetEntry::OpUpdate || entry.op == ChangesetEntry::OpDelete )
+            && entry.table->columnCount() != entry.oldValues.size() ) )
+    throw GeoDiffException( "Table column count doesn't match value list size" );
+
   nlohmann::json res;
   res[ "table" ] = entry.table->name;
   res[ "type" ] = status;

geodiff/src/driver.h

@@ -126,15 +126,6 @@ class Driver
      */
     virtual void dumpData( ChangesetWriter &writer, bool useModified = false ) = 0;
 
-    /**
-     * Tests whether the table schemas are compatible with our rebase algorithm, i.e. no unsupported
-     * database features are used. Currently, for example, geodiff rebase does not deal with foreign
-     * keys or with user-defined triggers.
-     *
-     * If the check fails, GeoDiffException is thrown.
-     */
-    virtual void checkCompatibleForRebase( bool useModified = false ) = 0;
-
     static const std::string SQLITEDRIVERNAME;
     static const std::string POSTGRESDRIVERNAME;
 

geodiff/src/drivers/postgresdriver.cpp

@@ -1046,8 +1046,3 @@ void PostgresDriver::dumpData( ChangesetWriter &writer, bool useModified )
     }
   }
 }
-
-void PostgresDriver::checkCompatibleForRebase( bool )
-{
-  throw GeoDiffException( "Rebase with postgres not supported yet" );
-}

geodiff/src/drivers/postgresdriver.h

@@ -28,7 +28,6 @@ class PostgresDriver : public Driver
     void applyChangeset( ChangesetReader &reader ) override;
     void createTables( const std::vector<TableSchema> &tables ) override;
     void dumpData( ChangesetWriter &writer, bool useModified = false ) override;
-    void checkCompatibleForRebase( bool useModified = false ) override;
 
   private:
     void logApplyConflict( const std::string &type, const ChangesetEntry &entry ) const;