[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/database/mysql=5Fxdevapi=3A=20WL=23=31=31=39=34=35=3A?= =?UTF-8?Q?=20r
From:       hery ramilison <mysqlre () php ! net>
Date:       2018-04-26 18:21:29
Message-ID: php-mail-0a87c608a686a23d188b8ec0e8d9a1df2060891485 () git ! php ! net
[Download RAW message or body]

Commit:    ca125663bb6c7472622fa7333415b6d762d355a6
Author:    Darek Slusarczyk <dariusz.slusarczyk@oracle.com>         Thu, 26 Apr 2018 \
                19:54:17 +0200
Parents:   35560dac290adcaf2be75834d09faf401d782123
Branches:  release/8.0.12

Link:       http://git.php.net/?p=pecl/database/mysql_xdevapi.git;a=commitdiff;h=ca125663bb6c7472622fa7333415b6d762d355a6


Log:
WL#11945: remove obsolete routines throwing not_implemented exception
- remove util::xdevapi_exception::Code::not_implemented exception
- implement getSession for schema, collection, and table
- test-cases

Bugs:
https://bugs.php.net/11945

Changed paths:
  M  mysqlx_collection.cc
  M  mysqlx_schema.cc
  M  mysqlx_session.cc
  M  mysqlx_table.cc


Diff:
diff --git a/mysqlx_collection.cc b/mysqlx_collection.cc
index e31557b..c50bc35 100644
--- a/mysqlx_collection.cc
+++ b/mysqlx_collection.cc
@@ -162,10 +162,10 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_collection, getSession)
 
 	zval* object_zv{nullptr};
 	if (FAILURE == util::zend::parse_method_parameters(
-		execute_data, 
-		getThis(), 
+		execute_data,
+		getThis(),
 		"O",
-		&object_zv, 
+		&object_zv,
 		mysqlx_collection_class_entry))
 	{
 		DBG_VOID_RETURN;
diff --git a/mysqlx_schema.cc b/mysqlx_schema.cc
index e1789ce..c7c77d3 100644
--- a/mysqlx_schema.cc
+++ b/mysqlx_schema.cc
@@ -130,10 +130,10 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_schema, getSession)
 
 	zval* object_zv{nullptr};
 	if (FAILURE == util::zend::parse_method_parameters(
-		execute_data, 
-		getThis(), 
+		execute_data,
+		getThis(),
 		"O",
-		&object_zv, 
+		&object_zv,
 		mysqlx_schema_class_entry))
 	{
 		DBG_VOID_RETURN;
diff --git a/mysqlx_session.cc b/mysqlx_session.cc
index 65c6442..d25bed9 100644
--- a/mysqlx_session.cc
+++ b/mysqlx_session.cc
@@ -1050,16 +1050,9 @@ mysqlx_new_session(zval* return_value, drv::XMYSQLND_SESSION \
session)  {
 	DBG_ENTER("mysqlx_new_session");
 
-	if (SUCCESS == object_init_ex(return_value, mysqlx_session_class_entry) && \
                IS_OBJECT == Z_TYPE_P(return_value)) {
-		const st_mysqlx_object* const mysqlx_object{ Z_MYSQLX_P(return_value) };
-		st_mysqlx_session* const object{ \
                static_cast<st_mysqlx_session*>(mysqlx_object->ptr) };
-		if (object) {
-			object->session = session;
-		} else {
-			zval_ptr_dtor(return_value);
-			throw util::doc_ref_exception(util::doc_ref_exception::Severity::warning, \
                mysqlx_object->zo.ce);
-		}
-	}
+	st_mysqlx_session& data_object{
+		util::init_object<st_mysqlx_session>(mysqlx_session_class_entry, return_value) };
+	data_object.session = session;
 
 	DBG_VOID_RETURN;
 }
diff --git a/mysqlx_table.cc b/mysqlx_table.cc
index 508e806..614a74b 100644
--- a/mysqlx_table.cc
+++ b/mysqlx_table.cc
@@ -122,10 +122,10 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_table, getSession)
 
 	zval* object_zv{nullptr};
 	if (FAILURE == util::zend::parse_method_parameters(
-		execute_data, 
-		getThis(), 
+		execute_data,
+		getThis(),
 		"O",
-		&object_zv, 
+		&object_zv,
 		mysqlx_table_class_entry))
 	{
 		DBG_VOID_RETURN;


--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]