Skip to content

Commit

Permalink
[misc] simplify use of connection information.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rusher
rusher committed Sep 20, 2018
1 parent bc7174d commit 20ff129
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 37 deletions.
6 changes: 5 additions & 1 deletion lib/connection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,11 @@ function Connection(options) {
return info ? info.threadId : undefined;
}
});

Object.defineProperty(this, "info", {
get() {
return info;
}
});
}

util.inherits(Connection, EventEmitter);
Expand Down
8 changes: 4 additions & 4 deletions test/integration/test-change-user.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
})
Expand Down
4 changes: 2 additions & 2 deletions test/integration/test-connection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -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");
Expand Down
5 changes: 2 additions & 3 deletions test/integration/test-session-variables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"));
Expand Down
54 changes: 27 additions & 27 deletions test/integration/test-transaction.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
})
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
})
Expand Down Expand Up @@ -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);
});
Expand Down

0 comments on commit 20ff129

Please sign in to comment.