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 c89db52de0868e519681c25ecc0836bb87f6602b..84bce5a545a051bea2821a402a9283c72f9f6d2e 100644 (file)
--- 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 0fcca8cbf92341902d1f2e16023ae15ace99d3ab..efc9ef431bee05d3c2838a943030320625f11ed6 100644 (file)
--- 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 23f957e31c7ea07bcffc51773ce21e49c3bdec37..f4725393f519fbbd026c186108c19bd462445420 100644 (file)
--- 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 f197e7c4e21faec2fbc2c728a7b2c255e71a6670..f85f23592719514e5ce7bb6ff835d62012d48c49 100644 (file)
--- 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 25f9094361fce5961631d88f674b1530d72e48c7..c8ad393a200315b0ed078f5b225cc824f59d7ecd 100644 (file)
--- 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 5541c442baa96d6fb1734ffb29887e23be9b6b65..e070bc4cdf79d0278fb4d129db87a26fca060b2d 100644 (file)
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -18435,7 +18435,7 @@ REFERENCES `domains` (`id`) ON DELETE CASCADE;
       <para>
          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.
-        <programlisting><xi:include  href="../../modules/goraclebackend/goracle-schema.sql"  parse="text"  xmlns:xi="http://www.w3.org/2001/XInclude"/></programlisting>
+        <programlisting><xi:include  href="../../modules/goraclebackend/schema.goracle.sql"  parse="text"  xmlns:xi="http://www.w3.org/2001/XInclude"/></programlisting>
 </para>
       <para>
        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 265cecf6adfd0497a81bd01d101650cd312c6620..bec53470c824ef61b8f9f92303127b1a3aa530f7 100644 (file)
--- 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 4ca036ec0f5b9a0b8304230c1b3e4505bf763c96..fbe4068381048301dfa1fd2eecd7db74d4bb8a96 100644 (file)
--- 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 9eda2866c7a566045c93fea68bd3e2ed33e14769..711e1b3b0ac2a9651ad2d1f6211b31f9afb55be6 100644 (file)
--- 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 6d898e85560d2358c883ff918bfd6bb5c1b72dc1..5462fe3d769bf0783523a49d38473f28399712a6 100644 (file)
--- 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 d9292969c74b8e0d843adf5f403be87f99e342b2..164447e66d5ac4e1809c66dea4358b0906cd147b 100644 (file)
--- 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