Content ID conflict resolving while ".gitify: data.content.where" is used

[zeves095]

Summary

Conflict resolving does not take into account - $criteria
Gitify check ids only for $criteria part in _data and in DB . But if in DB some other objects (out of criteria) have same ID ,so while gitify build --no-cleanup i get xPDO (sql) error.

Step to reproduce

1. .gitify file:
   data_directory: _data/ backup_directory: _backup/ data: content: type: content where: - 'class_key:IN': ['modDocument','modWebLink','CollectionContainer']

on production server create new msProduct
on dev server create, for instance` webDocument
p.s. they will have same ID.

3. on dev server gitify extract content
4. copy _data to production server
5. on production gitify build --no-cleanup content
   --> ERROR

Observed behavior

In my case i got:
(ERROR @ /home/user/site/www/core/xpdo/om/xpdoobject.class.php : 1452) Error 23000 executing statement: INSERT INTO modx_site_content (id, type, contentType, pagetitle, longtitle, description, alias, link_attributes, published, pub_date, unpub_date, parent, isfolder, introtext, content, richtext, template, menuindex, searchable, cacheable, createdby, createdon, editedby, editedon, deleted, deletedon, deletedby, publishedon, publishedby, menutitle, donthit, privateweb, privatemgr, content_dispo, hidemenu, class_key, context_key, content_type, uri, uri_override, hide_children_in_tree, show_in_tree, properties, products, products_counted`) VALUES (56660, 'document', 'text/html', 'Инстаграм', '', '', 'instagram', '', 1, 0, 0, 0, 1, '', '"MySiteName" - bla-bla-bla-bla.', 0, 70, 21, 0, 1, 1, 1526383501, 1, 1526891655, 0, 0, 0, 1526383500, 1, '', 0, 0, 0, 0, 1, 'CollectionContainer', 'web', 1, 'instagram', 1, 0, 1, '{"ms2gallery":{"media_source":"3"}}', 0, 0)
Array
(
[0] => 23000
[1] => 1062
[2] => Duplicate entry '56660' for key 'PRIMARY'
)

• Could not save new resource from uri: instagram`

Expected behavior

create resourse with new id and gitify extracting (as it work while id conflict inside criteria)

Environment

Gitify version 0.12.0,
MODX version 2.6.2,
Debian x86_64 GNU/Linux,
MySQL version - 5.5,
PHP 5.6.30