Ensures reset of ir.config_params into target database when db are co… #58

lmignon · 2019-10-11T15:13:09Z

This will prevent conflicts between databases (db.uuid, db.secret ...)

Closes #25
Progresses #26

codecov-io · 2019-10-11T15:57:06Z

Codecov Report

Merging #58 into master will increase coverage by 0.31%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master      #58      +/-   ##
==========================================
+ Coverage   93.84%   94.15%   +0.31%     
==========================================
  Files          13       13              
  Lines         763      770       +7     
  Branches      126      127       +1     
==========================================
+ Hits          716      725       +9     
+ Misses         32       31       -1     
+ Partials       15       14       -1

Impacted Files	Coverage Δ
click_odoo_contrib/_addon_hash.py	`96.87% <100.00%> (ø)`
click_odoo_contrib/_dbutils.py	`100.00% <100.00%> (ø)`
click_odoo_contrib/copydb.py	`97.43% <100.00%> (+0.06%)`	⬆️
click_odoo_contrib/manifest.py	`100.00% <0.00%> (+2.89%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 90b8b47...6b7cc9d. Read the comment docs.

rousseldenis

Tested with #57

sbidoul

LGTM.

Could you add a changelog entry, calling out the breaking change in copydb (i.e. the reset of the default parameters - uuid, etc)? I think it's good to do it by default, and later if needed we can still add an option to preserve them.

click_odoo_contrib/_dbutils.py

tests/test_copydb.py

rousseldenis · 2020-03-05T14:49:17Z

@lmignon

lmignon · 2020-05-03T09:03:55Z

@sbidoul Requested changes implemented.

sbidoul

Thanks. Could you add a file name 25.feature with the changelog entry?

sbidoul · 2020-05-04T16:03:43Z

tests/test_copydb.py


 from click_odoo_contrib._dbutils import db_exists
 from click_odoo_contrib.copydb import main

 TEST_DBNAME = "click-odoo-contrib-testcopydb"
 TEST_DBNAME_NEW = "click-odoo-contrib-testcopydb-new"
+_DEFAULT_IR_CONFIG_PARAMETERS = ["database.uuid", "database.create_date"]


Do we want to handle the other database keys?

database.create_date database.secret database.uuid database.enterprise_code database.expiration_date database.expiration_reason

This list is not the same into all the odoo versions...
I maybe should reuse the definition provided by odoo:
https://github.com/odoo/odoo/blob/13.0/odoo/addons/base/models/ir_config_parameter.py#L18

_default_parameters = { "database.secret": lambda: str(uuid.uuid4()), "database.uuid": lambda: str(uuid.uuid1()), "database.create_date": fields.Datetime.now, "web.base.url": lambda: "http://localhost:%s" % config.get('http_port'), "base.login_cooldown_after": lambda: 10, "base.login_cooldown_duration": lambda: 60, }

https://github.com/odoo/odoo/blob/12.0/odoo/addons/base/models/ir_config_parameter.py#L18

_default_parameters = { "database.secret": lambda: pycompat.text_type(uuid.uuid4()), "database.uuid": lambda: pycompat.text_type(uuid.uuid1()), "database.create_date": fields.Datetime.now, "web.base.url": lambda: "http://localhost:%s" % config.get('http_port'), "base.login_cooldown_after": lambda: 10, "base.login_cooldown_duration": lambda: 60, }

https://github.com/odoo/odoo/blob/11.0/odoo/addons/base/ir/ir_config_parameter.py#L18

_default_parameters = { "database.secret": lambda: pycompat.text_type(uuid.uuid4()), "database.uuid": lambda: pycompat.text_type(uuid.uuid1()), "database.create_date": fields.Datetime.now, "web.base.url": lambda: "http://localhost:%s" % config.get('http_port'), }

https://github.com/odoo/odoo/blob/10.0/odoo/addons/base/ir/ir_config_parameter.py#L16

_default_parameters = { "database.secret": lambda: (str(uuid.uuid4()), ['base.group_erp_manager']), "database.uuid": lambda: (str(uuid.uuid1()), []), "database.create_date": lambda: (fields.Datetime.now(), ['base.group_user']), "web.base.url": lambda: ("http://localhost:%s" % config.get('xmlrpc_port'), []), }

https://github.com/odoo/odoo/blob/9.0/openerp/addons/base/ir/ir_config_parameter.py#L20

_default_parameters = { "database.secret": lambda: (str(uuid.uuid4()), ['base.group_erp_manager']), "database.uuid": lambda: (str(uuid.uuid1()), []), "database.create_date": lambda: (datetime.datetime.now().strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT), ['base.group_user']), "web.base.url": lambda: ("http://localhost:%s" % config.get('xmlrpc_port'), []), }

https://github.com/odoo/odoo/blob/8.0/openerp/addons/base/ir/ir_config_parameter.py#L38

_default_parameters = { "database.uuid": lambda: (str(uuid.uuid1()), []), "database.create_date": lambda: (datetime.datetime.now().strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT), ['base.group_user']), "web.base.url": lambda: ("http://localhost:%s" % config.get('xmlrpc_port'), []), }

Bu default database.enterprise_code, database.expiration_date and database.expiration_reason are never reset. We should maybe do it.

sbidoul · 2020-05-12T14:21:09Z

tests/test_copydb.py

+                    (%s, 'test value')
+                """,
+                    (key,),
+                )


nit: with insert into ... on conflict (key) do update set value=%s that can be done in one statement.

sbidoul · 2020-05-12T14:23:32Z

click_odoo_contrib/_dbutils.py

+
+        UPDATE ir_config_parameter
+        SET value = CURRENT_DATE + INTERVAL '2 month'
+        WHERE key = 'database.expiration_date';


Any specific reason to change these keys and not delete them?

Not really. if enterprise addons are installed I prefer to keep the related keys.

acsone-git-bot · 2020-05-12T14:24:26Z

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

…pied This will prevent conflicts between databases (db.uuid, db.secret ...)

codecov-commenter · 2020-09-30T19:51:31Z

Codecov Report

Merging #58 into master will increase coverage by 0.05%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master      #58      +/-   ##
==========================================
+ Coverage   94.10%   94.15%   +0.05%     
==========================================
  Files          13       13              
  Lines         763      770       +7     
  Branches      126      127       +1     
==========================================
+ Hits          718      725       +7     
  Misses         31       31              
  Partials       14       14

Impacted Files	Coverage Δ
click_odoo_contrib/_dbutils.py	`100.00% <100.00%> (ø)`
click_odoo_contrib/copydb.py	`97.43% <100.00%> (+0.06%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b8394c...832bc5f. Read the comment docs.

lmignon force-pushed the master-copydb-reset-ir-config-lmi branch from 5e971db to 9c5fd5c Compare October 11, 2019 15:57

lmignon mentioned this pull request Oct 11, 2019

add restoredb command #57

Merged

lmignon force-pushed the master-copydb-reset-ir-config-lmi branch 4 times, most recently from 8b75423 to e24037b Compare October 12, 2019 09:58

sbidoul added the enhancement New feature or request label Nov 1, 2019

rousseldenis approved these changes Dec 16, 2019

View reviewed changes

sbidoul requested changes Jan 5, 2020

View reviewed changes

click_odoo_contrib/_dbutils.py Show resolved Hide resolved

tests/test_copydb.py Show resolved Hide resolved

lmignon force-pushed the master-copydb-reset-ir-config-lmi branch from e24037b to f9c0d74 Compare May 3, 2020 08:06

acsone-git-bot added the needs review label May 3, 2020

lmignon force-pushed the master-copydb-reset-ir-config-lmi branch from fc2fd1a to ca70ea4 Compare May 3, 2020 08:57

sbidoul reviewed May 4, 2020

View reviewed changes

sbidoul approved these changes May 12, 2020

View reviewed changes

acsone-git-bot added approved ready to merge labels May 12, 2020

lmignon force-pushed the master-copydb-reset-ir-config-lmi branch from 20900aa to 6b7cc9d Compare May 12, 2020 14:51

Ensures reset of ir.config_params into target database when db are co…

832bc5f

…pied This will prevent conflicts between databases (db.uuid, db.secret ...)

sbidoul force-pushed the master-copydb-reset-ir-config-lmi branch from 6b7cc9d to 832bc5f Compare September 30, 2020 19:51

sbidoul merged commit bb5eeaa into master Sep 30, 2020

acsone-git-bot deleted the master-copydb-reset-ir-config-lmi branch September 30, 2020 21:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ensures reset of ir.config_params into target database when db are co… #58

Ensures reset of ir.config_params into target database when db are co… #58

lmignon commented Oct 11, 2019 •

edited by sbidoul

Loading

codecov-io commented Oct 11, 2019 •

edited

Loading

rousseldenis left a comment

sbidoul left a comment

rousseldenis commented Mar 5, 2020

lmignon commented May 3, 2020

sbidoul left a comment

sbidoul May 4, 2020

lmignon May 4, 2020

lmignon May 4, 2020

sbidoul May 12, 2020

sbidoul May 12, 2020

lmignon May 12, 2020

acsone-git-bot commented May 12, 2020

codecov-commenter commented Sep 30, 2020 •

edited

Loading

Ensures reset of ir.config_params into target database when db are co… #58

Ensures reset of ir.config_params into target database when db are co… #58

Conversation

lmignon commented Oct 11, 2019 • edited by sbidoul Loading

codecov-io commented Oct 11, 2019 • edited Loading

Codecov Report

rousseldenis left a comment

Choose a reason for hiding this comment

sbidoul left a comment

Choose a reason for hiding this comment

rousseldenis commented Mar 5, 2020

lmignon commented May 3, 2020

sbidoul left a comment

Choose a reason for hiding this comment

sbidoul May 4, 2020

Choose a reason for hiding this comment

lmignon May 4, 2020

Choose a reason for hiding this comment

lmignon May 4, 2020

Choose a reason for hiding this comment

sbidoul May 12, 2020

Choose a reason for hiding this comment

sbidoul May 12, 2020

Choose a reason for hiding this comment

lmignon May 12, 2020

Choose a reason for hiding this comment

acsone-git-bot commented May 12, 2020

codecov-commenter commented Sep 30, 2020 • edited Loading

Codecov Report

lmignon commented Oct 11, 2019 •

edited by sbidoul

Loading

codecov-io commented Oct 11, 2019 •

edited

Loading

codecov-commenter commented Sep 30, 2020 •

edited

Loading