Fixes #23704 - allow subnet order by network #5623
Conversation
|
Issues: #23704 |
|
repushed with the context that deduplicates subnets setup, @lzap mind to take another look? |
| @@ -34,4 +34,19 @@ def subnet_params_filter | |||
| def subnet_params | |||
| self.class.subnet_params_filter.filter_params(params, parameter_filter_context) | |||
| end | |||
|
|
|||
| def network_reorder(base) | |||
There was a problem hiding this comment.
It feels like this should actually be a Model concern.
There was a problem hiding this comment.
I tried this approach, I failed to find a way to hook into scoped search, scoped search does not provide a way to implement casting, especially not for just some adapters. Then I thought let's do it in model, but I'd need to extend Subnet::ActiveRecord_Relation, not Subnet class. And then I gave up.
Now I realize that we can actually define it in Subnet model and it works just fine. So here you are, thanks for pushing me :-)
Subnet.all.network_reorderSubnet.all.network_reorder 'network DESC'
ares
force-pushed
the
fix/23704
branch
2 times, most recently
from
3e62fcb
to
83e0ec0
Compare
|
test fails 💔 |
tbrisker
added
Waiting on contributor
Demo worthy
and removed
Demo worthy
Ready to merge
labels
|
[test foreman] |
|
Relevant test failures. |
|
@ares this is a nice patch, can you rebase and make tests green? Then I am good to merge. |
|
I plan to revisit this after 1.24 branching when MySQL will be dropped. |
theforeman-bot
added
Needs re-review
Needs testing
and removed
Waiting on contributor
labels
|
Dropped mysql and sqlite specific code, now focusing on postgres only. Also rebased, it should be ready fo rereview |
|
failures related |
|
I need to add sqlite switch back to silently ignore this :-/ |
|
this should now be green on sqlite too |
|
ready for rereview :-) |
|
Let's get this one in, it's opened for more than 1.5 year, pretty covered with tests, easy to test. Pretty please :-) |
|
ping @lzap |
| def self.network_reorder(order_string = 'network') | ||
| adapter = connection.adapter_name.downcase | ||
| if adapter.starts_with?('postgresql') | ||
| self.reorder(order_string.sub('network', 'inet(network)')) |
There was a problem hiding this comment.
Given we're now PostgreSQL-only, should we actually make a migration that uses the inet type for the column?
There was a problem hiding this comment.
don't we need to still support sqlite for ci?
There was a problem hiding this comment.
Yes, but you can have a conditional in the migration. You'd end up with the same difference that you have now. The only thing I'd be worried about is that it might serialize to a different object (IPAddr for example) and the code would behave differently. That's why I won't insist on it, but would ask you to consider it.
@tbrisker what do you think?
There was a problem hiding this comment.
I haven't tested myself, but found this, meaning we'd get IPAddr instance as you say. We'd need to update the method or many other places where .to_s is not called implicitly, I guess API, templates could be affected
There was a problem hiding this comment.
Let's leave that till later, but long term I think it would be a good improvement. We can even drop the separate cidr field since PostgreSQL can store it in a single field.
|
Apologies for the delay, thanks indeed! |
No description provided.