Replace the old JavaScript query server JSON library with json2.js

This change makes us interoperate better with other JSON implementations. It also means we can use the native JSON handlers in JavaScript runtimes that support them. Should be faster right away on new Spidermonkeys.

There are some potential breaking changes for apps that depend on Couch blowing up on 'undefined'. json2.js serialized undefined as 'null' instead of crashing.

This change will also affect people using E4X, as you can't just return an XML object and have it serialized to a string for you. Calling .toXMLString() on these is all you need to do.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@903023 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 12 insertions, 12 deletions

diff --git a/share/www/script/test/show_documents.js b/share/www/script/test/show_documents.js
index f484e029..accb8522 100644
--- a/share/www/script/test/show_documents.js
+++ b/share/www/script/test/show_documents.js
@@ -61,7 +61,7 @@ couchTests.show_documents = function(debug) {
            "headers" : {
              "Content-Type" : "application/xml"
            },
-           "body" : new XML('<xml><node foo="bar"/></xml>')
+           "body" : new XML('<xml><node foo="bar"/></xml>').toXMLString()
          }
        }),
       "no-set-etag" : stringFun(function(doc, req) {
@@ -114,7 +114,8 @@ couchTests.show_documents = function(debug) {
           // E4X outside of a string. Outside of tests you
           // can just use E4X literals.
           eval('xml.node.@foo = doc.word');
-          return xml;
+          log('xml: '+xml.toSource());
+          return xml.toXMLString();
         });
         
         provides("foo", function() {
diff --git a/share/www/script/test/update_documents.js b/share/www/script/test/update_documents.js
index 87fc7352..c7bd05b1 100644
--- a/share/www/script/test/update_documents.js
+++ b/share/www/script/test/update_documents.js
@@ -68,7 +68,7 @@ couchTests.update_documents = function(debug) {
           "headers" : {
             "Content-Type" : "application/xml"
           },
-          "body" : xml
+          "body" : xml.toXMLString()
         };
          
          return [doc, resp];
diff --git a/share/www/script/test/view_errors.js b/share/www/script/test/view_errors.js
index 0f90c46f..c6607ad4 100644
--- a/share/www/script/test/view_errors.js
+++ b/share/www/script/test/view_errors.js
@@ -16,8 +16,6 @@ couchTests.view_errors = function(debug) {
   db.createDb();
   if (debug) debugger;
 
-
-
   run_on_modified_server(
     [{section: "couchdb",
       key: "os_process_timeout",
@@ -26,12 +24,13 @@ couchTests.view_errors = function(debug) {
       var doc = {integer: 1, string: "1", array: [1, 2, 3]};
       T(db.save(doc).ok);
 
-      // emitting a key value that is undefined should result in that row not
-      // being included in the view results
+      // emitting a key value that is undefined should result in that row
+      // being included in the view results as null
       var results = db.query(function(doc) {
         emit(doc.undef, null);
       });
-      T(results.total_rows == 0);
+      T(results.total_rows == 1);
+      T(results.rows[0].key == null);
 
       // if a view function throws an exception, its results are not included in
       // the view index, but the view does not itself raise an error
@@ -41,13 +40,13 @@ couchTests.view_errors = function(debug) {
       T(results.total_rows == 0);
 
       // if a view function includes an undefined value in the emitted key or
-      // value, an error is logged and the result is not included in the view
-      // index, and the view itself does not raise an error
+      // value, it is treated as null
       var results = db.query(function(doc) {
         emit([doc._id, doc.undef], null);
       });
-      T(results.total_rows == 0);
-
+      T(results.total_rows == 1);
+      T(results.rows[0].key[1] == null);
+      
       // querying a view with invalid params should give a resonable error message
       var xhr = CouchDB.request("POST", "/test_suite_db/_temp_view?startkey=foo", {
         headers: {"Content-Type": "application/json"},