135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace unicode nonbreaking space with ascii space (#794)

Browse Source
This commit is contained in:
nick n
2021-06-23 23:00:33 +02:00
committed by GitHub
parent ec1c0b5f39
commit 83a946d36e
49 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
View File

@@ -8,9 +8,9 @@ use base 'DBIx::Class::Core';
__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
# note to future devs:
# this query does not use the slave_of field in device_port table to group
# ports because what we actually want is total b/w between devices on all
# links, regardless of whether those links are in an aggregate.
# this query does not use the slave_of field in device_port table to group
# ports because what we actually want is total b/w between devices on all
# links, regardless of whether those links are in an aggregate.
__PACKAGE__->table('device_links');
__PACKAGE__->result_source_instance->is_virtual(1);

6
lib/App/Netdisco/DB/ResultSet/Admin.pm
View File

@@ -24,11 +24,11 @@ C<retry_after> when devices will be retried once (disabled if 0/undef passed).
sub skipped {
my ($rs, $backend, $max_deferrals, $retry) = @_;
$backend ||= 'fqdn-undefined';
$max_deferrals ||= (2**30); # not really 'disabled'
$retry ||= '100 years'; # not really 'disabled'
$max_deferrals ||= (2**30); # not really 'disabled'
$retry ||= '100 years'; # not really 'disabled'
return $rs->correlate('device_skips')->search(undef,{
# NOTE: bind param list order is significant
# NOTE: bind param list order is significant
bind => [[deferrals => $max_deferrals], [last_defer => $retry], [backend => $backend]],
});
}

4
lib/App/Netdisco/DB/ResultSet/Device.pm
View File

@@ -26,7 +26,7 @@ sub device_ips_with_address_or_name {
$q ||= '255.255.255.255/32';
return $rs->search(undef,{
# NOTE: bind param list order is significant
# NOTE: bind param list order is significant
join => ['device_ips_by_address_or_name'],
bind => [$q, $ipbind, $q],
});
@@ -44,7 +44,7 @@ sub ports_with_mac {
$mac ||= '00:00:00:00:00:00';
return $rs->search(undef,{
# NOTE: bind param list order is significant
# NOTE: bind param list order is significant
join => ['ports_by_mac'],
bind => [$mac],
});

2
lib/App/Netdisco/DB/SetOperations.pm
View File

@@ -25,7 +25,7 @@ sub _set_operation {
unless $self->_compare_arrays($as, $attrs->{as});
my ($sql, @bind) = @{${$_->as_query}};
# $sql =~ s/^\s*\((.*)\)\s*$/$1/;
# $sql =~ s/^\s*\((.*)\)\s*$/$1/;
$sql = q<(> . $sql . q<)>;
push @sql, $sql;