php/archived-pecl-database-mysql-xdevapi
1
0
Fork 0
mirror of https://github.com/php/pecl-database-mysql_xdevapi.git synced 2026-03-23 23:02:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

orabug #28802524 always use sql()->execute() instead of executesql()

Browse Source 
- remove executeSql()
- modify tests
This commit is contained in:
Darek Slusarczyk
2018-10-17 16:39:16 +02:00
parent 06fe837c65
commit db9ad31e91
24 changed files with 112 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docbook/mysql_xdevapi/rowresult/getwarnings.xml
View File

@@ -40,8 +40,8 @@
<?php
$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
$session->executeSql("CREATE DATABASE foo");
$session->executeSql("CREATE TABLE foo.test_table(x int)");
$session->sql("CREATE DATABASE foo")->execute();
$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
$schema = $session->getSchema("foo");
$table = $schema->getTable("test_table");

4
examples.php
View File

@@ -217,8 +217,8 @@ Array
*/
$session = mysql_xdevapi\getSession("localhost", "root", "");
$session->executeSql("create table products.new_products_table(name text,price float,description text)");
$session->executeSql("create table products.new_cheap_products_table(name text,price float,description text)");
$session->sql("create table products.new_products_table(name text,price float,description text)")->execute();
$session->sql("create table products.new_cheap_products_table(name text,price float,description text)")->execute();
/*
Is possible to extract an array containing all the tables

39
mysqlx_session.cc
View File

@@ -62,11 +62,6 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqlx_session__generate_uuid, 0, ZEND_RETURN_VALUE, 0)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqlx_session_execute_sql, 0, ZEND_RETURN_VALUE, 1)
ZEND_ARG_TYPE_INFO(no_pass_by_ref, query, IS_STRING, dont_allow_null)
ZEND_ARG_VARIADIC_INFO(no_pass_by_ref, args)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqlx_session__sql, 0, ZEND_RETURN_VALUE, 1)
ZEND_ARG_TYPE_INFO(no_pass_by_ref, query, IS_STRING, dont_allow_null)
ZEND_END_ARG_INFO()
@@ -481,39 +476,6 @@ mysqlx_execute_session_query(XMYSQLND_SESSION session,
/* }}} */
/* {{{ proto mixed mysqlx_session::executeSql(string query [[, mixed param]]) */
MYSQL_XDEVAPI_PHP_METHOD(mysqlx_session, executeSql)
{
DBG_ENTER("mysqlx_session::executeSql");
zval* object_zv{nullptr};
MYSQLND_CSTRING query{nullptr, 0};
zval* args{nullptr};
int argc{0};
if (util::zend::parse_method_parameters(execute_data, getThis(), "Os*", &object_zv, mysqlx_session_class_entry,
&(query.s), &(query.l),
&args, &argc) == FAILURE)
{
DBG_VOID_RETURN;
}
RETVAL_FALSE;
if (!query.l) {
php_error_docref(nullptr, E_WARNING, "Empty query");
DBG_VOID_RETURN;
}
auto& data_object{ fetch_session_data(object_zv) };
if (data_object.session) {
mysqlx_execute_session_query(data_object.session, namespace_sql, query, MYSQLX_EXECUTE_FLAG_BUFFERED, return_value, argc, args);
}
DBG_VOID_RETURN;
}
/* }}} */
/* {{{ proto mixed mysqlx_session::sql(string query) */
MYSQL_XDEVAPI_PHP_METHOD(mysqlx_session, sql)
{
@@ -914,7 +876,6 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_session, __construct)
/* {{{ mysqlx_session_methods[] */
static const zend_function_entry mysqlx_session_methods[] = {
PHP_ME(mysqlx_session, __construct, nullptr, ZEND_ACC_PRIVATE)
PHP_ME(mysqlx_session, executeSql, arginfo_mysqlx_session_execute_sql, ZEND_ACC_PUBLIC)
PHP_ME(mysqlx_session, sql, arginfo_mysqlx_session__sql, ZEND_ACC_PUBLIC)
PHP_ME(mysqlx_session, quoteName, arginfo_mysqlx_session__quote_name, ZEND_ACC_PUBLIC)
PHP_ME(mysqlx_session, getServerVersion, arginfo_mysqlx_session__get_server_version, ZEND_ACC_PUBLIC)

4
tests/auth/auth_utils.inc
View File

@@ -14,7 +14,7 @@ function drop_test_user($user) {
global $host;
$session = create_test_session();
$query = "DROP USER IF EXISTS '$user'@'$host'";
$session->executeSql($query);
$session->sql($query)->execute();
}
function create_test_user($user, $auth_plugin) {
@@ -22,7 +22,7 @@ function create_test_user($user, $auth_plugin) {
$session = create_test_session();
$password = get_test_user_passwd($user);
$query = "CREATE USER '$user'@'$host' IDENTIFIED WITH '$auth_plugin' BY '$password'";
$session->executeSql($query);
$session->sql($query)->execute();
}
function reset_test_user($user, $auth_plugin) {

16
tests/basic_execute_sql.phpt
View File

@@ -1,5 +1,5 @@
--TEST--
mysqlx basic executeSql
mysqlx basic execute SQL
--SKIPIF--
--FILE--
<?php
@@ -8,11 +8,11 @@ mysqlx basic executeSql
$session = create_test_db();
$schema = $session->getSchema($db);
$session->executeSql("drop table if exists $db.test_table");
$session->sql("drop table if exists $db.test_table")->execute();
$session->executeSql("create table if not exists $db.test_table (name text, age int , job text)");
$session->sql("create table if not exists $db.test_table (name text, age int , job text)")->execute();
try {
$session->executeSql("create table $db.test_table (name text, age int, job text)");
$session->sql("create table $db.test_table (name text, age int, job text)")->execute();
} catch(Exception $e) {
expect_eq($e->getMessage(),
'[HY000] Couldn\'t fetch data');
@@ -20,9 +20,9 @@ mysqlx basic executeSql
print "Exception!".PHP_EOL;
}
$session->executeSql("insert into $db.test_table values ('Marco', 25, 'Programmer')");
$session->executeSql("insert into $db.test_table values ('Luca', 39, 'Student')");
$sql = $session->executeSql("insert into $db.test_table values ('Antonio', 66, 'Dentist'),('Marcello',19,'Studente')");
$session->sql("insert into $db.test_table values ('Marco', 25, 'Programmer')")->execute();
$session->sql("insert into $db.test_table values ('Luca', 39, 'Student')")->execute();
$sql = $session->sql("insert into $db.test_table values ('Antonio', 66, 'Dentist'),('Marcello',19,'Studente')")->execute();
expect_eq($sql->getAffectedItemsCount(), 2);
expect_eq($sql->hasData(), false);
@@ -34,7 +34,7 @@ mysqlx basic executeSql
expect_eq($sql->getWarningsCount(), 0);
expect_eq($sql->getWarnings(), false);
$sql = $session->executeSql("select * from $db.test_table");
$sql = $session->sql("select * from $db.test_table")->execute();
expect_eq($sql->getAffectedItemsCount(), 0);
expect_eq($sql->hasData(), true);

6
tests/collection_find_no_only_full_group_by.phpt
View File

@@ -11,12 +11,12 @@ mysqlx Collection find, no 'only full group by'
$coll = $schema->getCollection("test_collection");
fill_db_collection($coll);
$res = $session->executeSql('SELECT @@SESSION.sql_mode');
$res = $session->sql('SELECT @@SESSION.sql_mode')->execute();
$saved_sql_modes = $res->fetchAll()[0]['@@SESSION.sql_mode'];
//This will disable 'only full group by'
$new_sql_modes = 'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION';
$session->executeSql('SET SESSION sql_mode = \''.$new_sql_modes.'\'');
$session->sql('SET SESSION sql_mode = \''.$new_sql_modes.'\'')->execute();
try {
//This is going to work now but the representant of each group is indeterminate (probably the first available entry)
@@ -34,7 +34,7 @@ mysqlx Collection find, no 'only full group by'
test_step_failed();
}
$session->executeSql('SET SESSION sql_mode = \''.$saved_sql_modes.'\'');
$session->sql('SET SESSION sql_mode = \''.$saved_sql_modes.'\'')->execute();
//This shall fail now
try {
$res = $coll->find()->fields(['name as n','age as a','job as j'])->groupBy('j')->execute();

72
tests/connect.inc
View File

@@ -106,7 +106,7 @@
global $test_collection_name;
/*
Would make sense to clean the database here, before attempting
to create it. BUT, the code raise a warning during executeSql
to create it. BUT, the code raise a warning during execute SQL
if the script attempt to remove a DB which is not existing,
(error 1008) which in turns cause the test to fail.
@@ -114,9 +114,9 @@
the test script to call clean_test_db *after* the test
*/
if ($session == null) $session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->sql("create database $db")->execute();
$schema = $session->getSchema($db);
$session->executeSql("create table $db.$test_table_name(name varchar(1024), age int)");
$session->sql("create table $db.$test_table_name(name varchar(1024), age int)")->execute();
$schema->createCollection($test_collection_name);
return $session;
}
@@ -131,7 +131,7 @@
global $db;
if ($db_name == null) $db_name = $db;
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("drop database if exists $db_name");
$session->sql("drop database if exists $db_name")->execute();
}
}
@@ -144,18 +144,18 @@
global $db;
global $test_table_name;
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("insert into $db.$test_table_name values ('Mamie', 11)");
$session->executeSql("insert into $db.$test_table_name values ('Eulalia', 11)");
$session->executeSql("insert into $db.$test_table_name values ('Polly', 12)");
$session->executeSql("insert into $db.$test_table_name values ('Rufus', 12)");
$session->executeSql("insert into $db.$test_table_name values ('Cassidy', 13)");
$session->executeSql("insert into $db.$test_table_name values ('Olympia', 14)");
$session->executeSql("insert into $db.$test_table_name values ('Lev', 14)");
$session->executeSql("insert into $db.$test_table_name values ('Tierney', 15)");
$session->executeSql("insert into $db.$test_table_name values ('Octavia', 15)");
$session->executeSql("insert into $db.$test_table_name values ('Vesper', 16)");
$session->executeSql("insert into $db.$test_table_name values ('Caspian', 17)");
$session->executeSql("insert into $db.$test_table_name values ('Romy', 17)");
$session->sql("insert into $db.$test_table_name values ('Mamie', 11)")->execute();
$session->sql("insert into $db.$test_table_name values ('Eulalia', 11)")->execute();
$session->sql("insert into $db.$test_table_name values ('Polly', 12)")->execute();
$session->sql("insert into $db.$test_table_name values ('Rufus', 12)")->execute();
$session->sql("insert into $db.$test_table_name values ('Cassidy', 13)")->execute();
$session->sql("insert into $db.$test_table_name values ('Olympia', 14)")->execute();
$session->sql("insert into $db.$test_table_name values ('Lev', 14)")->execute();
$session->sql("insert into $db.$test_table_name values ('Tierney', 15)")->execute();
$session->sql("insert into $db.$test_table_name values ('Octavia', 15)")->execute();
$session->sql("insert into $db.$test_table_name values ('Vesper', 16)")->execute();
$session->sql("insert into $db.$test_table_name values ('Caspian', 17)")->execute();
$session->sql("insert into $db.$test_table_name values ('Romy', 17)")->execute();
}
}
@@ -168,22 +168,22 @@
global $db;
global $test_table_name;
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("insert into $db.$test_table_name values ('Mamie', 29)");
$session->executeSql("insert into $db.$test_table_name values ('Mamie', 21)");
$session->executeSql("insert into $db.$test_table_name values ('Polly', 34)");
$session->executeSql("insert into $db.$test_table_name values ('Polly', 27)");
$session->executeSql("insert into $db.$test_table_name values ('Cassidy', 33)");
$session->executeSql("insert into $db.$test_table_name values ('Cassidy', 34)");
$session->executeSql("insert into $db.$test_table_name values ('Cassidy', 20)");
$session->executeSql("insert into $db.$test_table_name values ('Tierney', 46)");
$session->executeSql("insert into $db.$test_table_name values ('Tierney', 34)");
$session->executeSql("insert into $db.$test_table_name values ('Tierney', 25)");
$session->executeSql("insert into $db.$test_table_name values ('Tierney', 39)");
$session->executeSql("insert into $db.$test_table_name values ('ARomy', 17)");
$session->executeSql("insert into $db.$test_table_name values ('BRomy', 17)");
$session->executeSql("insert into $db.$test_table_name values ('CRomy', 17)");
$session->executeSql("insert into $db.$test_table_name values ('DRomy', 17)");
$session->executeSql("insert into $db.$test_table_name values ('ERomy', 17)");
$session->sql("insert into $db.$test_table_name values ('Mamie', 29)")->execute();
$session->sql("insert into $db.$test_table_name values ('Mamie', 21)")->execute();
$session->sql("insert into $db.$test_table_name values ('Polly', 34)")->execute();
$session->sql("insert into $db.$test_table_name values ('Polly', 27)")->execute();
$session->sql("insert into $db.$test_table_name values ('Cassidy', 33)")->execute();
$session->sql("insert into $db.$test_table_name values ('Cassidy', 34)")->execute();
$session->sql("insert into $db.$test_table_name values ('Cassidy', 20)")->execute();
$session->sql("insert into $db.$test_table_name values ('Tierney', 46)")->execute();
$session->sql("insert into $db.$test_table_name values ('Tierney', 34)")->execute();
$session->sql("insert into $db.$test_table_name values ('Tierney', 25)")->execute();
$session->sql("insert into $db.$test_table_name values ('Tierney', 39)")->execute();
$session->sql("insert into $db.$test_table_name values ('ARomy', 17)")->execute();
$session->sql("insert into $db.$test_table_name values ('BRomy', 17)")->execute();
$session->sql("insert into $db.$test_table_name values ('CRomy', 17)")->execute();
$session->sql("insert into $db.$test_table_name values ('DRomy', 17)")->execute();
$session->sql("insert into $db.$test_table_name values ('ERomy', 17)")->execute();
}
}
@@ -255,9 +255,9 @@
global $db;
global $test_table_name;
global $test_view_name;
$session->executeSql(
$session->sql(
"CREATE VIEW $db.$test_view_name ".
"AS SELECT name, age FROM $db.$test_table_name");
"AS SELECT name, age FROM $db.$test_table_name")->execute();
$schema = $session->getSchema($db);
$view = $schema->getTable($test_view_name);
return $view;
@@ -267,7 +267,7 @@
if (!function_exists('get_mysql_variable')) {
function get_mysql_variable($session, $varname) {
$res = $session->executeSql("SHOW VARIABLES LIKE '$varname'");
$res = $session->sql("SHOW VARIABLES LIKE '$varname'")->execute();
$vardata = $res->fetchOne();
return $vardata["Value"];
}
@@ -275,7 +275,7 @@
if (!function_exists('get_mysql_variables')) {
function get_mysql_variables($session, $pattern) {
$res = $session->executeSql("SHOW VARIABLES LIKE '$pattern'");
$res = $session->sql("SHOW VARIABLES LIKE '$pattern'")->execute();
return $res->fetchAll();
}
}

2
tests/createdrop_schema.phpt
View File

@@ -11,7 +11,7 @@ error_reporting=0
function database_exist($name) {
global $session;
$db_exist = $session->executeSql("show databases like '$name'");
$db_exist = $session->sql("show databases like '$name'")->execute();
$res = $db_exist->fetchAll();
try {
if ($res[0]["Database ($name)"]==$name) {

4
tests/date_time_types.phpt
View File

@@ -11,8 +11,8 @@ error_reporting=E_ALL
create_test_db();
$test_table = 'test_date_time_table';
$session->executeSql("create table $db.$test_table ("
."dt datetime, ts timestamp, dd date, tt time)");
$session->sql("create table $db.$test_table ("
."dt datetime, ts timestamp, dd date, tt time)")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable($test_table);

24
tests/field_metadata.phpt
View File

@@ -8,20 +8,20 @@ error_reporting=0
require("connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->sql("create database $db")->execute();
function test_numeric_types() {
global $session;
global $db;
$session->executeSql("create table $db.table1(a int, b tinyint, c smallint, d mediumint,
$session->sql("create table $db.table1(a int, b tinyint, c smallint, d mediumint,
e int unsigned, f tinyint unsigned,g smallint unsigned,h mediumint unsigned,
i float,j double,k decimal,l float unsigned,m double unsigned,n decimal unsigned,
o bit,p bigint,q bigint unsigned)");
o bit,p bigint,q bigint unsigned)")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("table1");
$session->executeSql("insert into $db.table1 values (1,1,1,1,1,1,1,1,1.1,1.1,1,1.1,1.1,1,1,1,1)");
$session->sql("insert into $db.table1 values (1,1,1,1,1,1,1,1,1.1,1.1,1,1.1,1.1,1,1,1,1)")->execute();
$res = $table->select(['a as aa','b as bb','c as cc','d as dd',
'e as ee','f as ff','g as gg','h as hh',
@@ -108,10 +108,10 @@ function test_other_types() {
global $session;
global $db;
$session->executeSql("create table $db.table2 (a bit, b char(20) not null, c tinyint unsigned primary key, d decimal(20, 3),
e time,f datetime, g timestamp,h date,i set('1','2'),j enum('1','2'))");
$session->executeSql("insert into $db.table2 values (1,'test',1,22,'3:33:22',
'1900-01-22 22:22:22','1971-01-01 00:00:01','9000-12-31','1','2')");
$session->sql("create table $db.table2 (a bit, b char(20) not null, c tinyint unsigned primary key, d decimal(20, 3),
e time,f datetime, g timestamp,h date,i set('1','2'),j enum('1','2'))")->execute();
$session->sql("insert into $db.table2 values (1,'test',1,22,'3:33:22',
'1900-01-22 22:22:22','1971-01-01 00:00:01','9000-12-31','1','2')")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("table2");
@@ -155,10 +155,10 @@ function test_geometries() {
global $session;
global $db;
$session->executeSql("create table $db.table3 (name int not null primary key, b geometry)");
$session->executeSql("insert into $db.table3 values (1, ST_GeomFromText(\"POINT(1 1)\"))");
$session->executeSql("insert into $db.table3 values (2, ST_GeomFromText(\"MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),
((25 0,0 15,30 15,22 10,25 0)))\"))");
$session->sql("create table $db.table3 (name int not null primary key, b geometry)")->execute();
$session->sql("insert into $db.table3 values (1, ST_GeomFromText(\"POINT(1 1)\"))")->execute();
$session->sql("insert into $db.table3 values (2, ST_GeomFromText(\"MULTIPOLYGON(((5 0,15 25,25 0,15 5,5 0)),
((25 0,0 15,30 15,22 10,25 0)))\"))")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("table3");

2
tests/field_metadata_empty_rowset.phpt
View File

@@ -5,7 +5,7 @@ mysqlx Field Metadata, empty rowset
<?php
require("connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->sql("create database $db")->execute();
$schema = $session->getSchema($db);
$schema->createCollection("test_collection");

4
tests/flexible_number_of_arguments.phpt
View File

@@ -8,8 +8,8 @@ error_reporting=0
require("connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->executeSql("create table $db.test_table(a text, b int, c text)");
$session->sql("create database $db")->execute();
$session->sql("create table $db.test_table(a text, b int, c text)")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("test_table");

4
tests/get_auto_increment_value.phpt
View File

@@ -8,8 +8,8 @@ error_reporting=0
require_once("connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->executeSql("create table $db.test_table(id int not null auto_increment,name char(30), primary key (id))");
$session->sql("create database $db")->execute();
$session->sql("create table $db.test_table(id int not null auto_increment,name char(30), primary key (id))")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("test_table");

4
tests/get_tableget_tables.phpt
View File

@@ -27,8 +27,8 @@ mysqlx getTable/getTables
}
expect_false($schema->getTable(""));
$session->executeSql("create table $db.test_table2(job text, experience int, uuid int)");
$session->executeSql("create table $db.test_table3(name text, surname text)");
$session->sql("create table $db.test_table2(job text, experience int, uuid int)")->execute();
$session->sql("create table $db.test_table3(name text, surname text)")->execute();
create_test_view($session);
$tables = $schema->getTables();

2
tests/index/index_utils.inc
View File

@@ -11,7 +11,7 @@ function expect_index($index_name, $exists) {
global $session;
$query = "SHOW INDEX FROM test_collection FROM $db WHERE Key_name='$index_name'";
$res = $session->executeSql($query);
$res = $session->sql($query)->execute();
expect_eq($res->hasData(), $exists, 'exists index '.$index_name);
}

8
tests/iterators.phpt
View File

@@ -62,9 +62,9 @@ mysqlx iterators
test_step_failed();
}
$session->executeSql("create database testx2");
$session->executeSql("create database testx3");
$session->executeSql("create database testx4");
$session->sql("create database testx2")->execute();
$session->sql("create database testx3")->execute();
$session->sql("create database testx4")->execute();
$expected_db = [$db, 'testx2','testx3','testx4'];
@@ -73,7 +73,7 @@ mysqlx iterators
foreach( $sql as $it ) {
if( strlen($it["Database"]) <= 6 and substr($it["Database"], 0, 4) == "test") {
expect_eq($it["Database"],$expected_db[$idx]);
$session->executeSql("drop database $expected_db[$idx]");
$session->sql("drop database $expected_db[$idx]")->execute();
$idx++;
}
}

6
tests/multiple_results.phpt
View File

@@ -25,12 +25,12 @@ mysqlx support for multiple resultsets
global $session;
global $db;
echo "---- ", $counter, " ----", PHP_EOL;
$session->executeSql($create_test_proc);
$session->sql($create_test_proc)->execute();
$res = $session->executeSql("CALL $db.test_proc()");
$res = $session->sql("CALL $db.test_proc()")->execute();
dump_multi_result($res);
$session->executeSql("DROP PROCEDURE $db.test_proc");
$session->sql("DROP PROCEDURE $db.test_proc")->execute();
}

4
tests/row_locking/row_locking_utils.inc
View File

@@ -31,9 +31,9 @@
$session->createSchema($test_schema_name);
$schema = $session->getSchema($test_schema_name);
$session->executeSql(
$session->sql(
"create table $db.$test_table_name(".
"_id varchar(8), n int, PRIMARY KEY(_id))");
"_id varchar(8), n int, PRIMARY KEY(_id))")->execute();
$tab = $schema->getTable($test_table_name);

32
tests/row_locking/table_sequential_native_sql.phpt
View File

@@ -20,16 +20,16 @@ error_reporting=0
$session1->startTransaction();
$session2->startTransaction();
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '1' lock in share mode");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '1' lock in share mode")->execute();
check_one($res1, '1', 1);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '2' lock in share mode");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '2' lock in share mode")->execute();
check_one($res2, '2', 2);
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '3' lock in share mode");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '3' lock in share mode")->execute();
check_one($res1, '3', 3);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '4' lock in share mode");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '4' lock in share mode")->execute();
check_one($res2, '4', 4);
$session1->rollback();
@@ -40,16 +40,16 @@ error_reporting=0
$session1->startTransaction();
$session2->startTransaction();
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '1' for update");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '1' for update")->execute();
check_one($res1, '1', 1);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '3' lock in share mode");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '3' lock in share mode")->execute();
check_one($res2, '3', 3);
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '2' for update");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '2' for update")->execute();
check_one($res1, '2', 2);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '4' lock in share mode");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '4' lock in share mode")->execute();
check_one($res2, '4', 4);
$session1->rollback();
@@ -60,16 +60,16 @@ error_reporting=0
$session1->startTransaction();
$session2->startTransaction();
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '2' lock in share mode");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '2' lock in share mode")->execute();
check_one($res1, '2', 2);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '3' for update");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '3' for update")->execute();
check_one($res2, '3', 3);
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '5' lock in share mode");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '5' lock in share mode")->execute();
check_one($res1, '5', 5);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '6' for update");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '6' for update")->execute();
check_one($res2, '6', 6);
$session1->rollback();
@@ -80,16 +80,16 @@ error_reporting=0
$session1->startTransaction();
$session2->startTransaction();
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '1' for update");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '1' for update")->execute();
check_one($res1, '1', 1);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '2' for update");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '2' for update")->execute();
check_one($res2, '2', 2);
$res1 = $session1->executeSql("select * from $db.$test_table_name where _id like '5' for update");
$res1 = $session1->sql("select * from $db.$test_table_name where _id like '5' for update")->execute();
check_one($res1, '5', 5);
$res2 = $session2->executeSql("select * from $db.$test_table_name where _id like '6' for update");
$res2 = $session2->sql("select * from $db.$test_table_name where _id like '6' for update")->execute();
check_one($res2, '6', 6);
$session1->rollback();

4
tests/simple_ssl.phpt
View File

@@ -6,7 +6,7 @@ mysqlx simple SSL connection
require(__DIR__."/connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$ssl_info_query = $session->executeSql("show variables like '%ssl%'");
$ssl_info_query = $session->sql("show variables like '%ssl%'")->execute();
$ssl_info = $ssl_info_query->fetchAll();
$mysql_datadir = get_mysql_variable($session, 'datadir');
@@ -25,7 +25,7 @@ mysqlx simple SSL connection
$new_uri .= 'ssl-ca=' . $rsa_key_path . 'ca.pem';
$session = mysql_xdevapi\getSession($new_uri);
$res = $session->executeSql('SELECT USER()');
$res = $session->sql('SELECT USER()')->execute();
$userdata = $res->fetchOne();
expect_eq($userdata['USER()'], $user.'@'.$host);

4
tests/sql_simple.phpt
View File

@@ -6,8 +6,8 @@
require("connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->executeSql("create table $db.test_table(name text, age tinyint)");
$session->sql("create database $db")->execute();
$session->sql("create table $db.test_table(name text, age tinyint)")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("test_table");

6
tests/table_delete_limit_order_by.phpt
View File

@@ -54,9 +54,9 @@ mysqlx table delete/limit/orderBy
expect_eq($res[1]['name'],'BRomy');
expect_eq($res[1]['age'],17);
$session->executeSql("insert into $db.test_table values ('Zillon', 29)");
$session->executeSql("insert into $db.test_table values ('Zillon', 21)");
$session->executeSql("insert into $db.test_table values ('Zillon', 34)");
$session->sql("insert into $db.test_table values ('Zillon', 29)")->execute();
$session->sql("insert into $db.test_table values ('Zillon', 21)")->execute();
$session->sql("insert into $db.test_table values ('Zillon', 34)")->execute();
$table->delete()->orderby(['name desc','age desc'])->limit(2)->execute();
$res = $table->select('name','age')->where('name = \'Zillon\'')->execute()->fetchAll();

4
tests/unix_domain_socket.phpt
View File

@@ -23,7 +23,7 @@ default_socket_timeout=1
}
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->sql("create database $db")->execute();
$valid_socket = $socket;
if( $valid_socket == null ) {
@@ -32,7 +32,7 @@ default_socket_timeout=1
* from the server
*/
$session = mysql_xdevapi\getSession($connection_uri);
$res = $session->executeSql("show variables like 'mysqlx_socket'");
$res = $session->sql("show variables like 'mysqlx_socket'")->execute();
$var = $res->fetchAll();
if( count( $var ) == 1 ) {
$valid_socket = $var[0]["Value"];

4
tests/warnings.phpt
View File

@@ -6,8 +6,8 @@ mysqlx warnings
require("connect.inc");
$session = mysql_xdevapi\getSession($connection_uri);
$session->executeSql("create database $db");
$session->executeSql("create table $db.test_table(x int)");
$session->sql("create database $db")->execute();
$session->sql("create table $db.test_table(x int)")->execute();
$schema = $session->getSchema($db);
$table = $schema->getTable("test_table");