[svn] commit: r672 - in /experiments/graff-dbapi: sample_data.sql sqlite3_ds.cc

[BIND 10 source code commits]

Author: mgraff
Date: Sat Jan 30 00:18:08 2010
New Revision: 672

Log:
checkpoint; start cname work

Modified:
    experiments/graff-dbapi/sample_data.sql
    experiments/graff-dbapi/sqlite3_ds.cc

Modified: experiments/graff-dbapi/sample_data.sql
==============================================================================
--- experiments/graff-dbapi/sample_data.sql (original)
+++ experiments/graff-dbapi/sample_data.sql Sat Jan 30 00:18:08 2010
@@ -22,6 +22,9 @@
 INSERT INTO records (zone_id, name, rname, ttl, rdtype, rdata)
     VALUES (1, 'www.example.com', 'com.example.www', 
         3600, 'A', '192.168.1.1');
+INSERT INTO records (zone_id, name, rname, ttl, rdtype, rdata)
+    VALUES (1, 'foo.example.com', 'com.example.foo',
+        3600, 'CNAME', 'cnametest.flame.org.');
 INSERT INTO records (zone_id, name, rname, ttl, rdtype, sigtype, rdata)
     VALUES (1, 'example.com', 'com.example',
         3600, 'RRSIG', 'SOA', "SignatureForSOARecords");
@@ -34,6 +37,9 @@
 INSERT INTO records (zone_id, name, rname, ttl, rdtype, sigtype, rdata)
     VALUES (1, 'www.example.com', 'com.example.www',
         3600, 'RRSIG', 'A', "SignatureForARecords");
+INSERT INTO records (zone_id, name, rname, ttl, rdtype, sigtype, rdata)
+    VALUES (1, 'foo.example.com', 'example.com.foo',
+        3600, 'RRSIG', 'CNAME', 'SignatureForCNameRecord');
 
 -- id 2
 INSERT INTO zones (id, name, rdclass, dnssec)

Modified: experiments/graff-dbapi/sqlite3_ds.cc
==============================================================================
--- experiments/graff-dbapi/sqlite3_ds.cc (original)
+++ experiments/graff-dbapi/sqlite3_ds.cc Sat Jan 30 00:18:08 2010
@@ -97,7 +97,7 @@
             return -1;
         }
     }
-    
+
     int findRecords(const char *zonename, const char *name, const char *rdtype) {
         int zone_id = hasExactZone(zonename);
         if (zone_id < 0) {
@@ -185,7 +185,7 @@
     
     void setupPreparedStatements(void) {
         const char *q_zone_str = "SELECT id FROM zones WHERE name=?1";
-        const char *q_record_str = "SELECT rdtype, ttl, sigtype, rdata FROM records WHERE zone_id=?1 AND name=?2 AND (rdtype=?3 OR sigtype=?3)";
+        const char *q_record_str = "SELECT rdtype, ttl, sigtype, rdata FROM records WHERE zone_id=?1 AND name=?2 AND ((rdtype=?3 OR sigtype=?3) OR (rdtype='CNAME' AND sigtype='CNAME'))";
 
         try {
             q_zone = prepare(q_zone_str);
@@ -304,4 +304,5 @@
     
     sql.findRecords("example.com", "example.com", "NS");
     sql.findRecords("example.com", "www.example.com", "A");
+    sql.findRecords("example.com", "foo.example.com", "A");
 }