update zone2sql oracle query and s/oracle/goracle

diff --git a/pdns/zone2sql.cc b/pdns/zone2sql.cc
index e823cfddd5f675a2208aad9a76f5548ef1eaf227..7f371d40e89e07706747d60e0d9f204683f0a5be 100644 (file)
--- a/pdns/zone2sql.cc
+++ b/pdns/zone2sql.cc
@@ -196,7 +196,7 @@ static void emitRecord(const string& zoneName, const string &qname, const string
     }
   }
   else if(g_mode==ORACLE) {
-    cout<<"insert into Records (id,ZoneId, name,type,content,TimeToLive,Priority) select RECORDS_ID_SEQUENCE.nextval,id ,"<<
+    cout<<"insert into Records (id, domain_id, name, type, content, ttl, prio) select RECORDS_ID_SEQUENCE.nextval,id ,"<<
       sqlstr(toLower(stripDot(qname)))<<", "<<
       sqlstr(qtype)<<", "<<
       sqlstr(stripDotContent(content))<<", "<<ttl<<", "<<prio<< 
@@ -233,7 +233,7 @@ static void emitRecord(const string& zoneName, const string &qname, const string
 
 
 /* 2 modes of operation, either --named or --zone (the latter needs $ORIGIN) 
-   2 further modes: --mysql or --oracle 
+   2 further modes: --mysql or --goracle 
 */
 
 ArgvMap &arg()
@@ -255,7 +255,7 @@ try
     ::arg().setSwitch("gpgsql","Output in format suitable for default gpgsqlbackend")="no";
     ::arg().setSwitch("gmysql","Output in format suitable for default gmysqlbackend")="no";
     ::arg().setSwitch("mydns","Output in format suitable for default mydnsbackend")="no";
-    ::arg().setSwitch("oracle","Output in format suitable for the oraclebackend")="no";
+    ::arg().setSwitch("goracle","Output in format suitable for the goraclebackend")="no";
     ::arg().setSwitch("gsqlite","Output in format suitable for default gsqlitebackend")="no";
     ::arg().setSwitch("verbose","Verbose comments on operation")="no";
     ::arg().setSwitch("dnssec","Add DNSSEC related data")="no";
@@ -292,7 +292,7 @@ try
       g_mode=POSTGRES;
     else if(::arg().mustDo("gsqlite"))
       g_mode=SQLITE;
-    else if(::arg().mustDo("oracle")) {
+    else if(::arg().mustDo("goracle")) {
       g_mode=ORACLE;
       if(!::arg().mustDo("transactions"))
         cout<<"set autocommit on;"<<endl;