prefix internal API; ensure raphf is built first in-tree

[m6w6/ext-pq] / src / php_pqtxn.c

diff --git a/src/php_pqtxn.c b/src/php_pqtxn.c
index 7d4b8b73cd9ac885780e67a391f2888765e2d8c8..c3b0acc1d78a964539199f4312dcd370489779c0 100644 (file)
--- a/src/php_pqtxn.c
+++ b/src/php_pqtxn.c
@@ -175,7 +175,7 @@ static void php_pqtxn_object_write_readonly(zval *object, void *o, zval *value T
        php_pqtxn_object_t *obj = o;
        PGresult *res;
 
-       if ((obj->intern->readonly = zend_is_true(value))) {
+       if ((obj->intern->readonly = z_is_true(value))) {
                res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ ONLY");
        } else {
                res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ WRITE");
@@ -192,7 +192,7 @@ static void php_pqtxn_object_write_deferrable(zval *object, void *o, zval *value
        php_pqtxn_object_t *obj = o;
        PGresult *res;
 
-       if ((obj->intern->deferrable = zend_is_true(value))) {
+       if ((obj->intern->deferrable = z_is_true(value))) {
                res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION DEFERRABLE");
        } else {
                res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION NOT DEFERRABLE");
@@ -229,6 +229,20 @@ static PHP_METHOD(pqtxn, __construct) {
                if (!conn_obj->intern) {
                        throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else {
+
+                       switch (ZEND_NUM_ARGS()) {
+                       case 1:
+                       case 2:
+                               isolation = conn_obj->intern->default_txn_isolation;
+                               /* no break */
+                       case 3:
+                               readonly = conn_obj->intern->default_txn_readonly;
+                               /* no break */
+                       case 4:
+                               deferrable = conn_obj->intern->default_txn_deferrable;
+                               break;
+                       }
+
                        if (async) {
                                rv = php_pqconn_start_transaction_async(zconn, conn_obj, isolation, readonly, deferrable TSRMLS_CC);
                        } else {
@@ -341,7 +355,7 @@ static PHP_METHOD(pqtxn, commit) {
                if (!obj->intern) {
                        throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Transacation not initialized");
                } else if (!obj->intern->open) {
-                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transacation already closed");
+                       throw_exce(EX_RUNTIME TSRMLS_CC, "pq\\Transaction already closed");
                } else {
                        PGresult *res;
                        smart_str cmd = {0};
@@ -690,7 +704,7 @@ static PHP_METHOD(pqtxn, openLOB) {
                        int lofd = lo_open(obj->intern->conn->intern->conn, loid, mode);
 
                        if (lofd < 0) {
-                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%u with mode '%s' (%s)", loid, strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%u with mode '%s' (%s)", loid, php_pq_strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                php_pqlob_t *lob = ecalloc(1, sizeof(*lob));
 
@@ -729,12 +743,12 @@ static PHP_METHOD(pqtxn, createLOB) {
                        Oid loid = lo_creat(obj->intern->conn->intern->conn, mode);
 
                        if (loid == InvalidOid) {
-                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to create large object with mode '%s' (%s)", strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to create large object with mode '%s' (%s)", php_pq_strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                        } else {
                                int lofd = lo_open(obj->intern->conn->intern->conn, loid, mode);
 
                                if (lofd < 0) {
-                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%u with mode '%s': %s", loid, strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to open large object with oid=%u with mode '%s': %s", loid, php_pq_strmode(mode), PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                } else {
                                        php_pqlob_t *lob = ecalloc(1, sizeof(*lob));