complete registration

while at it, using ZEND_NORMALIZE_BOOL for both collation creation
helpers.

Author: devnexen

ext/pdo_sqlite/pdo_sqlite.c

@@ -387,11 +387,7 @@ static int php_sqlite_collation_callback(void *context, int string1_len, const v
 			zend_string_release(func_name);
 			ret = FAILURE;
 		}
-		if (Z_LVAL(retval) > 0) {
-			ret = 1;
-		} else if (Z_LVAL(retval) < 0) {
-			ret = -1;
-		}
+		ret = ZEND_NORMALIZE_BOOL(Z_LVAL(retval));
 		zval_ptr_dtor(&retval);
 	}
 
@@ -421,6 +417,7 @@ PHP_MINIT_FUNCTION(pdo_sqlite)
 	REGISTER_PDO_CLASS_CONST_LONG("SQLITE_OPEN_CREATE", (zend_long)SQLITE_OPEN_CREATE);
 	REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_READONLY_STATEMENT", (zend_long)PDO_SQLITE_ATTR_READONLY_STATEMENT);
 	REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_EXTENDED_RESULT_CODES", (zend_long)PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES);
+	REGISTER_PDO_CLASS_CONST_LONG("SQLITE_ATTR_BUSY_STATEMENT", (zend_long)PDO_SQLITE_ATTR_BUSY_STATEMENT);
 
 	pdosqlite_ce = register_class_Pdo_Sqlite(pdo_dbh_ce);
 	pdosqlite_ce->create_object = pdo_dbh_new;

ext/pdo_sqlite/pdo_sqlite_arginfo.h

@@ -73,7 +73,8 @@ extern const struct pdo_stmt_methods sqlite_stmt_methods;
 enum {
 	PDO_SQLITE_ATTR_OPEN_FLAGS = PDO_ATTR_DRIVER_SPECIFIC,
 	PDO_SQLITE_ATTR_READONLY_STATEMENT,
-	PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES
+	PDO_SQLITE_ATTR_EXTENDED_RESULT_CODES,
+	PDO_SQLITE_ATTR_BUSY_STATEMENT
 };
 
 typedef int pdo_sqlite_create_collation_callback(void*, int, const void*, int, const void*);

ext/pdo_sqlite/php_pdo_sqlite_int.h

@@ -494,11 +494,7 @@ static int php_sqlite3_collation_callback(void *context, int string1_len, const
 			zend_string_release(func_name);
 			ret = FAILURE;
 		}
-		if (Z_LVAL(retval) > 0) {
-			ret = 1;
-		} else if (Z_LVAL(retval) < 0) {
-			ret = -1;
-		}
+		ret = ZEND_NORMALIZE_BOOL(Z_LVAL(retval));
 		zval_ptr_dtor(&retval);
 	}