Replaced dbx_cmp_asc and dbx_cmp_desc with dbx_compare function and

 DBX_CMP_ASC, DBX_CMP_DESC flags.
Default comparison changed from DBX_CMP_TEXT to new DBX_CMP_NATIVE.
Solved bug in associative fields when using mssql
Cleaned up comments (/*/ ... /*/ to /* ... */)
dbx_connect now always return false if the database is not found.
Optimized dbx_query field-info retrieval loop

1 files changed, 11 insertions, 6 deletions

diff --git a/ext/dbx/dbx.h b/ext/dbx/dbx.h
index c0f6b3ee2c..927d366286 100644
--- a/ext/dbx/dbx.h
+++ b/ext/dbx/dbx.h
@@ -29,12 +29,17 @@
 
 #include "php.h"
 
-#define DBX_PERSISTENT        1
-#define DBX_RESULT_INFO      1
-#define DBX_RESULT_INDEX    2
-#define DBX_RESULT_ASSOC   4
-#define DBX_CMP_TEXT          0
-#define DBX_CMP_NUMBER      1
+#define DBX_PERSISTENT        (1<<0)
+
+#define DBX_RESULT_INFO      (1<<0)
+#define DBX_RESULT_INDEX    (1<<1)
+#define DBX_RESULT_ASSOC   (1<<2)
+
+#define DBX_CMP_NATIVE      (1<<0)
+#define DBX_CMP_TEXT          (1<<1)
+#define DBX_CMP_NUMBER      (1<<2)
+#define DBX_CMP_ASC           (1<<3)
+#define DBX_CMP_DESC          (1<<4)
 
 #define MOVE_RETURNED_TO_RV(rv, returned_zval) { **rv = *returned_zval; zval_copy_ctor(*rv); zval_ptr_dtor(&returned_zval); }