Re-introduce the Matteo's patch and combine default & text handling since

they appear to be the same irregardless on notes inside sqlite3.h

diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c
index 8827f8b2166a9317e6d4593fefefd4efc4b22c15..cb1fdf126496c851da01846291ad7c98857d364a 100644 (file)
--- a/ext/pdo_sqlite/sqlite_statement.c
+++ b/ext/pdo_sqlite/sqlite_statement.c
@@ -231,25 +231,9 @@ static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsi
                        *len = sqlite3_column_bytes(S->stmt, colno);
                        return 1;
 
-               case SQLITE3_TEXT:
-                       *ptr = (char*)sqlite3_column_text(S->stmt, colno);
-                       *len = sqlite3_column_bytes(S->stmt, colno);
-                       if (*len) {
-                               /* sqlite3.h says "the NUL terminator is included in the byte count
-                                * for TEXT values" */
-                               *len--;
-                       }
-                       return 1;
-               
                default:
                        *ptr = (char*)sqlite3_column_text(S->stmt, colno);
                        *len = sqlite3_column_bytes(S->stmt, colno);
-#if SQLITE_VERSION_NUMBER < 3004000
-                       if (*len) {
-                               /* sqlite3.h says "the NUL terminator is included in the byte count for TEXT values" */
-                               (*len)--;
-                       }
-#endif
                        return 1;
        }
 }