improve mysqldiff output format

diff --git a/regression-tests/1dyndns-update-add-delete/expected_result b/regression-tests/1dyndns-update-add-delete/expected_result
index 370d66de10efd02c6315c2fa3b114ceff9dd6185..0315e0b91c93458eba0c3f7077c9861910173c06 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete/expected_result
+++ b/regression-tests/1dyndns-update-add-delete/expected_result
@@ -6,7 +6,7 @@ Answer:
 
 Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists
 --- Start: diff start step.1 ---
-> add-delete.test.dyndns       A       127.0.0.108     3600    0
+> add-delete.test.dyndns       A       0       127.0.0.108     3600
 --- End: diff start step.1 ---
 
 Answer:
@@ -17,6 +17,6 @@ Answer:
 
 Check if record is gone
 --- Start: diff step.1 step.2 ---
-< add-delete.test.dyndns       A       127.0.0.108     3600    0
+< add-delete.test.dyndns       A       0       127.0.0.108     3600
 --- End: diff step.1 step.2 ---
 

diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.dnssec b/regression-tests/1dyndns-update-add-delete/expected_result.dnssec
index a6eb6299437b4d47566e1cf0c5fe2df1fbb55ffe..ac9d141ae0538dc3c087b2ee3d45bc705c833637 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete/expected_result.dnssec
+++ b/regression-tests/1dyndns-update-add-delete/expected_result.dnssec
@@ -6,7 +6,7 @@ Answer:
 
 Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists
 --- Start: diff start step.1 ---
-> add-delete.test.dyndns       A       127.0.0.108     3600    0       add-delete      1
+> add-delete.test.dyndns       A       0       127.0.0.108     3600    'add-delete'    1
 --- End: diff start step.1 ---
 
 Answer:
@@ -17,6 +17,6 @@ Answer:
 
 Check if record is gone
 --- Start: diff step.1 step.2 ---
-< add-delete.test.dyndns       A       127.0.0.108     3600    0       add-delete      1
+< add-delete.test.dyndns       A       0       127.0.0.108     3600    'add-delete'    1
 --- End: diff step.1 step.2 ---
 

diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.narrow b/regression-tests/1dyndns-update-add-delete/expected_result.narrow
index 54dbb0c3738e6d2ed02d31390d234e55c2f84cc2..22a64c0f4e1bcff2f478cda51e6255dcc4656a78 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete/expected_result.narrow
+++ b/regression-tests/1dyndns-update-add-delete/expected_result.narrow
@@ -6,7 +6,7 @@ Answer:
 
 Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists
 --- Start: diff start step.1 ---
-> add-delete.test.dyndns       A       127.0.0.108     3600    0               1
+> add-delete.test.dyndns       A       0       127.0.0.108     3600    ''      1
 --- End: diff start step.1 ---
 
 Answer:
@@ -17,6 +17,6 @@ Answer:
 
 Check if record is gone
 --- Start: diff step.1 step.2 ---
-< add-delete.test.dyndns       A       127.0.0.108     3600    0               1
+< add-delete.test.dyndns       A       0       127.0.0.108     3600    ''      1
 --- End: diff step.1 step.2 ---
 

diff --git a/regression-tests/1dyndns-update-add-delete/expected_result.nsec3 b/regression-tests/1dyndns-update-add-delete/expected_result.nsec3
index d3cd61e2ff731aaa9d7e5dd4ef6d3dc7798b5b41..6c68ba9de82ff8c1b3cb70c5ca1932321dbf3c73 100644 (file)
--- a/regression-tests/1dyndns-update-add-delete/expected_result.nsec3
+++ b/regression-tests/1dyndns-update-add-delete/expected_result.nsec3
@@ -6,7 +6,7 @@ Answer:
 
 Check if add-delete.test.dyndns. 3600 A 127.0.0.108 exists
 --- Start: diff start step.1 ---
-> add-delete.test.dyndns       A       127.0.0.108     3600    0       gkhs0ms64101fs1dj19h7no8vn2tp4fk        1
+> add-delete.test.dyndns       A       0       127.0.0.108     3600    'gkhs0ms64101fs1dj19h7no8vn2tp4fk'      1
 --- End: diff start step.1 ---
 
 Answer:
@@ -17,6 +17,6 @@ Answer:
 
 Check if record is gone
 --- Start: diff step.1 step.2 ---
-< add-delete.test.dyndns       A       127.0.0.108     3600    0       gkhs0ms64101fs1dj19h7no8vn2tp4fk        1
+< add-delete.test.dyndns       A       0       127.0.0.108     3600    'gkhs0ms64101fs1dj19h7no8vn2tp4fk'      1
 --- End: diff step.1 step.2 ---
 

diff --git a/regression-tests/mysqldiff b/regression-tests/mysqldiff
index 6866c99d29ab868848aeb00f3b1af6029d2e5051..748536ce7b4fa7193a8c07d84bd7bfd6122be1cf 100755 (executable)
--- a/regression-tests/mysqldiff
+++ b/regression-tests/mysqldiff
@@ -16,11 +16,11 @@ if [ "${context: -9}" = "-nodnssec" ]
 then
        mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \
                "$GMYSQLDB" \
-               -e "SELECT r.name, r.type, r.content, r.ttl, r.prio FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step
+               -e "SELECT r.name, r.type, r.prio, r.content, r.ttl FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step
 else
        mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \
                "$GMYSQLDB" \
-               -e "SELECT r.name, r.type, r.content, r.ttl, r.prio, r.ordername, r.auth FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step
+               -e "SELECT r.name, r.type, r.prio, r.content, r.ttl, CONCAT('''', CONCAT(r.ordername, '''')), r.auth FROM domains d JOIN records r ON d.id=r.domain_id WHERE d.name='test.dyndns' AND r.type != 'SOA' ORDER BY r.name, r.type, r.content, r.ttl, r.prio" > ${testsdir}/${testname}/$step
 fi
 
 if [ ! "$step" == "start" ]
@@ -29,7 +29,7 @@ then
        diff ${testsdir}/${testname}/$diffto ${testsdir}/${testname}/$step | sed '/^[0-9a-z,/-]*$/d' | sort -V
        if [ ${PIPESTATUS[0]} -eq 0 ]
        then
-               echo "is equal"
+               echo "no differnce"
        fi
        echo -e "--- End: diff $diffto $step ---\n"
 fi