5920ca6fa0
This patch restores the ability to request a DBI database handle
or a DBIx::Class schema object connected to a PostgreSQL database.
To address the concerns raised in bug 7188, only "mysql" and "Pg"
are recognized as valid DB schemes. If anything else is passed
to C4::Context::db_scheme2dbi or set as the db_scheme in the Koha
configuration file, the DBD driver to load is assumed to be "mysql".
Note that this patch drops any pretense of Oracle support.
To test:
[1] Apply patch, and verify that the database-dependent tests
pass when run against a MySQL Koha database.
[2] To test against PostgreSQL, create a Pg database and
edit koha-conf.xml to set db_scheme to Pg (and adjust
the other DB connection parameters appropriately). The
following tests should pass, at minimum:
t/Context.t
t/db_dependent/Koha_Database.t
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, some additional notes:
- Installed Postgres following
http://wiki.ubuntuusers.de/PostgreSQL
- Created a database user koha
- Created a database koha
- Changed the koha-conf.xml file
<db_scheme>Pg</db_scheme>
<database>koha</database>
<hostname>localhost</hostname>
<port>5432</port>
<user>koha</user>
<pass>xxxx</pass>
- Installed libdbd-pg-perl
- Ran the web installer until step 3 everything looked ok
Step 3 complains:
Password for user koha: psql: fe_sendauth: no password supplied
- Both t/Context.t and t/db_dependent/Koha_Database.t pass
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
37 lines
1.2 KiB
Perl
Executable file
37 lines
1.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
use Modern::Perl;
|
|
use DBI;
|
|
use Test::More tests => 10;
|
|
use Test::MockModule;
|
|
|
|
BEGIN {
|
|
use_ok('C4::Context');
|
|
}
|
|
|
|
my $context = new Test::MockModule('C4::Context');
|
|
my $userenv = {};
|
|
|
|
$context->mock('userenv', sub {
|
|
return $userenv;
|
|
});
|
|
|
|
local $SIG{__WARN__} = sub { die $_[0] };
|
|
|
|
eval { C4::Context::IsSuperLibrarian(); };
|
|
like ( $@, qr/not defined/, "IsSuperLibrarian logs an error if no userenv is defined" );
|
|
|
|
$userenv->{flags} = 42;
|
|
my $is_super_librarian = eval{ C4::Context::IsSuperLibrarian() };
|
|
is ( $@, q||, "IsSuperLibrarian does not log an error if userenv is defined" );
|
|
is ( $is_super_librarian, 0, "With flag=42, it is not a super librarian" );
|
|
|
|
$userenv->{flags} = 421;
|
|
$is_super_librarian = eval{ C4::Context::IsSuperLibrarian() };
|
|
is ( $@, q||, "IsSuperLibrarian does not log an error if userenv is defined" );
|
|
is ( $is_super_librarian, 1, "With flag=1, it is a super librarian" );
|
|
|
|
is(C4::Context::db_scheme2dbi('mysql'), 'mysql', 'ask for mysql, get mysql');
|
|
is(C4::Context::db_scheme2dbi('Pg'), 'Pg', 'ask for Pg, get Pg');
|
|
is(C4::Context::db_scheme2dbi('xxx'), 'mysql', 'ask for unsupported DBMS, get mysql');
|
|
is(C4::Context::db_scheme2dbi(), 'mysql', 'ask for nothing, get mysql');
|