diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index d6115880e..9a675ab6f 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -771,6 +771,9 @@ SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'fax'; DELETE FROM `ospos_app_config` WHERE `key` = 'phone'; INSERT INTO `ospos_app_config` (`key`, `value`) SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'phone'; +DELETE FROM `ospos_app_config` WHERE `key` = 'website'; +INSERT INTO `ospos_app_config` (`key`, `value`) +SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'website'; DELETE FROM `ospos_app_config` WHERE `key` = 'return_policy'; INSERT INTO `ospos_app_config` (`key`, `value`) SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'return_policy'; @@ -787,8 +790,8 @@ UPDATE `ospos_customers` c1, `ospos_customers` c2 SET `c1`.`account_number` = NU -- Copy data to table `ospos_employees` -- -INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`) -SELECT `username`, `password`, `person_id`, `deleted` FROM `phppos`.phppos_employees; +INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`, `hash_version`) +SELECT `username`, `password`, `person_id`, `deleted`, 1 FROM `phppos`.phppos_employees; -- -- Copy data to table `ospos_giftcards` @@ -896,11 +899,6 @@ INSERT INTO `ospos_suppliers` (`person_id`, `company_name`, `account_number`, `d SELECT `person_id`, `company_name`, `account_number`, `deleted` FROM `phppos`.phppos_suppliers; --- --- Add constraints on copied data --- - - -- -- Constraints for dumped tables -- diff --git a/database/phppos_migrate.sql b/database/phppos_migrate.sql index 93c313996..1e0e3325e 100644 --- a/database/phppos_migrate.sql +++ b/database/phppos_migrate.sql @@ -36,6 +36,9 @@ SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'fax'; DELETE FROM `ospos_app_config` WHERE `key` = 'phone'; INSERT INTO `ospos_app_config` (`key`, `value`) SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'phone'; +DELETE FROM `ospos_app_config` WHERE `key` = 'website'; +INSERT INTO `ospos_app_config` (`key`, `value`) +SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'website'; DELETE FROM `ospos_app_config` WHERE `key` = 'return_policy'; INSERT INTO `ospos_app_config` (`key`, `value`) SELECT `key`, `value` FROM `phppos`.phppos_app_config WHERE `key` = 'return_policy'; @@ -52,8 +55,8 @@ UPDATE `ospos_customers` c1, `ospos_customers` c2 SET `c1`.`account_number` = NU -- Copy data to table `ospos_employees` -- -INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`) -SELECT `username`, `password`, `person_id`, `deleted` FROM `phppos`.phppos_employees; +INSERT INTO `ospos_employees` (`username`, `password`, `person_id`, `deleted`, `hash_version`) +SELECT `username`, `password`, `person_id`, `deleted`, 1 FROM `phppos`.phppos_employees; -- -- Copy data to table `ospos_giftcards` @@ -160,8 +163,3 @@ SELECT `item_id`, 1, `quantity` FROM `phppos`.`phppos_items`; INSERT INTO `ospos_suppliers` (`person_id`, `company_name`, `account_number`, `deleted`) SELECT `person_id`, `company_name`, `account_number`, `deleted` FROM `phppos`.phppos_suppliers; - --- --- Add constraints on copied data --- -