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>
302 lines
13 KiB
XML
302 lines
13 KiB
XML
|
|
<yazgfs>
|
|
<!-- [scheme:]host[:port][/databaseName] -->
|
|
<!-- scheme: tcp, ssl, unix, http, sru -->
|
|
<!-- can run all servers on tcp, but the unix socket is faster -->
|
|
|
|
<listen id="biblioserver" >unix:__ZEBRA_RUN_DIR__/bibliosocket</listen>
|
|
<listen id="authorityserver" >unix:__ZEBRA_RUN_DIR__/authoritysocket</listen>
|
|
<!-- uncomment these lines and comment out the above if running on MSWin32 -->
|
|
<!--
|
|
<listen id="biblioserver" >tcp:localhost:9998/bibliosocket</listen>
|
|
<listen id="authorityserver" >tcp:localhost:9999/authoritysocket</listen>
|
|
-->
|
|
|
|
<!-- Uncomment the following entry if you want to run the public Z39.50 server.
|
|
Also uncomment the <server> and <serverinfo> sections for id 'publicserver'
|
|
under PUBLICSERVER'S BIBLIOGRAPHIC RECORDS title-->
|
|
<!--
|
|
<listen id="publicserver" >tcp:@:__ZEBRA_SRU_BIBLIOS_PORT__</listen>
|
|
-->
|
|
|
|
<!-- Settings for special biblio server instance for PazPar2.
|
|
Because PazPar2 only connects to a Z39.50 server using TCP/IP,
|
|
it cannot use the Unix-domain socket that biblioserver uses.
|
|
Therefore, a custom server is defined. -->
|
|
__PAZPAR2_TOGGLE_XML_PRE__
|
|
<listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
|
|
<server id="mergeserver" listenref="mergeserver">
|
|
<directory>__ZEBRA_DATA_DIR__/biblios</directory>
|
|
<config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
|
|
<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
|
|
</server>
|
|
__PAZPAR2_TOGGLE_XML_POST__
|
|
|
|
<!-- BIBLIOGRAPHIC RECORDS -->
|
|
<server id="biblioserver" listenref="biblioserver">
|
|
<directory>__ZEBRA_DATA_DIR__/biblios</directory>
|
|
<config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
|
|
<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
|
|
<!-- <docpath>xsl</docpath> -->
|
|
<!-- <stylesheet>xsl/default.xsl</stylesheet> -->
|
|
<!-- <maximumrecordsize>2000000</maximumrecordsize> -->
|
|
<xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__"
|
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
<xi:fallback>
|
|
<retrievalinfo>
|
|
<retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
|
|
<retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
|
|
<retrieval syntax="xml" name="F"/>
|
|
<retrieval syntax="xml" name="B"/>
|
|
<retrieval syntax="xml" name="marcxml"
|
|
identifier="info:srw/schema/1/marcxml-v1.1">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="dc">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="mods">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="rdfdc">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="rss2">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="utils">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
</retrievalinfo>
|
|
</xi:fallback>
|
|
</xi:include>
|
|
<xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
|
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
<xi:fallback>
|
|
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
|
|
<serverInfo>
|
|
<host>__ZEBRA_SRU_HOST__</host>
|
|
<port>__ZEBRA_SRU_BIBLIOS_PORT__</port>
|
|
<database>biblios</database>
|
|
</serverInfo>
|
|
</explain>
|
|
</xi:fallback>
|
|
</xi:include>
|
|
</server>
|
|
<serverinfo id="biblioserver">
|
|
<ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
|
|
<user>__ZEBRA_USER__</user>
|
|
<password>__ZEBRA_PASS__</password>
|
|
</serverinfo>
|
|
|
|
<!-- AUTHORITY RECORDS -->
|
|
<server id="authorityserver" listenref="authorityserver" >
|
|
<directory>__ZEBRA_DATA_DIR__/authorities</directory>
|
|
<config>__ZEBRA_CONF_DIR__/__ZEBRA_AUTH_CFG__</config>
|
|
<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
|
|
<!-- <docpath>xsl</docpath> -->
|
|
<!-- <stylesheet>xsl/default.xsl</stylesheet> -->
|
|
<!-- <maximumrecordsize>2000000</maximumrecordsize> -->
|
|
<xi:include href="__KOHA_CONF_DIR__/zebradb/__AUTH_RETRIEVAL_CFG__"
|
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
<xi:fallback>
|
|
<retrievalinfo>
|
|
<retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
|
|
<retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
|
|
<retrieval syntax="xml" name="marcxml"
|
|
identifier="info:srw/schema/1/marcxml-v1.1">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="dc">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="mods">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="rdfdc">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="utils">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
</retrievalinfo>
|
|
</xi:fallback>
|
|
</xi:include>
|
|
<xi:include href="__KOHA_CONF_DIR__/zebradb/explain-authorities.xml"
|
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
<xi:fallback>
|
|
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
|
|
<serverInfo>
|
|
<host>__ZEBRA_SRU_HOST__</host>
|
|
<port>__ZEBRA_SRU_AUTHORITIES_PORT__</port>
|
|
<database>authorities</database>
|
|
</serverInfo>
|
|
</explain>
|
|
</xi:fallback>
|
|
</xi:include>
|
|
</server>
|
|
<serverinfo id="authorityserver">
|
|
<ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
|
|
<user>__ZEBRA_USER__</user>
|
|
<password>__ZEBRA_PASS__</password>
|
|
</serverinfo>
|
|
|
|
<!-- PUBLICSERVER'S BIBLIOGRAPHIC RECORDS -->
|
|
<!--
|
|
<server id="publicserver" listenref="publicserver">
|
|
<directory>__ZEBRA_DATA_DIR__/biblios</directory>
|
|
<config>__ZEBRA_CONF_DIR__/__ZEBRA_BIB_CFG__</config>
|
|
<cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
|
|
<xi:include href="__KOHA_CONF_DIR__/zebradb/__BIB_RETRIEVAL_CFG__"
|
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
<xi:fallback>
|
|
<retrievalinfo>
|
|
<retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
|
|
<retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
|
|
<retrieval syntax="xml" name="F"/>
|
|
<retrieval syntax="xml" name="B"/>
|
|
<retrieval syntax="xml" name="marcxml"
|
|
identifier="info:srw/schema/1/marcxml-v1.1">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="dc">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="mods">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="rdfdc">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="rss2">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
<retrieval syntax="xml" name="utils">
|
|
<backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
|
|
<marc inputformat="marc" outputformat="marcxml"
|
|
inputcharset="utf-8"/>
|
|
<xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
|
|
</backend>
|
|
</retrieval>
|
|
</retrievalinfo>
|
|
</xi:fallback>
|
|
</xi:include>
|
|
<xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
|
|
xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
<xi:fallback>
|
|
<explain xmlns="http://explain.z3950.org/dtd/2.0/">
|
|
<serverInfo>
|
|
<host>__ZEBRA_SRU_HOST__</host>
|
|
<port>__ZEBRA_SRU_BIBLIOS_PORT__</port>
|
|
<database>biblios</database>
|
|
</serverInfo>
|
|
</explain>
|
|
</xi:fallback>
|
|
</xi:include>
|
|
</server>
|
|
<serverinfo id="publicserver">
|
|
<ccl2rpn>__ZEBRA_CONF_DIR__/ccl.properties</ccl2rpn>
|
|
<user>__ZEBRA_USER__</user>
|
|
<password>__ZEBRA_PASS__</password>
|
|
</serverinfo>
|
|
-->
|
|
|
|
<!-- ADDITIONAL KOHA CONFIGURATION DIRECTIVE -->
|
|
<!-- db_scheme should follow the DBD driver name -->
|
|
<!-- the DBD drivers supported by Koha are mysql and Pg -->
|
|
<!-- port info: mysql:3306 Pg:5432 (5433 on Debian) -->
|
|
<config>
|
|
<db_scheme>__DB_TYPE__</db_scheme>
|
|
<database>__DB_NAME__</database>
|
|
<hostname>__DB_HOST__</hostname>
|
|
<port>__DB_PORT__</port>
|
|
<user>__DB_USER__</user>
|
|
<pass>__DB_PASS__</pass>
|
|
<biblioserver>biblios</biblioserver>
|
|
<biblioservershadow>1</biblioservershadow>
|
|
<authorityserver>authorities</authorityserver>
|
|
<authorityservershadow>1</authorityservershadow>
|
|
<pluginsdir>__PLUGINS_DIR__</pluginsdir>
|
|
<enable_plugins>0</enable_plugins>
|
|
<intranetdir>__INTRANET_CGI_DIR__</intranetdir>
|
|
<opacdir>__OPAC_CGI_DIR__/opac</opacdir>
|
|
<opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
|
|
<intrahtdocs>__INTRANET_TMPL_DIR__</intrahtdocs>
|
|
<includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
|
|
<logdir>__LOG_DIR__</logdir>
|
|
<docdir>__DOC_DIR__</docdir>
|
|
<backupdir>__BACKUP_DIR__</backupdir>
|
|
<!-- Enable the two following to allow superlibrarians to download
|
|
database and configuration dumps (respectively) from the Export
|
|
tool -->
|
|
<backup_db_via_tools>0</backup_db_via_tools>
|
|
<backup_conf_via_tools>0</backup_conf_via_tools>
|
|
<pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url>
|
|
<install_log>__MISC_DIR__/koha-install-log</install_log>
|
|
<useldapserver>0</useldapserver><!-- see C4::Auth_with_ldap for extra configs you must add if you want to turn this on -->
|
|
<zebra_bib_index_mode>__BIB_INDEX_MODE__</zebra_bib_index_mode>
|
|
<zebra_auth_index_mode>__AUTH_INDEX_MODE__</zebra_auth_index_mode>
|
|
<queryparser_config>__KOHA_CONF_DIR__/searchengine/queryparser.yaml</queryparser_config>
|
|
</config>
|
|
</yazgfs>
|