Browse Source

verify Fixed ringojs-convenient's db/query test

Mike Smith 11 years ago
parent
commit
4d79107197
2 changed files with 9 additions and 2 deletions
  1. 3 0
      ringojs-convenient/app/models.js
  2. 6 2
      ringojs-convenient/app/views.js

+ 3 - 0
ringojs-convenient/app/models.js

@@ -22,6 +22,9 @@ store.setQueryCache(queryCache);
 // define entities in DB
 // define entities in DB
 exports.World = store.defineEntity('World', {
 exports.World = store.defineEntity('World', {
 	table: 'World',
 	table: 'World',
+  id: {
+    column: 'id'
+  },
 	properties: {
 	properties: {
 		randomNumber: 'integer'
 		randomNumber: 'integer'
 	}
 	}

+ 6 - 2
ringojs-convenient/app/views.js

@@ -23,7 +23,11 @@ app.get('/db/:queries?', function(request, queries) {
    for (var i = 0; i < queries; i++) {
    for (var i = 0; i < queries; i++) {
       randId = ((Math.random() * 10000) | 0) + 1;
       randId = ((Math.random() * 10000) | 0) + 1;
       world = models.store.query('select World.* from World where World.id = :id', {id: randId})[0];
       world = models.store.query('select World.* from World where World.id = :id', {id: randId})[0];
-      worlds.push(world.toJSON());
+      //worlds.push(world.toJSON());
+      worlds.push({"id": world._id, "randomNumber" : world.randomNumber});
+   }
+   if (queries == 1) {
+      worlds = worlds[0];
    }
    }
    return response.json(worlds);
    return response.json(worlds);
 });
 });
@@ -68,7 +72,7 @@ app.get('/updates/:queries?', function(request, queries) {
          models.store.abortTransaction();
          models.store.abortTransaction();
          return response.error('SQL error');
          return response.error('SQL error');
       }
       }
-      worlds.push(world.toJSON());
+      worlds.push({"id": world._id, "randomNumber": world.randomNumber});
    }
    }
    models.store.commitTransaction();
    models.store.commitTransaction();
    return response.json(worlds);
    return response.json(worlds);