diff --git a/lib/connection.js b/lib/connection.js index 7cbe2831..bcd0fc4c 100644 --- a/lib/connection.js +++ b/lib/connection.js @@ -975,7 +975,11 @@ function Connection(options) { return info ? info.threadId : undefined; } }); - + Object.defineProperty(this, "info", { + get() { + return info; + } + }); } util.inherits(Connection, EventEmitter); diff --git a/test/integration/test-change-user.js b/test/integration/test-change-user.js index 391666c9..92565739 100644 --- a/test/integration/test-change-user.js +++ b/test/integration/test-change-user.js @@ -169,19 +169,19 @@ describe("change user", () => { base .createConnection() .then(conn => { - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 2); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 2); conn .query("SET autocommit=1") .then(() => { - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 2); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 2); return conn.query("SET autocommit=0"); }) .then(() => { - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 0); return conn.changeUser({ user: "ChangeUser", password: "mypassword" }); }) .then(() => { - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 2); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 2); conn.end(); done(); }) diff --git a/test/integration/test-connection.js b/test/integration/test-connection.js index 9dd0f527..7d829329 100644 --- a/test/integration/test-connection.js +++ b/test/integration/test-connection.js @@ -587,7 +587,7 @@ describe("connection", () => { it("changing database", function(done) { let currDb = Conf.baseConfig.database; - assert.equal(currDb, shareConn.getInfo().database); + assert.equal(currDb, shareConn.info.database); shareConn .query("CREATE DATABASE changedb") .then(() => { @@ -599,7 +599,7 @@ describe("connection", () => { (!shareConn.isMariaDB() && shareConn.hasMinVersion(5, 7)) ) { //ok packet contain meta change - assert.equal(shareConn.getInfo().database, "changedb"); + assert.equal(shareConn.info.database, "changedb"); } shareConn.query("use " + currDb); shareConn.query("DROP DATABASE changedb"); diff --git a/test/integration/test-session-variables.js b/test/integration/test-session-variables.js index e752816b..eded1124 100644 --- a/test/integration/test-session-variables.js +++ b/test/integration/test-session-variables.js @@ -39,8 +39,7 @@ describe("session variables", () => { it("with multiple session variables", function(done) { base .createConnection({ - sessionVariables: { wait_timeout: 10000, interactive_timeout: 2540 }, - debug: true + sessionVariables: { wait_timeout: 10000, interactive_timeout: 2540 } }) .then(conn => { conn @@ -57,7 +56,7 @@ describe("session variables", () => { it("error handling", function(done) { base - .createConnection({ sessionVariables: { wait_timeout: "String value" }, debug: true }) + .createConnection({ sessionVariables: { wait_timeout: "String value" } }) .then(conn => { conn.on("error", err => { assert(err.message.includes("Error setting session variable")); diff --git a/test/integration/test-transaction.js b/test/integration/test-transaction.js index ab6d896d..abdfac22 100644 --- a/test/integration/test-transaction.js +++ b/test/integration/test-transaction.js @@ -21,24 +21,24 @@ describe("transaction", () => { return shareConn.query("SET autocommit=0"); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 0); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(shareConn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 0); return shareConn.beginTransaction(); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 1); return shareConn.query("INSERT INTO testTransaction values ('test')"); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 1); return shareConn.rollback(); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 0); return shareConn.query("SELECT count(*) as nb FROM testTransaction"); }) .then(rows => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 1); assert.equal(rows[0].nb, 0); done(); }) @@ -55,19 +55,19 @@ describe("transaction", () => { if (err) return done(err); conn.query("SET autocommit=0", err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 0); conn.beginTransaction(err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); conn.query("INSERT INTO testTransaction2 values ('test')"); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); conn.rollback(err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 0); conn.query("SELECT count(*) as nb FROM testTransaction2", (err, rows) => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); assert.equal(rows[0].nb, 0); conn.end(); done(); @@ -89,14 +89,14 @@ describe("transaction", () => { conn.rollback(); conn.query("SET autocommit=0", err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 0); conn.beginTransaction(); conn.query("INSERT INTO testTransaction2 values ('test')"); conn.rollback(); conn.query("SELECT count(*) as nb FROM testTransaction2", (err, rows) => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); assert.equal(rows[0].nb, 0); conn.end(); done(); @@ -113,25 +113,25 @@ describe("transaction", () => { return shareConn.query("SET autocommit=0"); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 0); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(shareConn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 0); return shareConn.beginTransaction(); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 1); return shareConn.query("INSERT INTO testTransaction values ('test')"); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 1); return shareConn.commit(); }) .then(() => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 0); return shareConn.query("SELECT count(*) as nb FROM testTransaction"); }) .then(rows => { - assert.equal(shareConn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(shareConn.info.status & ServerStatus.STATUS_IN_TRANS, 1); assert.equal(rows[0].nb, 1); done(); }) @@ -231,20 +231,20 @@ describe("transaction", () => { if (err) return done(err); conn.query("SET autocommit=0", err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_AUTOCOMMIT, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 0); conn.beginTransaction(err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); conn.query("INSERT INTO testTransaction values ('test')", err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); conn.commit(err => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 0); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 0); conn.query("SELECT count(*) as nb FROM testTransaction", (err, rows) => { if (err) return done(err); - assert.equal(conn.getInfo().status & ServerStatus.STATUS_IN_TRANS, 1); + assert.equal(conn.info.status & ServerStatus.STATUS_IN_TRANS, 1); assert.equal(rows[0].nb, 1); conn.end(done); });