From 608b3a1b70ca7c160caf5d7408180bd077ecef80 Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Fri, 30 Oct 2020 15:07:06 -0700 Subject: [PATCH] mysql-client-tests: s/value/`value`/g --- mysql-client-tests/c/mysql-connector-c-test.c | 4 +- .../cpp/mysql-connector-cpp-test.cpp | 4 +- mysql-client-tests/dotnet/Program.cs | 80 +++++++++---------- .../go/go-sql-driver-mysql-test.go | 4 +- .../java/MySQLConnectorTest.java | 4 +- mysql-client-tests/node/index.js | 4 +- mysql-client-tests/perl/dbd-mysql-test.pl | 4 +- .../python/mysql.connector-test.py | 4 +- mysql-client-tests/python/pymysql-test.py | 4 +- mysql-client-tests/python/sqlalchemy-test.py | 4 +- mysql-client-tests/ruby/ruby-mysql-test.rb | 4 +- 11 files changed, 60 insertions(+), 60 deletions(-) diff --git a/mysql-client-tests/c/mysql-connector-c-test.c b/mysql-client-tests/c/mysql-connector-c-test.c index 7838087429..c6bb21b4ca 100644 --- a/mysql-client-tests/c/mysql-connector-c-test.c +++ b/mysql-client-tests/c/mysql-connector-c-test.c @@ -8,10 +8,10 @@ MYSQL *conn; char *queries[QUERIES_SIZE] = { - "create table test (pk int, value int, primary key(pk))", + "create table test (pk int, `value` int, primary key(pk))", "describe test", "select * from test", - "insert into test (pk, value) values (0,0)", + "insert into test (pk, `value`) values (0,0)", "select * from test" }; diff --git a/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp b/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp index b41f1967aa..3d61c1b3d0 100644 --- a/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp +++ b/mysql-client-tests/cpp/mysql-connector-cpp-test.cpp @@ -28,10 +28,10 @@ std::string queries[QUERIES_SIZE] = { - "create table test (pk int, value int, primary key(pk))", + "create table test (pk int, `value` int, primary key(pk))", "describe test", "select * from test", - "insert into test (pk, value) values (0,0)", + "insert into test (pk, `value`) values (0,0)", "select * from test" }; diff --git a/mysql-client-tests/dotnet/Program.cs b/mysql-client-tests/dotnet/Program.cs index 6f5521caf1..3e7f7c6831 100644 --- a/mysql-client-tests/dotnet/Program.cs +++ b/mysql-client-tests/dotnet/Program.cs @@ -4,28 +4,28 @@ using System.Data; using MySql.Data; using MySql.Data.MySqlClient; -class TestException : Exception -{ - public TestException(string message) - { - Console.WriteLine(message); - } +class TestException : Exception +{ + public TestException(string message) + { + Console.WriteLine(message); + } } public class DoltSQL { public static int Main(string[] args) { - if (args.Length != 3) - { - Console.WriteLine("Must supply $USER $PORT $REPO arguments."); - return 1; - } - - var user = args[0]; - var port = args[1]; - var db = args[2]; - + if (args.Length != 3) + { + Console.WriteLine("Must supply $USER $PORT $REPO arguments."); + return 1; + } + + var user = args[0]; + var port = args[1]; + var db = args[2]; + string connStr = $"server=127.0.0.1;user={user};database={db};port={port};CharSet=utf8;"; MySqlConnection conn = new MySqlConnection(connStr); @@ -44,38 +44,38 @@ public class DoltSQL return 0; } - public static void SetupTest(MySqlConnection conn) - { - using var cmd = new MySqlCommand(); - cmd.Connection = conn; - - cmd.CommandText = @"CREATE TABLE test (pk int, value int, primary key(pk))"; - cmd.ExecuteNonQuery(); - - cmd.CommandText = "INSERT INTO test(pk, value) VALUES(0,0)"; - cmd.ExecuteNonQuery(); + public static void SetupTest(MySqlConnection conn) + { + using var cmd = new MySqlCommand(); + cmd.Connection = conn; + + cmd.CommandText = @"CREATE TABLE test (pk int, `value` int, primary key(pk))"; + cmd.ExecuteNonQuery(); + + cmd.CommandText = "INSERT INTO test(pk, `value`) VALUES(0,0)"; + cmd.ExecuteNonQuery(); } - public static void QueryTest(MySqlConnection conn) - { - string sql = "SELECT count(*) as count FROM test"; - using (var cmd = new MySqlCommand(sql, conn)) + public static void QueryTest(MySqlConnection conn) + { + string sql = "SELECT count(*) as count FROM test"; + using (var cmd = new MySqlCommand(sql, conn)) try { - object result = cmd.ExecuteScalar(); - if (result != null) - { - int r = Convert.ToInt32(result); - if (r != 1) - { - TestException ex = new TestException($"Expected 1, Recieved {r}"); - throw ex; - } + object result = cmd.ExecuteScalar(); + if (result != null) + { + int r = Convert.ToInt32(result); + if (r != 1) + { + TestException ex = new TestException($"Expected 1, Recieved {r}"); + throw ex; + } } } catch (Exception ex) { Console.WriteLine(ex.ToString()); - } + } } } diff --git a/mysql-client-tests/go/go-sql-driver-mysql-test.go b/mysql-client-tests/go/go-sql-driver-mysql-test.go index 9a85e8be40..54558eee67 100644 --- a/mysql-client-tests/go/go-sql-driver-mysql-test.go +++ b/mysql-client-tests/go/go-sql-driver-mysql-test.go @@ -7,10 +7,10 @@ import "database/sql" import _ "github.com/go-sql-driver/mysql" var queries [5]string = [5]string{ - "create table test (pk int, value int, primary key(pk))", + "create table test (pk int, `value` int, primary key(pk))", "describe test", "select * from test", - "insert into test (pk, value) values (0,0)", + "insert into test (pk, `value`) values (0,0)", "select * from test"} func main() { diff --git a/mysql-client-tests/java/MySQLConnectorTest.java b/mysql-client-tests/java/MySQLConnectorTest.java index e727b6c8cd..3c659dd130 100644 --- a/mysql-client-tests/java/MySQLConnectorTest.java +++ b/mysql-client-tests/java/MySQLConnectorTest.java @@ -22,10 +22,10 @@ public class MySQLConnectorTest { Statement st = conn.createStatement(); String[] queries = { - "create table test (pk int, value int, primary key(pk))", + "create table test (pk int, `value` int, primary key(pk))", "describe test", "select * from test", - "insert into test (pk, value) values (0,0)", + "insert into test (pk, `value`) values (0,0)", "select * from test" }; diff --git a/mysql-client-tests/node/index.js b/mysql-client-tests/node/index.js index 030a5cbc53..164807ea94 100644 --- a/mysql-client-tests/node/index.js +++ b/mysql-client-tests/node/index.js @@ -41,10 +41,10 @@ class Database { async function main() { const queries = [ - "create table test (pk int, value int, primary key(pk))", + "create table test (pk int, `value` int, primary key(pk))", "describe test", "select * from test", - "insert into test (pk, value) values (0,0)", + "insert into test (pk, `value`) values (0,0)", "select * from test" ]; diff --git a/mysql-client-tests/perl/dbd-mysql-test.pl b/mysql-client-tests/perl/dbd-mysql-test.pl index 93ef8fd0a5..f4e6aba589 100644 --- a/mysql-client-tests/perl/dbd-mysql-test.pl +++ b/mysql-client-tests/perl/dbd-mysql-test.pl @@ -3,9 +3,9 @@ use strict; use DBI; my $QUERY_RESPONSE = [ - { "create table test (pk int, value int, primary key(pk))" => '0E0' }, + { "create table test (pk int, `value` int, primary key(pk))" => '0E0' }, { "describe test" => 2 }, - { "insert into test (pk, value) values (0,0)" => 1 }, + { "insert into test (pk, `value`) values (0,0)" => 1 }, { "select * from test" => 1 } ]; diff --git a/mysql-client-tests/python/mysql.connector-test.py b/mysql-client-tests/python/mysql.connector-test.py index 42ecdda309..0517d95e4b 100644 --- a/mysql-client-tests/python/mysql.connector-test.py +++ b/mysql-client-tests/python/mysql.connector-test.py @@ -2,12 +2,12 @@ import mysql.connector import sys QUERY_RESPONSE = [ - { "create table test (pk int, value int, primary key(pk))": [] }, + { "create table test (pk int, `value` int, primary key(pk))": [] }, { "describe test": [ ('pk', 'int', 'NO', 'PRI', '', ''), ('value', 'int', 'YES', '', '', '') ] }, - { "insert into test (pk, value) values (0,0)": [] }, + { "insert into test (pk, `value`) values (0,0)": [] }, { "select * from test": [(0,0)] } ] diff --git a/mysql-client-tests/python/pymysql-test.py b/mysql-client-tests/python/pymysql-test.py index be08dbb250..9334566d2f 100644 --- a/mysql-client-tests/python/pymysql-test.py +++ b/mysql-client-tests/python/pymysql-test.py @@ -2,12 +2,12 @@ import pymysql import sys QUERY_RESPONSE = [ - { "create table test (pk int, value int, primary key(pk))": () }, + { "create table test (pk int, `value` int, primary key(pk))": () }, { "describe test": ( ('pk', 'int', 'NO', 'PRI', '', ''), ('value', 'int', 'YES', '', '', '') ) }, - { "insert into test (pk, value) values (0,0)": () }, + { "insert into test (pk, `value`) values (0,0)": () }, { "select * from test": ((0,0),) } ] diff --git a/mysql-client-tests/python/sqlalchemy-test.py b/mysql-client-tests/python/sqlalchemy-test.py index 10b005cd73..6fcee84347 100644 --- a/mysql-client-tests/python/sqlalchemy-test.py +++ b/mysql-client-tests/python/sqlalchemy-test.py @@ -6,12 +6,12 @@ from sqlalchemy import create_engine import sys QUERY_RESPONSE = [ - { "create table test (pk int, value int, primary key(pk))": [] }, + { "create table test (pk int, `value` int, primary key(pk))": [] }, { "describe test": [ ('pk', 'int', 'NO', 'PRI', '', ''), ('value', 'int', 'YES', '', '', '') ] }, - { "insert into test (pk, value) values (0,0)": () }, + { "insert into test (pk, `value`) values (0,0)": () }, { "select * from test": [(0,0)] } ] diff --git a/mysql-client-tests/ruby/ruby-mysql-test.rb b/mysql-client-tests/ruby/ruby-mysql-test.rb index 62ccf9507c..e990a6e5d0 100644 --- a/mysql-client-tests/ruby/ruby-mysql-test.rb +++ b/mysql-client-tests/ruby/ruby-mysql-test.rb @@ -7,10 +7,10 @@ port = ARGV[1] db = ARGV[2] queries = [ - "create table test (pk int, value int, primary key(pk))", + "create table test (pk int, `value` int, primary key(pk))", "describe test", "select * from test", - "insert into test (pk, value) values (0,0)", + "insert into test (pk, `value`) values (0,0)", "select * from test" ]