acardona/CATMAID — pull request #370 by OliverUv (2012-07-23 16:33:44+00:00)
Title: Switch to single dump

Merged tables.sql and data.sql into tables_and_data.sql, made appropriate changes wherever they were used. Merge was made by loading them into a new database, then running the new scripts/database/dump-database.sh. Tests now load from the merged file, and pass.

Dubious changes in tables_and_data.sql (from data.sql):
Row 3: "SET standard_conforming_strings = on;" (was off)
Row 6 was "SET escape_string_warning = off;" but has now been removed.