- updated dependency installation

- update mysql jdbc driver jar file
- fixed connection pool instantiation
- minor modifications in views module

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

@@ -10,8 +10,10 @@ var connectionPool = module.singleton("connectionPool", function() {
     return Store.initConnectionPool({
         "url": "jdbc:mysql://" + dbHost + "/hello_world" + mysqlConnectionProperties,
         "driver": "com.mysql.jdbc.Driver",
-        "username": "benchmarkdbuser",
-        "password": "benchmarkdbpass"
+        "user": "benchmarkdbuser",
+        "password": "benchmarkdbpass",
+        "minimumIdle": 10,
+        "maximumPoolSize": 30
     });
 });
 var store = exports.store = new Store(connectionPool);

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

@@ -19,10 +19,9 @@ app.get('/json', function() {
 app.get('/db/:queries?', function(request, queries) {
    queries = parseInt(queries, 10) || 1;
    var worlds = [];
-   var randId, world;
    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];
+      let randId = ((Math.random() * 10000) | 0) + 1;
+      let world = models.store.query('select * from World where id = :id', {id: randId})[0];
       worlds.push({"id": world.id, "randomNumber" : world.randomNumber});
    }
    if (queries == 1) {
@@ -53,20 +52,16 @@ app.get('/updates/:queries?', function(request, queries) {
       queries = 500;
    }
    var worlds = [];
-   var randId, world;
-   models.store.beginTransaction();
    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];
+      let randId = ((Math.random() * 10000) | 0) + 1;
+      let world = models.store.query('select * from World where id = :id', {id: randId})[0];
       world.randomNumber = ((Math.random() * 10000) | 0) + 1;
       try {
          world.save();
       } catch (e) {
-         models.store.abortTransaction();
          return response.error('SQL error');
       }
       worlds.push({"id": world.id, "randomNumber": world.randomNumber});
    }
-   models.store.commitTransaction();
    return response.json(worlds);
 });

frameworks/JavaScript/ringojs-convenient/setup.sh

@@ -5,12 +5,10 @@ sed -i 's|dbHost = \x27.*\x27;|dbHost = \x27'"${DBHOST}"'\x27|g' app/models.js
 fw_depends java ringojs
 
 rm -rf $RINGOJS_HOME/packages/*
-ringo-admin install oberhamsi/sql-ringojs-client
 ringo-admin install grob/ringo-sqlstore
 ringo-admin install ringo/stick
-ringo-admin install oberhamsi/reinhardt
+ringo-admin install orfon/reinhardt
 
-mkdir -p $RINGOJS_HOME/packages/ringo-sqlstore/jars/
-cp $RINGOJS_HOME/packages/sql-ringojs-client/jars/mysql.jar $RINGOJS_HOME/packages/ringo-sqlstore/jars/
+(cd $RINGOJS_HOME/packages/ringo-sqlstore/jars && curl -s -O https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar)
 
 ringo --production -J-server -J-Xmx1g -J-Xms1g ringo-main.js &