Raise error when SQL missing from subscription options for CQN

Author: cjbj

src/njsCommon.h

@@ -329,7 +329,6 @@ class njsBaton {
     uint32_t subscrGroupingClass;
     uint32_t subscrGroupingValue;
     uint32_t subscrGroupingType;
-    dpiSubscrNamespace subscrNamespace;
     njsSubscription *subscription;
     njsCommon *callingObj;
     Nan::Persistent<Object> jsCallingObj;
@@ -356,9 +355,7 @@ class njsBaton {
             rowCounts(NULL), timeout(0), qos(0), operations(0),
             numBatchErrorInfos(0), batchErrorInfos(NULL), dpiError(false),
             portNumber(0), subscrGroupingClass(0), subscrGroupingValue(0),
-            subscrGroupingType(0),
-            subscrNamespace(DPI_SUBSCR_NAMESPACE_DBCHANGE),
-            subscription(NULL) {
+            subscrGroupingType(0), subscription(NULL) {
         this->jsCallback.Reset(callback);
         this->jsCallingObj.Reset(callingObj);
         this->callingObj = Nan::ObjectWrap::Unwrap<njsCommon>(callingObj);

src/njsConnection.cpp

@@ -1406,7 +1406,7 @@ bool njsConnection::ProcessSubscriptionOptions(Local<Object> options,
         if (!baton->GetUnsignedIntFromJSON(options, "namespace", 1,
                 &temp))
             return false;
-        baton->subscrNamespace = (dpiSubscrNamespace) temp;
+        baton->subscription->SetNamespace((dpiSubscrNamespace) temp);
         if (!baton->GetStringFromJSON(options, "ipAddress", 1,
                 baton->ipAddress))
             return false;
@@ -1439,14 +1439,20 @@ bool njsConnection::ProcessSubscriptionOptions(Local<Object> options,
     }
 
     // get options that are used for registering queries
-    if (!baton->GetStringFromJSON(options, "sql", 1, baton->sql))
-        return false;
-    Local<Value> binds;
-    Local<String> key = Nan::New("binds").ToLocalChecked();
-    if (!Nan::Get(options, key).ToLocal(&binds))
-        return false;
-    if (!ProcessExecuteBinds(binds.As<Object>(), baton))
-        return false;
+    if (baton->subscription->GetNamespace() == DPI_SUBSCR_NAMESPACE_DBCHANGE) {
+        if (!baton->GetStringFromJSON(options, "sql", 1, baton->sql))
+            return false;
+        if (baton->sql.empty()) {
+            baton->error = njsMessages::Get(errMissingSubscrSql);
+            return false;
+        }
+        Local<Value> binds;
+        Local<String> key = Nan::New("binds").ToLocalChecked();
+        if (!Nan::Get(options, key).ToLocal(&binds))
+            return false;
+        if (!ProcessExecuteBinds(binds.As<Object>(), baton))
+            return false;
+    }
 
     return true;
 }
@@ -2514,7 +2520,7 @@ void njsConnection::Async_Subscribe(njsBaton *baton)
             baton->GetDPIError();
             return;
         }
-        params.subscrNamespace = baton->subscrNamespace;
+        params.subscrNamespace = baton->subscription->GetNamespace();
         params.name = baton->name.c_str();
         params.nameLength = baton->name.length();
         params.protocol = DPI_SUBSCR_PROTO_CALLBACK;

src/njsMessages.cpp

@@ -91,6 +91,7 @@ static const char *errMsg[] = {
     "NJS-060: type must be specified for bind \"%s\"", // errMissingTypeByName
     "NJS-061: invalid subscription", // errInvalidSubscription
     "NJS-062: subscription notification callback missing", // errMissingSubscrCallback
+    "NJS-063: subscription notification SQL missing", // errMissingSubscrSql
 };
 
 

src/njsMessages.h

@@ -94,6 +94,7 @@ typedef enum {
     errMissingTypeByName,
     errInvalidSubscription,
     errMissingSubscrCallback,
+    errMissingSubscrSql,
 
     // New ones should be added here
 

src/njsSubscription.h

@@ -67,6 +67,8 @@ class njsSubscription: public njsCommon {
     bool IsValid() const { return true; };
     njsErrorType GetInvalidErrorType() const { return errInvalidSubscription; }
     static Local<Object> Create();
+    dpiSubscrNamespace GetNamespace() const { return subscrNamespace; }
+    void SetNamespace(dpiSubscrNamespace ns) { subscrNamespace = ns; }
     void SetCallback(Local<Function> callback) { jsCallback.Reset(callback); }
     void SetDPISubscrHandle(njsBaton *baton)
             { baton->SetDPISubscrHandle(dpiSubscrHandle); }
@@ -99,6 +101,7 @@ class njsSubscription: public njsCommon {
     uv_barrier_t barrier;
     dpiSubscrMessage *message;
     Nan::Persistent<Function> jsCallback;
+    dpiSubscrNamespace subscrNamespace;
     std::string name;
 
     static Nan::Persistent<FunctionTemplate> subscriptionTemplate_s;