Merge pull request #35 from pieterlexis/godbc-squash-rebase

Godbc squash rebase

.travis.yml

@@ -34,6 +34,7 @@ before_script:
      libopendbx1-dev
      libopendbx1-sqlite3
      libp11-kit-dev
+     libsqliteodbc
      libtolua-dev
      libtool
      links
@@ -50,6 +51,7 @@ before_script:
      softhsm
      time
      unbound-host
+     unixodbc-dev
      xmlto
  - sudo sh -c 'sed s/precise/trusty/g /etc/apt/sources.list > /etc/apt/sources.list.d/trusty.list'
  - sudo apt-get update --quiet --quiet
@@ -80,12 +82,13 @@ before_script:
  - sudo chmod 0644 /etc/softhsm/softhsm.conf
  - sudo chmod 0777 /var/lib/softhsm
  - p11-kit -l # ensure it's ok
+ - echo -e "[pdns-sqlite3-1]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite3\n\n[pdns-sqlite3-2]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite32\n" > ${HOME}/.odbc.ini
 script:
  - ./bootstrap
 #DNSName     --with-dynmodules='bind gmysql gpgsql gsqlite3 mydns tinydns remote random opendbx ldap lmdb lua'
 #Build without --enable-botan1.10 option, Botan/SoftHSM conflict #2496
  - CFLAGS='-O1' CXXFLAGS='-O1' ./configure
-     --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 mydns tinydns pipe remote random opendbx ldap lua'
+     --with-dynmodules='bind gmysql geoip godbc gpgsql gsqlite3 mydns tinydns pipe remote random opendbx ldap lua'
      --with-modules=''
      --with-sqlite3
      --enable-unit-tests
@@ -173,6 +176,7 @@ script:
 #DNSName - ./timestamp ./start-test-stop 5300 lmdb-nodnssec
  - ./timestamp ./start-test-stop 5300 mydns
  - ./timestamp ./start-test-stop 5300 opendbx-sqlite3
+ - GODBC_SQLITE3_DSN=pdns-sqlite3-1 ./timestamp ./start-test-stop 5300 godbc_sqlite3-nsec3
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe-dnssec
 # - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-unix

regression-tests/backends/godbc_sqlite3-master

@@ -10,7 +10,6 @@ case $context in
 module-dir=./modules
 launch=godbc
 godbc-datasource=$GODBC_SQLITE3_DSN
-godbc-dnssec=yes
 
 godbc-activate-domain-key-query=update cryptokeys set active=1 where domain_id=(select id from domains where name=?) and  cryptokeys.id=?
 godbc-add-domain-key-query=insert into cryptokeys (domain_id, flags, active, content) select id, ?,?, ? from domains where name=?
@@ -34,8 +33,8 @@ godbc-get-all-domains-query=select domains.id, domains.name, records.content, do
 godbc-get-domain-metadata-query=select content from domains, domainmetadata where domainmetadata.domain_id=domains.id and name=? and domainmetadata.kind=?
 godbc-get-order-after-query=select min(ordername) from records where disabled=0 and ordername > ? and domain_id=? and ordername is not null
 godbc-get-order-before-query=select ordername, name from records where disabled=0 and ordername <= ? and domain_id=? and ordername is not null order by 1 desc limit 1
-godbc-get-order-first-query=select ordername, name from records where disabled=0 and domain_id=? and ordername is not null order by 1 asc limit 1
-godbc-get-order-last-query=select ordername, name from records where disabled=0 and ordername != '' and domain_id=? and ordername is not null order by 1 desc limit 1
+godbc-get-order-first-query=select ordername from records where disabled=0 and domain_id=? and ordername is not null order by 1 asc limit 1
+godbc-get-order-last-query=select ordername from records where disabled=0 and ordername != '' and domain_id=? and ordername is not null order by 1 desc limit 1
 godbc-get-tsig-key-query=select algorithm, secret from tsigkeys where name=?
 godbc-get-tsig-keys-query=select name,algorithm, secret from tsigkeys
 godbc-id-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and type=? and name=? and domain_id=?
@@ -55,20 +54,19 @@ godbc-list-domain-keys-query=select cryptokeys.id, flags, active, content from d
 godbc-list-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE (disabled=0 OR ?) and domain_id=? order by name, type
 godbc-list-subzone-query=SELECT content,ttl,prio,type,domain_id,disabled,name,auth FROM records WHERE disabled=0 and (name=? OR name like ?) and domain_id=?
 godbc-master-zone-query=select master from domains where name=? and type='SLAVE'
-godbc-nullify-ordername-and-auth-query=update records set ordername=NULL,auth=0 where name=? and type=? and domain_id=? and disabled=0
 godbc-nullify-ordername-and-update-auth-query=update records set ordername=NULL,auth=? where domain_id=? and name=? and disabled=0
 godbc-remove-domain-key-query=delete from cryptokeys where domain_id=(select id from domains where name=?) and cryptokeys.id=?
 godbc-remove-empty-non-terminals-from-zone-query=delete from records where domain_id=? and type is null
-godbc-set-auth-on-ds-record-query=update records set auth=1 where domain_id=? and name=? and type='DS' and disabled=0
 godbc-set-domain-metadata-query=insert into domainmetadata (domain_id, kind, content) select id, ?, ? from domains where name=?
-godbc-set-order-and-auth-query=update records set ordername=?,auth=? where name=? and domain_id=? and disabled=0
 godbc-set-tsig-key-query=replace into tsigkeys (name,algorithm,secret) values(?,?,?)
 godbc-supermaster-name-to-ips=select ip,account from supermasters where nameserver=? and account=?
 godbc-supermaster-query=select account from supermasters where ip=? and nameserver=?
 godbc-update-account-query=update domains set account=? where name=?
 godbc-update-kind-query=update domains set type=? where name=?
 godbc-update-lastcheck-query=update domains set last_check=? where id=?
 godbc-update-master-query=update domains set master=? where name=?
+godbc-update-ordername-and-auth-query=update records set ordername=?,auth=? where domain_id=? and name=? and disabled=0
+godbc-update-ordername-and-auth-type-query=update records set ordername=?,auth=? where domain_id=? and name=? and type=? and disabled=0
 godbc-update-serial-query=update domains set notified_serial=? where id=?
 godbc-zone-lastchange-query=select max(change_date) from records where domain_id=?
 __EOF__

regression-tests/modules/libgodbcbackend.so

@@ -0,0 +1 @@
+../../modules/godbcbackend/.libs/libgodbcbackend.so