View | Details | Raw Unified | Return to bug 32334
Collapse All | Expand All

(-)a/Koha/Database/Commenter.pm (-2 / +15 lines)
Lines 20-25 package Koha::Database::Commenter; Link Here
20
use Modern::Perl;
20
use Modern::Perl;
21
use File::Slurp qw(read_file);
21
use File::Slurp qw(read_file);
22
22
23
use C4::Context;
23
use Koha::Exceptions;
24
use Koha::Exceptions;
24
25
25
use constant KOHA_STRUCTURE => 'installer/data/mysql/kohastructure.sql';
26
use constant KOHA_STRUCTURE => 'installer/data/mysql/kohastructure.sql';
Lines 76-82 sub new { Link Here
76
        unless ref($self->{dbh}) eq DBI_HANDLE_CLASS;
77
        unless ref($self->{dbh}) eq DBI_HANDLE_CLASS;
77
78
78
    $self->{database} //= ( $self->{dbh}->selectrow_array('SELECT DATABASE()') )[0];
79
    $self->{database} //= ( $self->{dbh}->selectrow_array('SELECT DATABASE()') )[0];
79
    $self->{schema_file} //= KOHA_STRUCTURE;
80
    $self->_find_schema unless $self->{schema_file};
80
    $self->{schema_info} = {};
81
    $self->{schema_info} = {};
81
82
82
    return $self;
83
    return $self;
Lines 151-158 sub renumber { Link Here
151
152
152
=head1 INTERNAL ROUTINES
153
=head1 INTERNAL ROUTINES
153
154
155
=head2 _find_schema
156
154
=cut
157
=cut
155
158
159
sub _find_schema {
160
    my $self = shift;
161
    my $rootdir = C4::Context->config('intranetdir');
162
    if( -e "$rootdir/". KOHA_STRUCTURE ) {
163
        $self->{schema_file} = "$rootdir/". KOHA_STRUCTURE;
164
    } elsif( -e "$rootdir/intranet/cgi-bin/". KOHA_STRUCTURE ) {
165
        $self->{schema_file} = "$rootdir/intranet/cgi-bin/". KOHA_STRUCTURE;
166
    }
167
}
168
156
=head2 _fetch_schema_comments
169
=head2 _fetch_schema_comments
157
170
158
=cut
171
=cut
Lines 161-167 sub _fetch_schema_comments { Link Here
161
# Wish we had a DBIC function for this, showing comments too ;) Now using kohastructure as source of truth.
174
# Wish we had a DBIC function for this, showing comments too ;) Now using kohastructure as source of truth.
162
    my ( $self ) = @_;
175
    my ( $self ) = @_;
163
    my $file = $self->{schema_file};
176
    my $file = $self->{schema_file};
164
    Koha::Exceptions::FileNotFound->throw( filename => $file ) unless -e $file;
177
    Koha::Exceptions::FileNotFound->throw( filename => $file ) unless $file && -e $file;
165
178
166
    return $self->{schema_info} if keys %{$self->{schema_info}};
179
    return $self->{schema_info} if keys %{$self->{schema_info}};
167
180
(-)a/misc/maintenance/sync_db_comments.pl (-3 / +5 lines)
Lines 36-47 GetOptions( Link Here
36
  'help|h'     => \$cmd_args->{help},
36
  'help|h'     => \$cmd_args->{help},
37
  'renumber'   => \$cmd_args->{renumber},
37
  'renumber'   => \$cmd_args->{renumber},
38
  'reset'      => \$cmd_args->{reset},
38
  'reset'      => \$cmd_args->{reset},
39
  'schema:s'   => \$cmd_args->{schema},
39
  'table:s'    => \$cmd_args->{table},
40
  'table:s'    => \$cmd_args->{table},
40
  'verbose|v'  => \$cmd_args->{verbose},
41
  'verbose|v'  => \$cmd_args->{verbose},
41
);
42
);
42
$cmd_args->{dry_run} = !$cmd_args->{commit};
43
$cmd_args->{dry_run} = !$cmd_args->{commit};
43
44
44
my $commenter = Koha::Database::Commenter->new({ database => delete $cmd_args->{database}, dbh => C4::Context->dbh });
45
my $commenter = Koha::Database::Commenter->new({
46
    database => delete $cmd_args->{database}, dbh => C4::Context->dbh, schema_file => delete $cmd_args->{schema},
47
});
45
my $messages = $cmd_args->{verbose} || $cmd_args->{dry_run} ? [] : undef;
48
my $messages = $cmd_args->{verbose} || $cmd_args->{dry_run} ? [] : undef;
46
if( $cmd_args->{help} ) {
49
if( $cmd_args->{help} ) {
47
    pod2usage( -verbose => 2 );
50
    pod2usage( -verbose => 2 );
Lines 71-77 misc/maintenance/sync_db_comments.pl Link Here
71
74
72
=head1 SYNOPSIS
75
=head1 SYNOPSIS
73
76
74
    perl sync_db_comments.pl [-h] [-v] [-database DB_NAME] [-table TABLE_NAME] [-commit] [-clear|-reset|-renumber]
77
    perl sync_db_comments.pl [-h] [-v] [-schema FILE ] [-database DB_NAME] [-table TABLE_NAME] [-commit] [-clear|-reset|-renumber]
75
78
76
=head1 DESCRIPTION
79
=head1 DESCRIPTION
77
80
78
- 

Return to bug 32334