mysql2 - npm Package Compare versions

Comparing version 0.8.9 to 0.8.10

examples/execute.js

		var mysql = require('../test/common').createConnection();
		mysql.execute("select ?+1 as qqq, ? as rrr, ? as yyy", [-4, null, 3], function(err, rows, fields) {
		mysql.execute("select ?+1 as qqq, ? as rrr, ? as yyy", [1, null, 3], function(err, rows, fields) {
		//mysql.execute("select ?+?+? as qqq, ? as rrr", [1, 2, 5, "test"], function(err, rows, fields) {
		console.log(err, rows, fields);
		});

examples/mysqlproxy.js

		var mysql = require('../index.js');

		var server = mysql.createServer();
		server.listen(3333);
		server.listen(3307);
		server.on('connection', function(conn) {
		console.log('connection');

		@@ -17,12 +18,29 @@ conn.serverHandshake({
		conn.on('field_list', function(table, fields) {
		console.log('FIELD LIST:', table, fields);
		console.log('field list:', table, fields);
		conn.writeEof();
		});

		var remote = mysql.createConnection({user: 'root', database: 'dbname', host:'server.example.com', password: 'secret'});

		conn.on('query', function(sql) {
		var cli = mysql.createConnection({user: 'root', database: 'test'});
		cli.query(sql, function(err, rows, columns) {
		conn.writeTextResult(rows, columns);
		console.log('proxying query:' + sql);
		remote.query(sql, function(err) { // overloaded args, either (err, result :object)
		// or (err, rows :array, columns :array)
		if (Array.isArray(arguments[1])) {
		// response to a 'select', 'show' or similar
		var rows = arguments[1], columns = arguments[2];
		console.log('rows', rows);
		console.log('columns', columns);
		conn.writeTextResult(rows, columns);
		} else {
		// response to an 'insert', 'update' or 'delete'
		var result = arguments[1];
		console.log('result', result);
		conn.writeOk(result);
		}
		});
		});

		conn.on('end', remote.end.bind(remote));
		});

examples/simple-select.js

		var mysql = require('../test/common').createConnection();

		mysql.query("iuyiuy select 1+1 as qqq, 'rrr' as r", function(err, rows, fields) {
		console.log(err, rows, fields);
		mysql.query("select * from foos limit 10", function(err, rows, fields) {
		console.log(rows, fields);
		});

lib/commands/client_handshake.js

		@@ -21,3 +21,3 @@ var Command = require('./command');
		// and { ..., ssl: true } for ghandshakeReply packet
		var sslRequest = new Packets.ClientHandshakeResponse({ ssl: true });
		var sslRequest = new Packets.HandshakeResponse({ ssl: true });
		connection.writePacket(sslRequest.toPacket(1));
		@@ -24,0 +24,0 @@ };

lib/connection.js

		@@ -121,4 +121,4 @@ var net = require('net');
		cert: this.config.ssl.cert,
		passphrase: this.opts.ssl.passphrase
		// TODO ca-certs list
		passphrase: this.config.ssl.passphrase,
		ca: this.config.ssl.ca
		});
		@@ -125,0 +125,0 @@ var securePair = tls.createSecurePair(credentials, false);

lib/packets/packet.js

		@@ -286,3 +286,2 @@ //var BigNumber = require("bignumber.js");
		err.code = ErrorCodeToName[errorCode];
		debugger;
		return err;
		@@ -289,0 +288,0 @@ };

lib/packets/text_row.js

		@@ -22,7 +22,2 @@ var Packet = require('../packets/packet');
		column.forEach(function(val) {
		if (val === null)
		{
		length += 1;
		return;
		}
		var str = val.toString(10);
		@@ -36,6 +31,3 @@ length += Packet.lengthCodedNumberLength(str);
		column.forEach(function(val) {
		if (val === null)
		packet.writeInt8(0xfb);
		else
		packet.writeLengthCodedString(val.toString(10));
		packet.writeLengthCodedString(val.toString(10));
		});
		@@ -42,0 +34,0 @@ return packet;

package.json

		{
		"name": "mysql2",
		"version": "0.8.9",
		"version": "0.8.10",
		"description": "fast mysql driver. Implements core protocol, prepared statements, ssl and compression in native JS",
		@@ -5,0 +5,0 @@ "main": "index.js",

README.md

		@@ -86,2 +86,4 @@ #node-mysql2
		server.on('connection', function(conn) {
		console.log('connection');

		conn.serverHandshake({
		@@ -95,10 +97,29 @@ protocolVersion: 10,
		});

		var remote = mysql.createConnection({user: 'root', database: 'test'});

		conn.on('field_list', function(table, fields) {
		console.log('field list:', table, fields);
		conn.writeEof();
		});

		var remote = mysql.createConnection({user: 'root', database: 'dbname', host:'server.example.com', password: 'secret'});

		conn.on('query', function(sql) {
		console.log('proxying query:' + sql);
		remote.query(sql, function(err, rows, columns) {
		conn.writeTextResult(rows, columns);
		remote.query(sql, function(err) { // overloaded args, either (err, result :object)
		// or (err, rows :array, columns :array)
		if (Array.isArray(arguments[1])) {
		// response to a 'select', 'show' or similar
		var rows = arguments[1], columns = arguments[2];
		console.log('rows', rows);
		console.log('columns', columns);
		conn.writeTextResult(rows, columns);
		} else {
		// response to an 'insert', 'update' or 'delete'
		var result = arguments[1];
		console.log('result', result);
		conn.writeOk(result);
		}
		});
		});

		conn.on('end', remote.end.bind(remote));
		@@ -105,0 +126,0 @@ });

test/common.js

		@@ -47,3 +47,3 @@ module.exports.createConnection = function(callback) {
		user: process.env.MYSQL_USER \|\| 'root',
		password: process.env.CI ? null : '',
		password: process.env.CI ? null : 'test',
		database: 'test',
		@@ -50,0 +50,0 @@ port: process.env.MYSQL_PORT \|\| 3306

examples/signed.js

test.js

New alerts