Browse Source

updated to ringo-sqlstore 0.7

Robert Gaggl 9 years ago
parent
commit
2bdcca8e8e

+ 2 - 2
frameworks/JavaScript/ringojs-convenient/app/models.js

@@ -1,4 +1,4 @@
-var {Store, ConnectionPool, Cache} = require('ringo-sqlstore');
+var {Store, Cache} = require('ringo-sqlstore');
 
 // DO NOT TOUCH THE FOLLOWING LINE.
 // THIS VARIABLE IS REGEX REPLACED BY setup.py
@@ -7,7 +7,7 @@ var dbHost = '172.16.98.98';
 // create and configure store
 var connectionPool = module.singleton("connectionPool", function() {
     var mysqlConnectionProperties = "?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useServerPrepStmts&enableQueryTimeouts=false&useUnbufferedIO=false&useReadAheadInput=false&maintainTimeStats=false&cacheRSMetadata=true";
-    return new ConnectionPool({
+    return Store.initConnectionPool({
         "url": "jdbc:mysql://" + dbHost + "/hello_world" + mysqlConnectionProperties,
         "driver": "com.mysql.jdbc.Driver",
         "username": "benchmarkdbuser",

+ 5 - 5
frameworks/JavaScript/ringojs-convenient/app/views.js

@@ -20,10 +20,10 @@ app.get('/db/:queries?', function(request, queries) {
    queries = parseInt(queries, 10) || 1;
    var worlds = [];
    var randId, world;
-   for (var i = 0; i < queries; i++) {
+   for (let i = 0; i < queries; i++) {
       randId = ((Math.random() * 10000) | 0) + 1;
       world = models.store.query('select World.* from World where World.id = :id', {id: randId})[0];
-      worlds.push({"id": world._id, "randomNumber" : world.randomNumber});
+      worlds.push({"id": world.id, "randomNumber" : world.randomNumber});
    }
    if (queries == 1) {
       worlds = worlds[0];
@@ -34,7 +34,7 @@ app.get('/db/:queries?', function(request, queries) {
 app.get('/fortune', function() {
    var fortunes = models.store.query('select Fortune.* from Fortune');
    fortunes.push({
-      _id: 0,
+      id: 0,
       message: 'Additional fortune added at request time.'
    });
    fortunes.sort(models.Fortune.sort);
@@ -55,7 +55,7 @@ app.get('/updates/:queries?', function(request, queries) {
    var worlds = [];
    var randId, world;
    models.store.beginTransaction();
-   for (var i = 0; i < queries; i++) {
+   for (let i = 0; i < queries; i++) {
       randId = ((Math.random() * 10000) | 0) + 1;
       world = models.store.query('select World.* from World where World.id = :id', {id: randId})[0];
       world.randomNumber = ((Math.random() * 10000) | 0) + 1;
@@ -65,7 +65,7 @@ app.get('/updates/:queries?', function(request, queries) {
          models.store.abortTransaction();
          return response.error('SQL error');
       }
-      worlds.push({"id": world._id, "randomNumber": world.randomNumber});
+      worlds.push({"id": world.id, "randomNumber": world.randomNumber});
    }
    models.store.commitTransaction();
    return response.json(worlds);

+ 6 - 20
frameworks/JavaScript/ringojs-convenient/templates/fortunes.reinhardt

@@ -1,20 +1,6 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Fortunes</title>
-</head>
-<body>
-<table>
-<tr>
-<th>id</th>
-<th>message</th>
-</tr>
-{% for fortune in fortunes %}
-<tr>
-<td>{{fortune._id}}</td>
-<td>{{fortune.message}}</td>
-</tr>
-{% endfor %}
-</table>
-</body>
-</html>
+<!DOCTYPE html><html>
+<head><title>Fortunes</title></head>
+<body><table>
+<tr><th>id</th><th>message</th></tr>{% for fortune in fortunes %}
+<tr><td>{{fortune.id}}</td><td>{{fortune.message}}</td></tr>{% endfor %}
+</table></body></html>