New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix #10811: add templatePrefix to Fileset #1168
Conversation
Hmmm, experiencing github weirdness, will delete the branch and re-push. |
Okay, maybe that fixed it... |
@joshmoore: okay, bumped to dbpatch 6, cc @chris-allan |
Did you just rebase and/or rewrite the history for this? That will have wiped out the discussion we've just been having. |
Yeah, github seemed to get extremely buggily confused about further pushes and, though there were extra commits locally and The discussion is at mtbc@54829cf |
@joshmoore how do I structure this so this dbpatch bump to 6 doesn't conflict with #1133, should I rebase against it? |
See from https://trac.openmicroscopy.org.uk/ome/ticket/10811#comment:7 for instructions on upgrading older FS DBs to accommodate this change.
Please remove the |
Done |
@mtbc: sorry, @pwalczysko has asked for PURGE_DATA to not occur tomorrow in which case this must be excluded again. |
No problem, testing comes first; let me know when you unexclude it again and I'll add it to standup. |
Purging re-activated on gretzky; label removed. |
Imported a
results in
Looks good to merge. |
It would require a significant refactoring (i.e. not a part of this PR), but I wonder if we wouldn't be better suited to have a third element (template+path+name) which is perhaps not even exposed to the user. But that's just thinking out loud... @chris-allan: I would plan on merging this tomorrow morning if that won't cause you any headaches sans upgrade script. |
👍 from @chris-allan. Merging. |
fix #10811: add templatePrefix to Fileset
fix #10811: add templatePrefix to Fileset
Fixes https://trac.openmicroscopy.org.uk/ome/ticket/10811
To test, try doing some imports and check that the
templateprefix
column in thefileset
table in the database matches the appropriate prefix of thepath
column inoriginalfile
.