diff --git a/config/static-settings.json b/config/static-settings.json index 8b6c220..b702779 100644 --- a/config/static-settings.json +++ b/config/static-settings.json @@ -1,6 +1,6 @@ { "settings": { - "databaseStripDevelopment": "@development mst_core_urlrewrite quote quotation_* adminnotification_inbox po_* mirasvit_search_score_rule_product_cl mst_search_score_rule_index *_log *emaillog* *file_stat bss_inventoryreport email_order mailchimp_* mst_cache_warmer_* mst_email_queue mst_rewards_purchase mst_rewards_transaction tig_postnl_shipment* mst_email_event_trigger mst_email_queue mst_email_unsubscription mst_emailreport_* vat_validation tig_postnl_order swissup_reviewreminder_entity email_wishlist fooman_totals_* hsm_event_event hsm_message_queue ub_migrate_* cron_schedule aw_pq_* mageplaza_smtp_log mst_indexer_history mst_event_event webforms_results xtento_customsmtp_emaillog xtento_orderexport_log xtento_orderexport_profile_history fooman_custom_order_numbers amasty_fpc_* iz_product_* old_* os_lowstock_* amasty_amgiftcard_account amasty_groupcat_rule_customer hsm_email_unsubscription password_reset_request_event amasty_xsearch_* aw_giftcard_history aw_giftcard_history_entity aw_giftcard_order aw_giftcard_quote aw_giftcard_statistics aw_rma_* temp_order_* mst_misspell_index mst_message_* queue_* mst_search_score_rule_index amasty_mostviewed_product_index amasty_file_report amasty_file_stat_old", + "databaseStripDevelopment": "@development @aggregated @customers @log @quotes @sales @sessions @temp mst_core_urlrewrite quote quotation_* adminnotification_inbox po_* mirasvit_search_score_rule_product_cl mst_search_score_rule_index *_log *emaillog* *file_stat bss_inventoryreport email_order mailchimp_* mst_cache_warmer_* mst_email_queue mst_rewards_purchase mst_rewards_transaction tig_postnl_shipment* mst_email_event_trigger mst_email_queue mst_email_unsubscription mst_emailreport_* vat_validation tig_postnl_order swissup_reviewreminder_entity email_wishlist fooman_totals_* hsm_event_event hsm_message_queue ub_migrate_* cron_schedule aw_pq_* mageplaza_smtp_log mst_indexer_history mst_event_event webforms_results xtento_customsmtp_emaillog xtento_orderexport_log xtento_orderexport_profile_history fooman_custom_order_numbers amasty_fpc_* iz_product_* old_* os_lowstock_* amasty_amgiftcard_account amasty_groupcat_rule_customer hsm_email_unsubscription password_reset_request_event amasty_xsearch_* aw_giftcard_history aw_giftcard_history_entity aw_giftcard_order aw_giftcard_quote aw_giftcard_statistics aw_rma_* temp_order_* mst_misspell_index mst_message_* queue_* mst_search_score_rule_index amasty_mostviewed_product_index amasty_file_report amasty_file_stat_old po_crawler_process po_crawler_popularity", "databaseStripKeepCustomerData": "@customers @dotmailer @quotes quote quote_* @ee_changelog @idx @log @quotes @search @sessions @stripped *_log *emaillog* *file_stat bss_inventoryreport email_order mailchimp_* mst_cache_warmer_* mst_email_queue mst_rewards_purchase mst_rewards_transaction tig_postnl_shipment* mst_email_event_trigger mst_email_queue mst_email_unsubscription mst_emailreport_* vat_validation tig_postnl_order swissup_reviewreminder_entity email_wishlist fooman_totals_* hsm_event_event hsm_message_queue ub_migrate_* cron_schedule aw_pq_* mageplaza_smtp_log mst_indexer_history mst_event_event webforms_results xtento_customsmtp_emaillog xtento_orderexport_log xtento_orderexport_profile_history fooman_custom_order_numbers amasty_fpc_* iz_product_* old_* os_lowstock_* amasty_amgiftcard_account amasty_groupcat_rule_customer hsm_email_unsubscription password_reset_request_event amasty_xsearch_* aw_giftcard aw_giftcard_* aw_rma_*" } } \ No newline at end of file diff --git a/dist/tasks/downloadTask.js b/dist/tasks/downloadTask.js index 5b9d307..27f17b1 100644 --- a/dist/tasks/downloadTask.js +++ b/dist/tasks/downloadTask.js @@ -80,7 +80,7 @@ class DownloadTask { } }); // Dump database and move database to root of server - let stripCommand = 'db:dump --strip="' + static_settings_json_1.default.settings.databaseStripDevelopment + '"'; + let stripCommand = 'db:dump -n --no-tablespaces --strip="' + static_settings_json_1.default.settings.databaseStripDevelopment + '"'; if (config.settings.strip == 'keep customer data') { stripCommand = 'db:dump --strip="' + static_settings_json_1.default.settings.databaseStripKeepCustomerData + '"'; } diff --git a/dist/tasks/downloadTask.js.map b/dist/tasks/downloadTask.js.map index 0ef15af..2c65138 100644 --- a/dist/tasks/downloadTask.js.map +++ b/dist/tasks/downloadTask.js.map @@ -1 +1 @@ -{"version":3,"file":"downloadTask.js","sourceRoot":"","sources":["../../src/tasks/downloadTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"downloadTask.js","sourceRoot":"","sources":["../../src/tasks/downloadTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/tasks/magentoConfigureTask.js b/dist/tasks/magentoConfigureTask.js index 027e7d0..8736df5 100644 --- a/dist/tasks/magentoConfigureTask.js +++ b/dist/tasks/magentoConfigureTask.js @@ -51,8 +51,8 @@ class MagentoConfigureTask { } catch (err) { } } - // Configure Elastic to use version 7 - if (jsonEngineCheck && jsonEngineCheck != 'mysql') { + // Configure Elastic to use version 7 if engine is not mysql + if (jsonEngineCheck.indexOf("mysql") == -1) { // Update queries dbQueryUpdate = `UPDATE core_config_data SET value = 'localhost' WHERE path LIKE '%_server_hostname%';`, dbQueryUpdate = dbQueryUpdate + `UPDATE core_config_data SET value = '${settings_json_1.default.general.elasticsearchPort}' WHERE path LIKE '%_server_port%';`, diff --git a/dist/tasks/magentoConfigureTask.js.map b/dist/tasks/magentoConfigureTask.js.map index 3a83f7f..18a7b45 100644 --- a/dist/tasks/magentoConfigureTask.js.map +++ b/dist/tasks/magentoConfigureTask.js.map @@ -1 +1 @@ -{"version":3,"file":"magentoConfigureTask.js","sourceRoot":"","sources":["../../src/tasks/magentoConfigureTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"magentoConfigureTask.js","sourceRoot":"","sources":["../../src/tasks/magentoConfigureTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index be18dc4..2559702 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mage-db-sync", - "version": "0.4.5", + "version": "0.4.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 410f683..8d7578d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mage-db-sync", - "version": "0.4.5", + "version": "0.4.6", "description": "Database synchronizer for Magento, based on Magerun", "author": { "name": "Jelle Siderius" diff --git a/src/tasks/downloadTask.ts b/src/tasks/downloadTask.ts index 58fd508..213fffb 100644 --- a/src/tasks/downloadTask.ts +++ b/src/tasks/downloadTask.ts @@ -101,7 +101,7 @@ class DownloadTask { }); // Dump database and move database to root of server - let stripCommand = 'db:dump --strip="' + staticConfigFile.settings.databaseStripDevelopment + '"'; + let stripCommand = 'db:dump -n --no-tablespaces --strip="' + staticConfigFile.settings.databaseStripDevelopment + '"'; if (config.settings.strip == 'keep customer data') { stripCommand = 'db:dump --strip="' + staticConfigFile.settings.databaseStripKeepCustomerData + '"'; diff --git a/src/tasks/magentoConfigureTask.ts b/src/tasks/magentoConfigureTask.ts index 965ff88..23c2e37 100644 --- a/src/tasks/magentoConfigureTask.ts +++ b/src/tasks/magentoConfigureTask.ts @@ -90,8 +90,8 @@ class MagentoConfigureTask { } - // Configure Elastic to use version 7 - if (jsonEngineCheck && jsonEngineCheck != 'mysql') { + // Configure Elastic to use version 7 if engine is not mysql + if (jsonEngineCheck.indexOf("mysql") == -1) { // Update queries dbQueryUpdate = `UPDATE core_config_data SET value = 'localhost' WHERE path LIKE '%_server_hostname%';`, dbQueryUpdate = dbQueryUpdate + `UPDATE core_config_data SET value = '${configFile.general.elasticsearchPort}' WHERE path LIKE '%_server_port%';`,