From: Kees Monshouwer Date: Fri, 25 Jul 2014 19:37:28 +0000 (+0200) Subject: install other sql files in doc and make sure the names don't collide X-Git-Tag: auth-3.4.0-rc1~16^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1642%2Fhead;p=thirdparty%2Fpdns.git install other sql files in doc and make sure the names don't collide --- diff --git a/modules/goraclebackend/Makefile.am b/modules/goraclebackend/Makefile.am index c89db52de0..84bce5a545 100644 --- a/modules/goraclebackend/Makefile.am +++ b/modules/goraclebackend/Makefile.am @@ -1,7 +1,10 @@ AM_CPPFLAGS=$(ORACLE_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libgoraclebackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS +EXTRA_DIST=OBJECTFILES OBJECTLIBS \ + schema.goracle.sql drop-schema.goracle.sql + +dist_doc_DATA = schema.goracle.sql drop-schema.goracle.sql libgoraclebackend_la_SOURCES=goraclebackend.cc goraclebackend.hh \ soracle.hh soracle.cc diff --git a/modules/goraclebackend/goracle-drop-schema.sql b/modules/goraclebackend/drop-schema.goracle.sql similarity index 100% rename from modules/goraclebackend/goracle-drop-schema.sql rename to modules/goraclebackend/drop-schema.goracle.sql diff --git a/modules/goraclebackend/goracle-schema.sql b/modules/goraclebackend/schema.goracle.sql similarity index 100% rename from modules/goraclebackend/goracle-schema.sql rename to modules/goraclebackend/schema.goracle.sql diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am index 0fcca8cbf9..efc9ef431b 100644 --- a/modules/gpgsqlbackend/Makefile.am +++ b/modules/gpgsqlbackend/Makefile.am @@ -4,6 +4,8 @@ pkglib_LTLIBRARIES = libgpgsqlbackend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS \ schema.pgsql.sql nodnssec-3.x_to_3.4.0_schema.pgsql.sql dnssec-3.x_to_3.4.0_schema.pgsql.sql +dist_doc_DATA=schema.pgsql.sql nodnssec-3.x_to_3.4.0_schema.pgsql.sql dnssec-3.x_to_3.4.0_schema.pgsql.sql + libgpgsqlbackend_la_SOURCES=gpgsqlbackend.cc gpgsqlbackend.hh \ spgsql.hh spgsql.cc diff --git a/modules/gsqlite3backend/Makefile.am b/modules/gsqlite3backend/Makefile.am index 23f957e31c..f4725393f5 100644 --- a/modules/gsqlite3backend/Makefile.am +++ b/modules/gsqlite3backend/Makefile.am @@ -4,6 +4,8 @@ pkglib_LTLIBRARIES = libgsqlite3backend.la EXTRA_DIST=OBJECTFILES OBJECTLIBS \ schema.sqlite3.sql nodnssec-3.x_to_3.4.0_schema.sqlite3.sql dnssec-3.x_to_3.4.0_schema.sqlite3.sql +dist_doc_DATA=schema.sqlite3.sql nodnssec-3.x_to_3.4.0_schema.sqlite3.sql dnssec-3.x_to_3.4.0_schema.sqlite3.sql + libgsqlite3backend_la_SOURCES=gsqlite3backend.cc gsqlite3backend.hh libgsqlite3backend_la_LDFLAGS=-module -avoid-version diff --git a/modules/mydnsbackend/Makefile.am b/modules/mydnsbackend/Makefile.am index f197e7c4e2..f85f235927 100644 --- a/modules/mydnsbackend/Makefile.am +++ b/modules/mydnsbackend/Makefile.am @@ -1,6 +1,11 @@ AM_CPPFLAGS=$(MYSQL_inc) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = libmydnsbackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS -libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh -libmydnsbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib) +EXTRA_DIST=OBJECTFILES OBJECTLIBS \ + schema.mydns.sql + +dist_doc_DATA=schema.mydns.sql + +libmydnsbackend_la_SOURCES=mydnsbackend.cc mydnsbackend.hh + +libmydnsbackend_la_LDFLAGS=-module -avoid-version $(MYSQL_lib) diff --git a/modules/mydnsbackend/schema.sql b/modules/mydnsbackend/schema.mydns.sql similarity index 100% rename from modules/mydnsbackend/schema.sql rename to modules/mydnsbackend/schema.mydns.sql diff --git a/modules/oraclebackend/Makefile.am b/modules/oraclebackend/Makefile.am index 25f9094361..c8ad393a20 100644 --- a/modules/oraclebackend/Makefile.am +++ b/modules/oraclebackend/Makefile.am @@ -2,7 +2,9 @@ AM_CPPFLAGS=$(ORACLE_CFLAGS) $(THREADFLAGS) $(BOOST_CPPFLAGS) pkglib_LTLIBRARIES = liboraclebackend.la -EXTRA_DIST=OBJECTFILES OBJECTLIBS schema.sql dropschema.sql +EXTRA_DIST=OBJECTFILES OBJECTLIBS schema.oracle.sql drop-schema.oracle.sql + +dist_doc_DATA=schema.oracle.sql drop-schema.oracle.sql liboraclebackend_la_SOURCES=oraclebackend.cc oraclebackend.hh liboraclebackend_la_LDFLAGS=-module -avoid-version $(ORACLE_LIBS) diff --git a/modules/oraclebackend/dropschema.sql b/modules/oraclebackend/drop-schema.oracle.sql similarity index 100% rename from modules/oraclebackend/dropschema.sql rename to modules/oraclebackend/drop-schema.oracle.sql diff --git a/modules/oraclebackend/schema.sql b/modules/oraclebackend/schema.oracle.sql similarity index 100% rename from modules/oraclebackend/schema.sql rename to modules/oraclebackend/schema.oracle.sql diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml index 5541c442ba..e070bc4cdf 100644 --- a/pdns/docs/pdns.xml +++ b/pdns/docs/pdns.xml @@ -18435,7 +18435,7 @@ REFERENCES `domains` (`id`) ON DELETE CASCADE; Generic Oracle support is only available since version 2.9.18. The default setup conforms to the following schema, which you should add to an Oracle database. You may need or want to add 'namespace' statements. - + This schema contains all elements needed for master, slave and superslave operation. diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master index 265cecf6ad..bec53470c8 100644 --- a/regression-tests/backends/goracle-master +++ b/regression-tests/backends/goracle-master @@ -5,8 +5,8 @@ case $context in [ -z "$GORACLEUSER" ] && GORACLEUSER=pdns [ -z "$GORACLEPASSWD" ] && GORACLEPASSWD=pdns - echo "START ../modules/goraclebackend/goracle-drop-schema;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe > goracle.log - echo "START ../modules/goraclebackend/goracle-schema;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log + echo "START ../modules/goraclebackend/drop-schema.goracle.sql;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe > goracle.log + echo "START ../modules/goraclebackend/schema.goracle.sql;" | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log tosql goracle | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log cat > pdns-goracle.conf << __EOF__ diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave index 4ca036ec0f..fbe4068381 100644 --- a/regression-tests/backends/goracle-slave +++ b/regression-tests/backends/goracle-slave @@ -2,8 +2,8 @@ [ -z "$GORACLE2USER" ] && GORACLE2USER=pdns2 [ -z "$GORACLE2PASSWD" ] && GORACLE2PASSWD=pdns - echo "START ../modules/goraclebackend/goracle-drop-schema;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe > goracle2.log - echo "START ../modules/goraclebackend/goracle-schema;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log + echo "START ../modules/goraclebackend/drop-schema.goracle.sql;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe > goracle2.log + echo "START ../modules/goraclebackend/schema.goracle.sql;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log cat > pdns-goracle2.conf << __EOF__ launch=goracle diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master index 9eda2866c7..711e1b3b0a 100644 --- a/regression-tests/backends/mydns-master +++ b/regression-tests/backends/mydns-master @@ -9,7 +9,7 @@ case $context in || echo ignoring mysqladmin drop failure mysqladmin --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" create "$MYDNSDB" mysql --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" \ - "$MYDNSDB" < ../modules/mydnsbackend/schema.sql + "$MYDNSDB" < ../modules/mydnsbackend/schema.mydns.sql tosql mydns | grep -v 'double\.example\.com' | mysql --user="$MYDNSUSER" --password="$MYDNSPASSWD" --host="$MYDNSHOST" \ "$MYDNSDB" diff --git a/regression-tests/backends/oracle-master b/regression-tests/backends/oracle-master index 6d898e8556..5462fe3d76 100644 --- a/regression-tests/backends/oracle-master +++ b/regression-tests/backends/oracle-master @@ -3,8 +3,8 @@ case $context in [ -z "$ORACLEUSER" ] && ORACLEUSER=pdns [ -z "$ORACLEPASSWD" ] && ORACLEPASSWD=pdns - echo "START ../modules/oraclebackend/dropschema;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe > oracle.log - echo "START ../modules/oraclebackend/schema;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log + echo "START ../modules/oraclebackend/drop-schema.oracle.sql;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe > oracle.log + echo "START ../modules/oraclebackend/schema.oracle.sql;" | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log ../pdns/zone2sql --oracle | grep -v 'INSERT INTO Records' | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log ../pdns/zone2sql --oracle | grep " 'SOA', " | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log diff --git a/regression-tests/backends/oracle-slave b/regression-tests/backends/oracle-slave index d9292969c7..164447e66d 100644 --- a/regression-tests/backends/oracle-slave +++ b/regression-tests/backends/oracle-slave @@ -2,8 +2,8 @@ [ -z "$ORACLE2USER" ] && ORACLE2USER=pdns2 [ -z "$ORACLE2PASSWD" ] && ORACLE2PASSWD=pdns - echo "START ../modules/oraclebackend/dropschema;" | sqlplus -S $ORACLE2USER/$ORACLE2PASSWD@xe > oracle2.log - echo "START ../modules/oraclebackend/schema;" | sqlplus -S $ORACLE2USER/$ORACLE2PASSWD@xe >> oracle2.log + echo "START ../modules/oraclebackend/drop-schema.oracle.sql;" | sqlplus -S $ORACLE2USER/$ORACLE2PASSWD@xe > oracle2.log + echo "START ../modules/oraclebackend/schema.oracle.sql;" | sqlplus -S $ORACLE2USER/$ORACLE2PASSWD@xe >> oracle2.log cat > pdns-oracle2.conf << __EOF__ launch=oracle