Browse Source

Updated SDK to the latest version.
Updated dependencies to the latest versions.
Possible fix for MongoDB tests.

Lucian Pacurar 11 years ago
parent
commit
2fbc488cb2
3 changed files with 23 additions and 23 deletions
  1. 8 8
      dart-start/README.md
  2. 8 8
      dart-start/pubspec.yaml
  3. 7 7
      dart-start/server.dart

+ 8 - 8
dart-start/README.md

@@ -4,14 +4,14 @@ This test adds [Start](https://github.com/lvivski/start), a Sinatra inspired web
 
 ## Versions
 
-* [Dart SDK version 0.8.5.1_r28990](https://launchpad.net/~hachre/+archive/dart)
-* [Dart args version 0.8.5](http://pub.dartlang.org/packages/args)
-* [Dart crypto version 0.8.5](http://pub.dartlang.org/packages/crypto)
-* [Dart mustache version 0.1.5](http://pub.dartlang.org/packages/mustache)
-* [Dart mongo_dart version 0.1.31](http://pub.dartlang.org/packages/mongo_dart)
-* [Dart postgresql version 0.2.8](http://pub.dartlang.org/packages/postgresql)
-* [Dart start version 0.0.9+1](http://pub.dartlang.org/packages/start)
-* [Dart yaml version 0.8.5](http://pub.dartlang.org/packages/yaml)
+* [Dart SDK version 1.0.0.3_r30187](https://launchpad.net/~hachre/+archive/dart)
+* [Dart args version 0.9.0](http://pub.dartlang.org/packages/args)
+* [Dart crypto version 0.9.0](http://pub.dartlang.org/packages/crypto)
+* [Dart mustache version 0.1.6](http://pub.dartlang.org/packages/mustache)
+* [Dart mongo_dart version 0.1.35](http://pub.dartlang.org/packages/mongo_dart)
+* [Dart postgresql version 0.2.11](http://pub.dartlang.org/packages/postgresql)
+* [Dart start version 0.1.1](http://pub.dartlang.org/packages/start)
+* [Dart yaml version 0.9.0](http://pub.dartlang.org/packages/yaml)
 
 ## Test URLs
 

+ 8 - 8
dart-start/pubspec.yaml

@@ -1,12 +1,12 @@
 name: DartStartBenchmark
 description: A benchmark of Dart Start, a Sinatra inspired web framework
 environment:
-  sdk: ">=0.8.7"
+  sdk: ">=0.8.10+6 <2.0.0"
 dependencies:
-  args: 0.8.7
-  crypto: 0.8.7
-  mongo_dart: 0.1.31
-  mustache: 0.1.5
-  postgresql: 0.2.9
-  start: 0.0.9+2
-  yaml: 0.8.7
+  args: 0.9.0
+  crypto: 0.9.0
+  mongo_dart: 0.1.35
+  mustache: 0.1.6
+  postgresql: 0.2.11
+  start: 0.1.1
+  yaml: 0.9.0

+ 7 - 7
dart-start/server.dart

@@ -53,13 +53,13 @@ class World {
   toJson() => { "id": id, "randomnumber": randomnumber };
 }
 
-main() {
+main(List<String> args) {
   var parser = new ArgParser();
   parser.addOption('address', abbr: 'a', defaultsTo: '0.0.0.0');
   parser.addOption('port', abbr: 'p', defaultsTo: '8080');
   parser.addOption('dbconnections', abbr: 'd', defaultsTo: '256');
   
-  var arguments = parser.parse(new Options().arguments);
+  var arguments = parser.parse(args);
   
   Future.wait([
     new File("postgresql.yaml").readAsString().then((config){
@@ -74,8 +74,8 @@ main() {
       var mongoConfig = yaml.loadYaml(config);
       _mongoDb = new Db("mongodb://${mongoConfig["host"]}/${mongoConfig["database"]}");
       return _mongoDb.open().then((_) {
-        _worldCollection = _mongoDb.collection("World");
-        _fortuneCollection = _mongoDb.collection("Fortune");
+        _worldCollection = _mongoDb.collection("world");
+        _fortuneCollection = _mongoDb.collection("fortune");
       });
     }),
     new File('fortunes.mustache').readAsString().then((template) {
@@ -129,7 +129,7 @@ main() {
           _setHtmlHeaders(request.response);
           
           _connectionPool.connect().then((connection) {
-            return connection.query('SELECT "id", "message" FROM "Fortune";')
+            return connection.query('SELECT id, message FROM fortune;')
                 .map((row) => new Fortune(row[0], row[1]))
                 .toList()
                 .whenComplete(() { connection.close(); });
@@ -159,7 +159,7 @@ main() {
                   return _connectionPool.connect()
                       .then((connection) {
                         return connection.execute(
-                              'UPDATE "World" SET "randomnumber" = @randomnumber WHERE "id" = @id;',
+                              'UPDATE world SET randomnumber = @randomnumber WHERE id = @id;',
                               { 
                                 'randomnumber': world.randomnumber,
                                 'id': world.id 
@@ -342,7 +342,7 @@ _parseQueriesParam(param) {
 _query() {
   return _connectionPool.connect().then((connection) {
     return connection
-      .query('SELECT "id", "randomnumber" FROM "World" WHERE id = @id;', { 'id': _RANDOM.nextInt(_WORLD_TABLE_SIZE) + 1 })
+      .query('SELECT id, randomnumber FROM world WHERE id = @id;', { 'id': _RANDOM.nextInt(_WORLD_TABLE_SIZE) + 1 })
       .single
       .then((row) =>new World(row[0], row[1]))
       .whenComplete(() {