[Bug 10610] New: sysprefs.sql is really boring to rebase
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Bug ID: 10610 Summary: sysprefs.sql is really boring to rebase Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: gmcharlt@gmail.com Reporter: jonathan.druart@biblibre.com QA Contact: testopia@bugs.koha-community.org Each time a developer adds a new syspref, he must fill installer/data/mysql/sysprefs.sql. When a patch modifying this file is pushed, the patch does not apply anymore and the developer has to rebase his patch and resubmit it. If this file is sorted by syspref names, conflicts will appear less often. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Assignee|gmcharlt@gmail.com |jonathan.druart@biblibre.co | |m -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #1 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19763 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19763&action=edit Bug XXXXX: sysprefs.sql should be sorted by syspref names By sorting the sql syspref file, the developpers will be happy to avoid conflicts on this file each time a patch modifying it is pushed. Test plan: - create a new DB with a new table named systempreferences (with the same structure as the one you know). - insert the current sysprefs.sql file into this table. - note the number of rows in the systempreferences table. - apply this patch. - delete all rows of the systempreferences table. - insert the new sysprefs.sql file. - verify the number of rows is the same as the previous. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19763|0 |1 is obsolete| | --- Comment #2 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 19764 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19764&action=edit Bug 10610: sysprefs.sql should be sorted by syspref names By sorting the sql syspref file, the developpers will be happy to avoid conflicts on this file each time a patch modifying it is pushed. Test plan: - create a new DB with a new table named systempreferences (with the same structure as the one you know). - insert the current sysprefs.sql file into this table. - note the number of rows in the systempreferences table. - apply this patch. - delete all rows of the systempreferences table. - insert the new sysprefs.sql file. - verify the number of rows is the same as the previous. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |srdjan@catalyst.net.nz --- Comment #3 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Applying: Bug 10610: sysprefs.sql should be sorted by syspref names fatal: sha1 information is lacking or useless (installer/data/mysql/sysprefs.sql). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 10610: sysprefs.sql should be sorted by syspref names -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Liz Rea <liz@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |liz@catalyst.net.nz -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19764|0 |1 is obsolete| | --- Comment #4 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20275 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20275&action=edit iBug 10610: sysprefs.sql should be sorted by syspref names By sorting the sql syspref file, the developpers will be happy to avoid conflicts on this file each time a patch modifying it is pushed. Test plan: - create a new DB with a new table named systempreferences (with the same structure as the one you know). - insert the current sysprefs.sql file into this table. - note the number of rows in the systempreferences table. - apply this patch. - delete all rows of the systempreferences table. - insert the new sysprefs.sql file. - verify the number of rows is the same as the previous. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #5 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- I got 414 with the current script (master a36b3ad43a6a91f800d0d8a148a217d738236d7e), and 416 with the patch. Can you please check, and if you don't get the same I'll dump and compare. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Jonathan Druart <jonathan.druart@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20275|0 |1 is obsolete| | --- Comment #6 from Jonathan Druart <jonathan.druart@biblibre.com> --- Created attachment 20323 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20323&action=edit iBug 10610: sysprefs.sql should be sorted by syspref names By sorting the sql syspref file, the developpers will be happy to avoid conflicts on this file each time a patch modifying it is pushed. Test plan: - create a new DB with a new table named systempreferences (with the same structure as the one you know). - insert the current sysprefs.sql file into this table. - note the number of rows in the systempreferences table. - apply this patch. - delete all rows of the systempreferences table. - insert the new sysprefs.sql file. - verify the number of rows is the same as the previous. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #7 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Srdjan Jankovic from comment #5)
I got 414 with the current script (master a36b3ad43a6a91f800d0d8a148a217d738236d7e), and 416 with the patch. Can you please check, and if you don't get the same I'll dump and compare.
Oops, I suspect I was not on master when I generate the file. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Srdjan Jankovic <srdjan@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20323|0 |1 is obsolete| | --- Comment #8 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- Created attachment 20359 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20359&action=edit iBug 10610: sysprefs.sql should be sorted by syspref names By sorting the sql syspref file, the developpers will be happy to avoid conflicts on this file each time a patch modifying it is pushed. Test plan: - create a new DB with a new table named systempreferences (with the same structure as the one you know). - insert the current sysprefs.sql file into this table. - note the number of rows in the systempreferences table. - apply this patch. - delete all rows of the systempreferences table. - insert the new sysprefs.sql file. - verify the number of rows is the same as the previous. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20359|0 |1 is obsolete| | --- Comment #9 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 20408 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20408&action=edit iBug 10610: sysprefs.sql should be sorted by syspref names By sorting the sql syspref file, the developpers will be happy to avoid conflicts on this file each time a patch modifying it is pushed. Test plan: - create a new DB with a new table named systempreferences (with the same structure as the one you know). - insert the current sysprefs.sql file into this table. - note the number of rows in the systempreferences table. - apply this patch. - delete all rows of the systempreferences table. - insert the new sysprefs.sql file. - verify the number of rows is the same as the previous. Signed-off-by: Srdjan <srdjan@catalyst.net.nz> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com --- Comment #10 from Kyle M Hall <kyle@bywatersolutions.com> --- Excellent idea! I wonder if there is any way to add a check for out of order sysprefs in koha-qa.pl, after this patch has been pushed. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #11 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Kyle M Hall from comment #10)
Excellent idea! I wonder if there is any way to add a check for out of order sysprefs in koha-qa.pl, after this patch has been pushed.
Yep, it should certainly be possible to do something. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gmcharlt@gmail.com --- Comment #12 from Galen Charlton <gmcharlt@gmail.com> --- (In reply to Jonathan Druart from comment #11)
(In reply to Kyle M Hall from comment #10)
Excellent idea! I wonder if there is any way to add a check for out of order sysprefs in koha-qa.pl, after this patch has been pushed.
Yep, it should certainly be possible to do something.
I like the idea of this patch, and will push it shortly unless I find something wrong, but I'm opposed to putting a sorting requirement into koha-qa.pl. Sorting the script provides a small convenience by reducing the chance of merge conflicts, but doesn't per se provide a functional benefit. I'd really hate to see a patch fail QA on account of a new syspref getting inserted in the "wrong" place. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #13 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to Galen Charlton from comment #12)
(In reply to Jonathan Druart from comment #11)
(In reply to Kyle M Hall from comment #10)
Excellent idea! I wonder if there is any way to add a check for out of order sysprefs in koha-qa.pl, after this patch has been pushed.
Yep, it should certainly be possible to do something.
I like the idea of this patch, and will push it shortly unless I find something wrong, but I'm opposed to putting a sorting requirement into koha-qa.pl. Sorting the script provides a small convenience by reducing the chance of merge conflicts, but doesn't per se provide a functional benefit. I'd really hate to see a patch fail QA on account of a new syspref getting inserted in the "wrong" place.
I rather imagined that as a warning than a blocker stuff. The change could be made by the QAer with a small followup if the pref is not inserted in the good place. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #14 from Kyle M Hall <kyle@bywatersolutions.com> --- Agreed, it's like horseshoes and hand-grenades. "Close enough" will do just fine. Kyle (In reply to Jonathan Druart from comment #13)
(In reply to Galen Charlton from comment #12)
(In reply to Jonathan Druart from comment #11)
(In reply to Kyle M Hall from comment #10)
Excellent idea! I wonder if there is any way to add a check for out of order sysprefs in koha-qa.pl, after this patch has been pushed.
Yep, it should certainly be possible to do something.
I like the idea of this patch, and will push it shortly unless I find something wrong, but I'm opposed to putting a sorting requirement into koha-qa.pl. Sorting the script provides a small convenience by reducing the chance of merge conflicts, but doesn't per se provide a functional benefit. I'd really hate to see a patch fail QA on account of a new syspref getting inserted in the "wrong" place.
I rather imagined that as a warning than a blocker stuff. The change could be made by the QAer with a small followup if the pref is not inserted in the good place.
-- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #15 from Galen Charlton <gmcharlt@gmail.com> --- Pushed to master, thanks Jonathan! I'm OK with adding a warning to qa-tools provided that it never becomes a blocker. -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10610 --- Comment #16 from Jonathan Druart <jonathan.druart@biblibre.com> --- I added a new test for qa tools: http://git.koha-community.org/gitweb/?p=qa-test-tools.git;a=commit;h=fa56a57... -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org