Browse Source

Load all dbs in the setup (#2484)

Nate 8 years ago
parent
commit
455fff6a46

+ 5 - 5
frameworks/JavaScript/nodejs/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "nodejs",
   "framework": "nodejs",
   "tests": [{
   "tests": [{
     "default": {
     "default": {
-      "setup_file": "setup-mysql",
+      "setup_file": "setup",
       "json_url": "/json",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "plaintext_url": "/plaintext",
       "db_url": "/mysql/db",
       "db_url": "/mysql/db",
@@ -26,7 +26,7 @@
       "versus": "nodejs"
       "versus": "nodejs"
     },
     },
     "mongodb": {
     "mongodb": {
-      "setup_file": "setup-mongodb",
+      "setup_file": "setup",
       "db_url": "/mongoose/db",
       "db_url": "/mongoose/db",
       "query_url": "/mongoose/queries?queries=",
       "query_url": "/mongoose/queries?queries=",
       "update_url": "/mongoose/updates?queries=",
       "update_url": "/mongoose/updates?queries=",
@@ -47,7 +47,7 @@
       "versus": "nodejs"
       "versus": "nodejs"
     },
     },
     "mongodb-raw": {
     "mongodb-raw": {
-      "setup_file": "setup-mongodb",
+      "setup_file": "setup",
       "db_url": "/mongodb/db",
       "db_url": "/mongodb/db",
       "query_url": "/mongodb/queries?queries=",
       "query_url": "/mongodb/queries?queries=",
       "update_url": "/mongodb/updates?queries=",
       "update_url": "/mongodb/updates?queries=",
@@ -69,7 +69,7 @@
       "versus": "nodejs"
       "versus": "nodejs"
     },
     },
     "mysql": {
     "mysql": {
-      "setup_file": "setup-mysql",
+      "setup_file": "setup",
       "db_url": "/sequelize/db",
       "db_url": "/sequelize/db",
       "query_url": "/sequelize/queries?queries=",
       "query_url": "/sequelize/queries?queries=",
       "update_url": "/sequelize/updates?queries=",
       "update_url": "/sequelize/updates?queries=",
@@ -91,7 +91,7 @@
       "versus": "nodejs"
       "versus": "nodejs"
     },
     },
     "postgres": {
     "postgres": {
-      "setup_file": "setup-postgresql",
+      "setup_file": "setup",
       "db_url": "/sequelize-pg/db",
       "db_url": "/sequelize-pg/db",
       "query_url": "/sequelize-pg/queries?queries=",
       "query_url": "/sequelize-pg/queries?queries=",
       "update_url": "/sequelize-pg/updates?queries=",
       "update_url": "/sequelize-pg/updates?queries=",

+ 0 - 5
frameworks/JavaScript/nodejs/setup-mongodb.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mongodb
-
-source ./setup.sh

+ 0 - 5
frameworks/JavaScript/nodejs/setup-mysql.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql
-
-source ./setup.sh

+ 0 - 5
frameworks/JavaScript/nodejs/setup-postgresql.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql
-
-source ./setup.sh

+ 1 - 1
frameworks/JavaScript/nodejs/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-fw_depends mongodb nodejs
+fw_depends mongodb mysql postgresql nodejs
 
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mongodb-raw.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mongodb-raw.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mongoose.js
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' handlers/mongoose.js