Merge pull request #408 from cloudspokes/SUP-214-api-stability

API stability fixes per SUP-214

Author: thabofletcher

initializers/dataAccess.js

@@ -270,7 +270,7 @@ exports.dataAccess = function (api, next) {
                                 api.log('Finish executing ' + f, 'debug');
                             }
                         }).execute();
-                    }
+                    } else cb("Connection closed unexpectedly");
                 }
             ], function (err, result) {
                 if (err) {
@@ -340,7 +340,7 @@ exports.dataAccess = function (api, next) {
                                 api.log('Finish executing ' + f, 'debug');
                             }
                         }).execute();
-                    }
+                    } else cb("Connection closed unexpectedly");
                 }
             ], function (err, result) {
                 if (err) {

initializers/transaction.js

@@ -30,15 +30,10 @@ var handleConnectionFailure = function (api, connection, actionTemplate, error,
         };
 
         // if the action is transactional, end the transaction
-        if (actionTemplate.transaction === "write") {
-            if (connection.dbConnectionMap[databaseName].isConnected()) {
-                connection.dbConnectionMap[databaseName].endTransaction(error, callback);
-            }
+        if (actionTemplate.transaction === "write" && connection.dbConnectionMap[databaseName].isConnected()) {
+            connection.dbConnectionMap[databaseName].endTransaction(error, callback);
         } else {
             callback(error);
-            // connection.dbConnectionMap[databaseName].disconnect();
-            // connection.error = error;
-            // next(connection, false);
         }
     });
 };
@@ -102,7 +97,6 @@ exports.transaction = function (api, next) {
                             // Begin transaction
                             dbConnectionMap[databaseName].beginTransaction(callback);
                         } else {
-                            // next(connection, true);
                             callback();
                         }
                     }
@@ -148,11 +142,9 @@ exports.transaction = function (api, next) {
                 };
 
                 // if the action is transactional, end the transaction
-                if (actionTemplate.transaction === "write") {
+                if (actionTemplate.transaction === "write" && connection.dbConnectionMap[databaseName].isConnected()) {
                     connection.dbConnectionMap[databaseName].endTransaction(connection.response.error, callback);
                 } else {
-                    // connection.dbConnectionMap[databaseName].disconnect();
-                    // next(connection);
                     callback();
                 }
             });

queries/get_rounds_for_problem

@@ -2,8 +2,7 @@ SELECT
  r.round_id,
  r.name AS round_name,
  r.contest_id,
- (SELECT name FROM contest c WHERE c.contest_id = r.contest_id) AS contest_name,
- r.editorial_link
+ (SELECT name FROM contest c WHERE c.contest_id = r.contest_id) AS contest_name
 FROM
    problem p
 INNER JOIN component c ON c.problem_id = p.problem_id