PHPC-101: throw MongoDB\DuplicateKeyException

Author: bjori

config.m4

@@ -174,6 +174,7 @@ if test "$PHONGO" != "no"; then
       src/MongoDB/RuntimeException.c \
       src/MongoDB/ConnectionException.c \
       src/MongoDB/SSLConnectionException.c \
+      src/MongoDB/DuplicateKeyException.c \
       src/MongoDB/WriteException.c \
   ";
 

php_phongo.c

@@ -90,6 +90,8 @@ zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t
 zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code)
 {
 	switch(code) {
+		case 11000: /* Duplicate key */
+			return php_phongo_duplicatekeyexception_ce;
 		case MONGOC_ERROR_STREAM_INVALID_TYPE:
 		case MONGOC_ERROR_STREAM_INVALID_STATE:
 		case MONGOC_ERROR_STREAM_NAME_RESOLUTION:
@@ -563,9 +565,9 @@ bool phongo_execute_write(mongoc_client_t *client, char *namespace, mongoc_bulk_
 	if (!hint) {
 		/* If no exception has been thrown already, for example connection exception */
 		if (!EG(exception)) {
-			zval *e = phongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, "%s", error.message);
+			zval *e = phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
 
-			if (Z_OBJCE_P(e) == php_phongo_writeexception_ce) {
+			if (instanceof_function(Z_OBJCE_P(e), php_phongo_writeexception_ce TSRMLS_CC)) {
 				phongo_writeexception_init(e, &reply, hint TSRMLS_CC);
 			}
 		}
@@ -1426,6 +1428,7 @@ PHP_MINIT_FUNCTION(phongo)
 	PHP_MINIT(ConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(SSLConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
+	PHP_MINIT(DuplicateKeyException)(INIT_FUNC_ARGS_PASSTHRU);
 
 	PHP_MINIT(Type)(INIT_FUNC_ARGS_PASSTHRU);
 	PHP_MINIT(Binary)(INIT_FUNC_ARGS_PASSTHRU);

php_phongo_classes.h

@@ -192,6 +192,7 @@ extern PHONGO_API zend_class_entry *php_phongo_exception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_runtimeexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_connectionexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_sslconnectionexception_ce;
+extern PHONGO_API zend_class_entry *php_phongo_duplicatekeyexception_ce;
 extern PHONGO_API zend_class_entry *php_phongo_writeexception_ce;
 
 extern PHONGO_API zend_class_entry *php_phongo_type_ce;
@@ -227,6 +228,7 @@ PHP_MINIT_FUNCTION(Exception);
 PHP_MINIT_FUNCTION(RuntimeException);
 PHP_MINIT_FUNCTION(ConnectionException);
 PHP_MINIT_FUNCTION(SSLConnectionException);
+PHP_MINIT_FUNCTION(DuplicateKeyException);
 PHP_MINIT_FUNCTION(WriteException);
 
 PHP_MINIT_FUNCTION(Type);

src/MongoDB/DuplicateKeyException.c

@@ -0,0 +1,81 @@
+/*
+  +---------------------------------------------------------------------------+
+  | PHP Driver for MongoDB                                                    |
+  +---------------------------------------------------------------------------+
+  | Copyright 2013-2014 MongoDB, Inc.                                         |
+  |                                                                           |
+  | Licensed under the Apache License, Version 2.0 (the "License");           |
+  | you may not use this file except in compliance with the License.          |
+  | You may obtain a copy of the License at                                   |
+  |                                                                           |
+  | http://www.apache.org/licenses/LICENSE-2.0                                |
+  |                                                                           |
+  | Unless required by applicable law or agreed to in writing, software       |
+  | distributed under the License is distributed on an "AS IS" BASIS,         |
+  | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  |
+  | See the License for the specific language governing permissions and       |
+  | limitations under the License.                                            |
+  +---------------------------------------------------------------------------+
+  | Copyright (c) 2014, MongoDB, Inc.                                         |
+  +---------------------------------------------------------------------------+
+*/
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
+/* External libs */
+#include <bson.h>
+#include <mongoc.h>
+
+/* PHP Core stuff */
+#include <php.h>
+#include <php_ini.h>
+#include <ext/standard/info.h>
+#include <Zend/zend_interfaces.h>
+#include <ext/spl/spl_iterators.h>
+/* Our Compatability header */
+#include "php_compat_53.h"
+
+/* Our stuffz */
+#include "php_phongo.h"
+#include "php_bson.h"
+#include <ext/spl/spl_exceptions.h>
+
+
+PHONGO_API zend_class_entry *php_phongo_duplicatekeyexception_ce;
+
+/* {{{ MongoDB\DuplicateKeyException */
+
+static zend_function_entry php_phongo_duplicatekeyexception_me[] = {
+	PHP_FE_END
+};
+
+/* }}} */
+
+
+/* {{{ PHP_MINIT_FUNCTION */
+PHP_MINIT_FUNCTION(DuplicateKeyException)
+{
+	(void)type;
+	(void)module_number;
+	zend_class_entry ce;
+
+	INIT_NS_CLASS_ENTRY(ce, "MongoDB", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);
+	php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
+	php_phongo_duplicatekeyexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+
+	return SUCCESS;
+}
+/* }}} */
+
+
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */

src/MongoDB/WriteException.c

@@ -93,9 +93,8 @@ PHP_MINIT_FUNCTION(WriteException)
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB", "WriteException", php_phongo_writeexception_me);
 	php_phongo_writeexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
-	php_phongo_writeexception_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
 
-	zend_declare_property_null(php_phongo_writeexception_ce, ZEND_STRL("writeResult"), ZEND_ACC_PRIVATE TSRMLS_CC);
+	zend_declare_property_null(php_phongo_writeexception_ce, ZEND_STRL("writeResult"), ZEND_ACC_PROTECTED TSRMLS_CC);
 
 	return SUCCESS;
 }

tests/standalone/manager-executeWriteBatch-002.phpt

@@ -34,7 +34,7 @@ var_dump(iterator_to_array($cursor));
 <?php exit(0); ?>
 --EXPECTF--
 WriteException.message: %s
-WriteException.code: 0
+WriteException.code: 11000
 
 ===> WriteResult
 server: %s:%d

tests/standalone/manager-executeWriteBatch-003.phpt

@@ -34,7 +34,7 @@ var_dump(iterator_to_array($cursor));
 <?php exit(0); ?>
 --EXPECTF--
 WriteException.message: %s
-WriteException.code: 0
+WriteException.code: 11000
 
 ===> WriteResult
 server: %s:%d

tests/standalone/write-error-001.phpt

@@ -17,20 +17,13 @@ $hannes_id = $insertBatch->insert($hannes);
 $w = 2;
 $wtimeout = 1000;
 $writeConcern = new \MongoDB\WriteConcern($w, $wtimeout);
-try {
+throws(function() use($insertBatch, $writeConcern, $manager) {
     $result = $manager->executeWriteBatch("db.collection", $insertBatch, $writeConcern);
-} catch(MongoDB\WriteException $e) {
-    printWriteResult($e->getWriteResult());
-}
+}, "MongoDB\ConnectionException");
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-server: %s:%d
-insertedCount: 0
-matchedCount: 0
-modifiedCount: 0
-upsertedCount: 0
-deletedCount: 0
+OK: Got MongoDB\ConnectionException
 ===DONE===