Fix merging on generate

This commit is contained in:
Matt Nadareski
2016-03-19 16:09:39 -07:00
parent 80c75203d1
commit 43aa39bb1c

View File

@@ -241,13 +241,10 @@ JOIN checksums
(!srcmerged && !sysmerged ? " AND" : "") + (!srcmerged && !sysmerged ? " AND" : "") +
(!sysmerged ? " systems.id=" + _system : "") + "\n" + (!sysmerged ? " systems.id=" + _system : "") + "\n" +
(sysmerged && srcmerged ? "\nWHERE" : " AND") + (sysmerged && srcmerged ? "\nWHERE" : " AND") +
" files.id IN ( SELECT file from checksums WHERE file IN (" + "\n files.id IN ( SELECT checksums.file FROM checksums JOIN files ON checksums.file=files.id WHERE files.type='rom'" +
" SELECT file FROM checksums WHERE file IN (" + (merged ? "\nGROUP BY checksums.size, checksums.crc" : "") + " )" +
" SELECT file FROM checksums" + "\n OR files.id IN ( SELECT checksums.file FROM checksums JOIN files ON checksums.file=files.id WHERE files.type='disk'" +
(merged ? "\nGROUP BY size, sha1" : "") + " )" + (merged ? "\nGROUP BY checksums.sha1" : "") + " )" +
(merged ? "\nGROUP BY size, md5" : "") + " )" +
(merged ? "\nGROUP BY size, crc" : "") + " )" +
(merged ? "\nGROUP BY checksums.size, checksums.md5, checksums.sha1" : "") +
"\nORDER BY systems.id, sources.id, games.name, files.name"; "\nORDER BY systems.id, sources.id, games.name, files.name";
using (SQLiteConnection dbc = new SQLiteConnection(_connectionString)) using (SQLiteConnection dbc = new SQLiteConnection(_connectionString))