Browse Source

Updated dart-stream.

Lucian Pacurar 11 years ago
parent
commit
ab664baa0f
3 changed files with 12 additions and 11 deletions
  1. 6 6
      dart-stream/README.md
  2. 2 1
      dart-stream/pubspec.yaml
  3. 4 4
      dart-stream/server.dart

+ 6 - 6
dart-stream/README.md

@@ -5,12 +5,12 @@ This test adds [Stream](https://github.com/rikulo/stream), a lightweight Dart we
 ## Versions
 ## Versions
 
 
 * [Dart SDK version 0.8.7.0_r29341](https://launchpad.net/~hachre/+archive/dart)
 * [Dart SDK version 0.8.7.0_r29341](https://launchpad.net/~hachre/+archive/dart)
-* [Dart args version 0.8.7](http://pub.dartlang.org/packages/args)
-* [Dart crypto version 0.8.7](http://pub.dartlang.org/packages/crypto)
-* [Dart mongo_dart version 0.1.31](http://pub.dartlang.org/packages/mongo_dart)
-* [Dart postgresql version 0.2.9](http://pub.dartlang.org/packages/postgresql)
-* [Dart stream version 0.8.6+2](http://pub.dartlang.org/packages/start)
-* [Dart yaml version 0.8.7](http://pub.dartlang.org/packages/yaml)
+* [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 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 stream version 1.0.0](http://pub.dartlang.org/packages/start)
+* [Dart yaml version 0.9.0](http://pub.dartlang.org/packages/yaml)
 
 
 ## Test URLs
 ## Test URLs
 
 

+ 2 - 1
dart-stream/pubspec.yaml

@@ -7,5 +7,6 @@ dependencies:
   crypto: 0.9.0
   crypto: 0.9.0
   mongo_dart: 0.1.35
   mongo_dart: 0.1.35
   postgresql: 0.2.11
   postgresql: 0.2.11
-  stream: 0.8.7+2
+  rikulo_commons: 1.0.0
+  stream: 1.0.0
   yaml: 0.9.0
   yaml: 0.9.0

+ 4 - 4
dart-stream/server.dart

@@ -153,7 +153,7 @@ _updatesTest(HttpConnect connect) {
             return _connectionPool.connect()
             return _connectionPool.connect()
               .then((connection) {
               .then((connection) {
                 return connection.execute(
                 return connection.execute(
-                      'UPDATE "World" SET "randomnumber" = @randomnumber WHERE "id" = @id;',
+                      'UPDATE world SET randomnumber = @randomnumber WHERE id = @id;',
                       { 
                       { 
                         'randomnumber': world.randomnumber,
                         'randomnumber': world.randomnumber,
                         'id': world.id 
                         'id': world.id 
@@ -170,7 +170,7 @@ _updatesTest(HttpConnect connect) {
 _fortunesTest(HttpConnect connect) {
 _fortunesTest(HttpConnect connect) {
   
   
   return _connectionPool.connect().then((connection) {
   return _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]))
         .map((row) => new Fortune(row[0], row[1]))
           .toList()
           .toList()
             .whenComplete(() { connection.close(); });
             .whenComplete(() { connection.close(); });
@@ -284,14 +284,14 @@ _htmlHeadersFilter(HttpConnect connect, Future chain(HttpConnect conn)) {
 
 
 // parse queries param
 // parse queries param
 _parseQueriesParam(param) {
 _parseQueriesParam(param) {
-  return param.isEmpty ? 1 : int.parse(param, radix: 10, onError: (_) => 1).clamp(1, 500);
+  return (param == null || param.isEmpty) ? 1 : int.parse(param, radix: 10, onError: (_) => 1).clamp(1, 500);
 }
 }
 
 
 // runs a query and returns a promise
 // runs a query and returns a promise
 _query() {
 _query() {
   return _connectionPool.connect().then((connection) {
   return _connectionPool.connect().then((connection) {
     return 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
       .single
       .then((row) =>new World(row[0], row[1]))
       .then((row) =>new World(row[0], row[1]))
       .whenComplete(() {
       .whenComplete(() {