@@ -, +, @@ --- Koha/Import/Record.pm | 4 ++-- Koha/Import/Record/Matches.pm | 2 +- t/db_dependent/Installer.t | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) --- a/Koha/Import/Record.pm +++ a/Koha/Import/Record.pm @@ -29,12 +29,12 @@ Koha::Import::Record - Koha Import Record Object class =head1 API -=head2 Class methods - =head2 Internal methods =head3 _type +Returns name of corresponding DBIC resultset + =cut sub _type { --- a/Koha/Import/Record/Matches.pm +++ a/Koha/Import/Record/Matches.pm @@ -39,7 +39,7 @@ Koha::Import::Record::Matches - Koha Import Record Matches Object set class Koha:Import::Record::Matches->search->unset_chosen(); -Unselect all candidates as matches for the current resultset +Deselect all candidates as matches for the current resultset =cut --- a/t/db_dependent/Installer.t +++ a/t/db_dependent/Installer.t @@ -70,14 +70,10 @@ ok( ! index_exists( 'borrowers', 'xxx'), 'Constraint xxx does not exist' ); ok( foreign_key_exists( 'borrowers', 'borrowers_ibfk_1' ), 'FK borrowers_ibfk_1 exists' ); ok( ! foreign_key_exists( 'borrowers', 'xxx' ), 'FK xxxx does not exist' ); -<<<<<<< HEAD ok( unique_key_exists( 'items', 'itembarcodeidx' ), 'UNIQUE KEY itembarcodeidx exists' ); ok( ! unique_key_exists( 'borrowers', 'xxx' ), 'UNIQUE KEY xxxx does not exist' ); - -======= ok( primary_key_exists( 'borrowers' ), 'Borrowers does have a primary key on some column'); ->>>>>>> Bug 26326: (follow-up) Add ability to check for existence of any primary key ok( primary_key_exists( 'borrowers', 'borrowernumber'), 'Borrowers has primary key on borrowernumber'); ok( ! primary_key_exists( 'borrowers', 'email'), 'Borrowers does not have a primary key on email'); --