[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2008-01-30 Thread Antony Dovgal 
tony2001Wed Jan 30 09:11:08 2008 UTC

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  both pdo  spl dependencies are optional
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/config.m4?r1=1.44r2=1.45diff_format=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.44 php-src/ext/sqlite/config.m4:1.45
--- php-src/ext/sqlite/config.m4:1.44   Tue Jul  3 17:24:37 2007
+++ php-src/ext/sqlite/config.m4Wed Jan 30 09:11:08 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.44 2007/07/03 17:24:37 sniper Exp $
+dnl $Id: config.m4,v 1.45 2008/01/30 09:11:08 tony2001 Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -103,16 +103,15 @@
 libsqlite/src/vacuum.c libsqlite/src/copy.c \
 libsqlite/src/vdbeaux.c libsqlite/src/date.c \
 libsqlite/src/where.c libsqlite/src/trigger.c
- 
-PHP_ADD_EXTENSION_DEP(sqlite, spl)
-PHP_ADD_EXTENSION_DEP(sqlite, pdo)
   fi
-
   dnl
   dnl Common for both bundled/external
   dnl
   sqlite_sources=sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources 
   PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
+  PHP_ADD_EXTENSION_DEP(sqlite, spl, true)
+  PHP_ADD_EXTENSION_DEP(sqlite, pdo, true)
+  
   PHP_ADD_MAKEFILE_FRAGMENT
   PHP_SUBST(SQLITE_SHARED_LIBADD)
   PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4 php_sqlite.h sqlite.c

2006-10-07 Thread Sara Golemon 
pollita Sat Oct  7 17:49:30 2006 UTC

  Modified files:  
/php-src/ext/sqlite config.m4 php_sqlite.h sqlite.c 
  Log:
  Update SQLITE2 (non-PDO parts at least) for PHP6/Unicode
  Change default build of bundled libsqlite to utf8 mode
  iso-8859 mode is still available using --disable-sqlite-utf8
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/config.m4?r1=1.41r2=1.42diff_format=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.41 php-src/ext/sqlite/config.m4:1.42
--- php-src/ext/sqlite/config.m4:1.41   Tue Jun 14 01:44:16 2005
+++ php-src/ext/sqlite/config.m4Sat Oct  7 17:49:30 2006
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.41 2005/06/14 01:44:16 sniper Exp $
+dnl $Id: config.m4,v 1.42 2006/10/07 17:49:30 pollita Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -8,8 +8,8 @@
   Sqlite include and library files are located,
   if not using bundled library.], yes)
 
-PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite 
(default: ISO-8859-1),
-[  --enable-sqlite-utf8  SQLite: Enable UTF-8 support for SQLite], no, no)
+PHP_ARG_ENABLE(sqlite-utf8, whether to disable UTF-8 support in libsqlite 
(charset changes to ISO-8859-1),
+[  --disable-sqlite-utf8 SQLite: Disable UTF-8 support for SQLite (use 
ISO8859)], yes, no)
 
 
 
@@ -126,11 +126,11 @@
 dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling 
 dnl in funcs.c uses assert(), which is a bit silly and something 
 dnl we want to avoid. This assert() was removed in SQLite 2.8.9.
-if test $PHP_SQLITE_UTF8 = yes; then
+if test $PHP_SQLITE_UTF8 = no; then
+  SQLITE_ENCODING=ISO8859
+else
   SQLITE_ENCODING=UTF8
   AC_DEFINE(SQLITE_UTF8, 1, [ ])
-else
-  SQLITE_ENCODING=ISO8859
 fi
 PHP_SUBST(SQLITE_ENCODING)
 
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/php_sqlite.h?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/sqlite/php_sqlite.h
diff -u php-src/ext/sqlite/php_sqlite.h:1.34 
php-src/ext/sqlite/php_sqlite.h:1.35
--- php-src/ext/sqlite/php_sqlite.h:1.34Sun Jan  1 13:09:54 2006
+++ php-src/ext/sqlite/php_sqlite.h Sat Oct  7 17:49:30 2006
@@ -17,7 +17,7 @@
|  Marcus Boerger [EMAIL PROTECTED]  |
+--+
 
-   $Id: php_sqlite.h,v 1.34 2006/01/01 13:09:54 sniper Exp $ 
+   $Id: php_sqlite.h,v 1.35 2006/10/07 17:49:30 pollita Exp $ 
 */
 
 #ifndef PHP_SQLITE_H
@@ -93,7 +93,10 @@
 PHP_FUNCTION(sqlite_fetch_column_types);
 
 ZEND_BEGIN_MODULE_GLOBALS(sqlite)
-long assoc_case;
+   long assoc_case;
+#ifdef SQLITE_ISO8859
+   UConverter *iso8859_conv;
+#endif
 ZEND_END_MODULE_GLOBALS(sqlite)
 
 #ifdef ZTS
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.197r2=1.198diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.197 php-src/ext/sqlite/sqlite.c:1.198
--- php-src/ext/sqlite/sqlite.c:1.197   Tue Sep 19 10:38:31 2006
+++ php-src/ext/sqlite/sqlite.c Sat Oct  7 17:49:30 2006
@@ -17,7 +17,7 @@
|  Marcus Boerger [EMAIL PROTECTED]  |
+--+
 
-   $Id: sqlite.c,v 1.197 2006/09/19 10:38:31 dmitry Exp $
+   $Id: sqlite.c,v 1.198 2006/10/07 17:49:30 pollita Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -29,9 +29,12 @@
 #include php.h
 #include php_ini.h
 #include ext/standard/info.h
+#include ext/standard/file.h
+#include ext/standard/php_string.h
 #if HAVE_PHP_SESSION  !defined(COMPILE_DL_SESSION)
 #include ext/session/php_session.h
 #endif
+#include sqlite.h
 #include php_sqlite.h
 
 #if HAVE_TIME_H
@@ -41,7 +44,12 @@
 #include unistd.h
 #endif
 
-#include sqlite.h
+
+#ifdef SQLITE_UTF8
+#define SQLITE2_CONV UG(utf8_conv)
+#else /* ISO 8859 */
+#define SQLITE2_CONV SQLITE_G(iso8859_conv)
+#endif
 
 #include zend_exceptions.h
 #include zend_interfaces.h
@@ -95,10 +103,48 @@
}
 }
 
+#ifdef SQLITE_ISO8859
+static ZEND_INI_MH(OnUpdateEncodingISO8859)
+{
+   UConverter **converter;
+#ifndef ZTS
+   char *base = (char *) mh_arg2;
+#else
+   char *base = (char *) ts_resource(*((int *) mh_arg2));
+#endif
+   char encoding[sizeof(iso-8859-999)];
+
+   converter = (UConverter **) (base+(size_t) mh_arg1);
+   if (new_value_length  3) {
+   /* Really, 2 is sufficient, but be generous, the 
zend_set_converter_encoding call will find it out */
+   zend_error(E_CORE_ERROR, Unrecognized locale '%s' for iso-8859 
encoding used for %s, new_value ?  new_value : 1, entry-name);
+   return FAILURE;
+   }
+
+   snprintf(encoding, sizeof(iso-8859-999), iso-8859-%s, new_value ? 
new_value : 1);
+
+if (zend_set_converter_encoding(converter, encoding) == FAILURE) {
+zend_error(E_CORE_ERROR, Unrecognized

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2005-06-02 Thread Jani Taskinen 
sniper  Thu Jun  2 16:06:39 2005 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  We only need LEMON for bundled stuff
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.38r2=1.39ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.38 php-src/ext/sqlite/config.m4:1.39
--- php-src/ext/sqlite/config.m4:1.38   Mon May 30 11:57:54 2005
+++ php-src/ext/sqlite/config.m4Thu Jun  2 16:06:37 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.38 2005/05/30 15:57:54 hholzgra Exp $
+dnl $Id: config.m4,v 1.39 2005/06/02 20:06:37 sniper Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -36,7 +36,7 @@
   fi
   case $php_cv_lemon_version in
 |invalid[)]
-  lemon_msg=lemon versions supported for regeneration of the Zend/PHP 
parsers: $lemon_version_list  (found $lemon_version).
+  lemon_msg=lemon versions supported for regeneration of libsqlite 
parsers: $lemon_version_list (found $lemon_version).
   AC_MSG_WARN([$lemon_msg])
   LEMON=exit 0;
   ;;
@@ -46,7 +46,6 @@
 
 
 if test $PHP_SQLITE != no; then
-  PHP_PROG_LEMON
   if test $PHP_PDO != no; then
 AC_MSG_CHECKING([for PDO includes])
 if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
@@ -98,6 +97,7 @@
 sqlite_extra_sources=libsqlite/src/encode.c
   else
 # use bundled library
+PHP_PROG_LEMON
 SQLITE_MODULE_TYPE=builtin
 PHP_SQLITE_CFLAGS=[EMAIL PROTECTED]@/libsqlite/src $pdo_inc_path
 sqlite_extra_sources=libsqlite/src/opcodes.c \

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2005-05-30 Thread Hartmut Holzgraefe 
hholzgraMon May 30 11:57:55 2005 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  typo fix
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.37r2=1.38ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.37 php-src/ext/sqlite/config.m4:1.38
--- php-src/ext/sqlite/config.m4:1.37   Mon May 30 10:15:40 2005
+++ php-src/ext/sqlite/config.m4Mon May 30 11:57:54 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.37 2005/05/30 14:15:40 hholzgra Exp $
+dnl $Id: config.m4,v 1.38 2005/05/30 15:57:54 hholzgra Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -16,7 +16,7 @@
 dnl
 dnl PHP_PROG_LEMON
 dnl
-dnl Search for lemon binary and check it's version
+dnl Search for lemon binary and check its version
 dnl
 AC_DEFUN([PHP_PROG_LEMON],[
   # we only support certain lemon versions

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2005-05-06 Thread Jani Taskinen 
sniper  Fri May  6 18:51:05 2005 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  cleanup
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.33r2=1.34ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.33 php-src/ext/sqlite/config.m4:1.34
--- php-src/ext/sqlite/config.m4:1.33   Fri Apr 15 20:04:27 2005
+++ php-src/ext/sqlite/config.m4Fri May  6 18:51:05 2005
@@ -1,79 +1,69 @@
-dnl $Id: config.m4,v 1.33 2005/04/16 00:04:27 rasmus Exp $
+dnl $Id: config.m4,v 1.34 2005/05/06 22:51:05 sniper Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
-PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite 
(default: ISO-8859-1),
-[  --enable-sqlite-utf8Enable UTF-8 support for SQLite], no, no)
-
 PHP_ARG_WITH(sqlite, for sqlite support,
 [  --without-sqlite  Do not include sqlite support.
   Use --with-sqlite=DIR to specify DIR where
   Sqlite include and library files are located,
   if not using bundled library.], yes)
 
+PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite 
(default: ISO-8859-1),
+[  --enable-sqlite-utf8Enable UTF-8 support for SQLite], no, no)
+
 if test $PHP_SQLITE != no; then
- if test $PHP_PDO != no; then
-  AC_MSG_CHECKING([for PDO includes])
-  if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$prefix/include/php/ext
-  else
-AC_MSG_WARN([Cannot find php_pdo_driver.h.])
-pdo_inc_path=
-  fi
-  if test -n $pdo_inc_path; then
-AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
-pdo_inc_path=-I$pdo_inc_path
-  fi
-  AC_MSG_RESULT($pdo_inc_path)
- fi  
+  if test $PHP_PDO != no; then
+AC_MSG_CHECKING([for PDO includes])
+if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+  pdo_inc_path=$abs_srcdir/ext
+elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+  pdo_inc_path=$abs_srcdir/ext
+elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+  pdo_inc_path=$prefix/include/php/ext
+else
+  AC_MSG_WARN([Cannot find php_pdo_driver.h.])
+fi
+if test -n $pdo_inc_path; then
+  AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
+  pdo_inc_path=-I$pdo_inc_path
+fi
+AC_MSG_RESULT([$pdo_inc_path])
+  fi  
 
   if test $PHP_SQLITE != yes; then
 SEARCH_PATH=/usr/local /usr
 SEARCH_FOR=/include/sqlite.h
 if test -r $PHP_SQLITE/; then # path given as parameter
-SQLITE_DIR=$PHP_SQLITE
+  SQLITE_DIR=$PHP_SQLITE
 else # search default path list
-AC_MSG_CHECKING([for sqlite files in default path])
-for i in $SEARCH_PATH ; do
+  AC_MSG_CHECKING([for sqlite files in default path])
+  for i in $SEARCH_PATH ; do
 if test -r $i/$SEARCH_FOR; then
-SQLITE_DIR=$i
-AC_MSG_RESULT(found in $i)
+  SQLITE_DIR=$i
+  AC_MSG_RESULT(found in $i)
 fi
-done
+  done
 fi
   
 if test -z $SQLITE_DIR; then
-AC_MSG_RESULT([not found])
-AC_MSG_ERROR([Please reinstall the sqlite distribution from 
http://www.sqlite.org])
+  AC_MSG_RESULT([not found])
+  AC_MSG_ERROR([Please reinstall the sqlite distribution from 
http://www.sqlite.org])
 fi
 
-PHP_ADD_INCLUDE($SQLITE_DIR/include)
-
-LIBNAME=sqlite
-LIBSYMBOL=sqlite_open
-
-PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
-[
-PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SQLITE_DIR/$PHP_LIBDIR, 
SQLITE_SHARED_LIBADD)
-AC_DEFINE(HAVE_SQLITELIB,1,[ ])
+PHP_CHECK_LIBRARY(sqlite, sqlite_open, [
+  PHP_ADD_LIBRARY_WITH_PATH(sqlite, $SQLITE_DIR/$PHP_LIBDIR, 
SQLITE_SHARED_LIBADD)
+  PHP_ADD_INCLUDE($SQLITE_DIR/include)
 ],[
-AC_MSG_ERROR([wrong sqlite lib version or lib not found])
+  AC_MSG_ERROR([wrong sqlite lib version or lib not found])
 ],[
--L$SQLITE_DIR/$PHP_LIBDIR -lm
+  -L$SQLITE_DIR/$PHP_LIBDIR -lm
 ])
- 
-PHP_SUBST(SQLITE_SHARED_LIBADD)
-PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c pdo_sqlite2.c 
libsqlite/src/encode.c, $ext_shared,,$pdo_inc_path)
+PHP_SQLITE_CFLAGS=$pdo_inc_path
+sqlite_extra_sources=libsqlite/src/encode.c
   else
 # use bundled library
-
 PHP_SQLITE_CFLAGS=[EMAIL PROTECTED]@/libsqlite/src $pdo_inc_path
-
-sources=libsqlite/src/opcodes.c
+sqlite_extra_sources=libsqlite/src/opcodes.c \
 libsqlite/src/parse.c libsqlite/src/encode.c \
 libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
 libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \
@@ -87,30 +77,29 @@
 libsqlite/src/vdbeaux.c libsqlite/src/date.c \

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2005-04-15 Thread Rasmus Lerdorf 
rasmus  Fri Apr 15 20:04:28 2005 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  Don't do PDO here if PDO is disabled
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.32r2=1.33ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.32 php-src/ext/sqlite/config.m4:1.33
--- php-src/ext/sqlite/config.m4:1.32   Fri Mar 11 18:57:01 2005
+++ php-src/ext/sqlite/config.m4Fri Apr 15 20:04:27 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.32 2005/03/11 23:57:01 wez Exp $
+dnl $Id: config.m4,v 1.33 2005/04/16 00:04:27 rasmus Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -12,6 +12,7 @@
   if not using bundled library.], yes)
 
 if test $PHP_SQLITE != no; then
+ if test $PHP_PDO != no; then
   AC_MSG_CHECKING([for PDO includes])
   if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
 pdo_inc_path=$abs_srcdir/ext
@@ -27,8 +28,8 @@
 AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
 pdo_inc_path=-I$pdo_inc_path
   fi
-  
   AC_MSG_RESULT($pdo_inc_path)
+ fi  
 
   if test $PHP_SQLITE != yes; then
 SEARCH_PATH=/usr/local /usr

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4 config.w32 pdo_sqlite2.c sqlite.c

2005-03-11 Thread Wez Furlong 
wez Fri Mar 11 18:57:04 2005 EDT

  Added files: 
/php-src/ext/sqlite pdo_sqlite2.c 

  Modified files:  
/php-src/ext/sqlite config.m4 config.w32 sqlite.c 
  Log:
  Implement a PDO driver for sqlite 2
  
  http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.31r2=1.32ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.31 php-src/ext/sqlite/config.m4:1.32
--- php-src/ext/sqlite/config.m4:1.31   Tue Feb 15 16:09:42 2005
+++ php-src/ext/sqlite/config.m4Fri Mar 11 18:57:01 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.31 2005/02/15 21:09:42 helly Exp $
+dnl $Id: config.m4,v 1.32 2005/03/11 23:57:01 wez Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -12,6 +12,23 @@
   if not using bundled library.], yes)
 
 if test $PHP_SQLITE != no; then
+  AC_MSG_CHECKING([for PDO includes])
+  if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+pdo_inc_path=$abs_srcdir/ext
+  elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+pdo_inc_path=$abs_srcdir/ext
+  elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+pdo_inc_path=$prefix/include/php/ext
+  else
+AC_MSG_WARN([Cannot find php_pdo_driver.h.])
+pdo_inc_path=
+  fi
+  if test -n $pdo_inc_path; then
+AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
+pdo_inc_path=-I$pdo_inc_path
+  fi
+  
+  AC_MSG_RESULT($pdo_inc_path)
 
   if test $PHP_SQLITE != yes; then
 SEARCH_PATH=/usr/local /usr
@@ -49,11 +66,11 @@
 ])
  
 PHP_SUBST(SQLITE_SHARED_LIBADD)
-PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c libsqlite/src/encode.c, 
$ext_shared)
+PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c pdo_sqlite2.c 
libsqlite/src/encode.c, $ext_shared,,$pdo_inc_path)
   else
 # use bundled library
 
-PHP_SQLITE_CFLAGS=[EMAIL PROTECTED]@/libsqlite/src
+PHP_SQLITE_CFLAGS=[EMAIL PROTECTED]@/libsqlite/src $pdo_inc_path
 
 sources=libsqlite/src/opcodes.c
 libsqlite/src/parse.c libsqlite/src/encode.c \
@@ -69,8 +86,9 @@
 libsqlite/src/vdbeaux.c libsqlite/src/date.c \
 libsqlite/src/where.c libsqlite/src/trigger.c
 
-PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c $sources, 
$ext_shared,,$PHP_SQLITE_CFLAGS)
+PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c pdo_sqlite2.c $sources, 
$ext_shared,,$PHP_SQLITE_CFLAGS)
 PHP_ADD_EXTENSION_DEP(sqlite, spl)
+PHP_ADD_EXTENSION_DEP(sqlite, pdo)
 PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
 PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
 AC_CHECK_SIZEOF(char *,4)
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.w32?r1=1.6r2=1.7ty=u
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.6 php-src/ext/sqlite/config.w32:1.7
--- php-src/ext/sqlite/config.w32:1.6   Tue Feb 15 16:09:42 2005
+++ php-src/ext/sqlite/config.w32   Fri Mar 11 18:57:01 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2005/02/15 21:09:42 helly Exp $
+// $Id: config.w32,v 1.7 2005/03/11 23:57:01 wez Exp $
 // vim:ft=javascript
 
 ARG_WITH(sqlite, SQLite support, yes);
@@ -13,7 +13,7 @@
FSO.CopyFile(configure_module_dirname + 
\\libsqlite\\src\\sqlite_config.w32.h,
configure_module_dirname + \\libsqlite\\src\\config.h);

-   EXTENSION(sqlite, sqlite.c sess_sqlite.c, null,
+   EXTENSION(sqlite, sqlite.c sess_sqlite.c pdo_sqlite2.c, null,
/D PHP_SQLITE_EXPORTS /I  + configure_module_dirname + 
/libsqlite/src);


http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.157r2=1.158ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.157 php-src/ext/sqlite/sqlite.c:1.158
--- php-src/ext/sqlite/sqlite.c:1.157   Tue Feb 15 16:09:42 2005
+++ php-src/ext/sqlite/sqlite.c Fri Mar 11 18:57:01 2005
@@ -17,7 +17,7 @@
|  Marcus Boerger [EMAIL PROTECTED]  |
+--+
 
-   $Id: sqlite.c,v 1.157 2005/02/15 21:09:42 helly Exp $ 
+   $Id: sqlite.c,v 1.158 2005/03/11 23:57:01 wez Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -49,6 +49,12 @@
 extern PHPAPI zend_class_entry *spl_ce_Countable;
 #endif
 
+#if PHP_SQLITE2_HAVE_PDO
+# include pdo/php_pdo.h
+# include pdo/php_pdo_driver.h
+extern pdo_driver_t pdo_sqlite2_driver;
+#endif
+
 #ifndef safe_emalloc
 # define safe_emalloc(a,b,c) emalloc((a)*(b)+(c))
 #endif
@@ -1068,12 +1074,23 @@
REGISTER_LONG_CONSTANT(SQLITE_ROW,SQLITE_ROW, 
CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLITE_DONE,   SQLITE_DONE, 
CONST_CS|CONST_PERSISTENT);
 
+#if PHP_SQLITE2_HAVE_PDO
+if (FAILURE == php_pdo_register_driver(pdo_sqlite2_driver)) {
+return FAILURE;
+}
+#endif
+
return SUCCESS;
 }
 
 PHP_MSHUTDOWN_FUNCTION(sqlite)
 {
UNREGISTER_INI_ENTRIES();
+
+#if

[PHP-CVS] cvs: php-src /ext/sqlite config.m4 config.w32 sqlite.c /ext/sqlite/tests sqlite_oo_032.phpt

2005-02-15 Thread Marcus Boerger 
helly   Tue Feb 15 16:09:42 2005 EDT

  Added files: 
/php-src/ext/sqlite/tests   sqlite_oo_032.phpt 

  Modified files:  
/php-src/ext/sqlite config.m4 config.w32 sqlite.c 
  Log:
  - SQLite depends on SPL if it is present
  - Add SQLiteResult::count()
  - SQLiteResult implements Countable if present
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.30r2=1.31ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.30 php-src/ext/sqlite/config.m4:1.31
--- php-src/ext/sqlite/config.m4:1.30   Sat Feb 12 22:15:11 2005
+++ php-src/ext/sqlite/config.m4Tue Feb 15 16:09:42 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.30 2005/02/13 03:15:11 wez Exp $
+dnl $Id: config.m4,v 1.31 2005/02/15 21:09:42 helly Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -70,6 +70,7 @@
 libsqlite/src/where.c libsqlite/src/trigger.c
 
 PHP_NEW_EXTENSION(sqlite, sqlite.c sess_sqlite.c $sources, 
$ext_shared,,$PHP_SQLITE_CFLAGS)
+PHP_ADD_EXTENSION_DEP(sqlite, spl)
 PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
 PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
 AC_CHECK_SIZEOF(char *,4)
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.w32?r1=1.5r2=1.6ty=u
Index: php-src/ext/sqlite/config.w32
diff -u php-src/ext/sqlite/config.w32:1.5 php-src/ext/sqlite/config.w32:1.6
--- php-src/ext/sqlite/config.w32:1.5   Tue May 25 09:01:05 2004
+++ php-src/ext/sqlite/config.w32   Tue Feb 15 16:09:42 2005
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.5 2004/05/25 13:01:05 wez Exp $
+// $Id: config.w32,v 1.6 2005/02/15 21:09:42 helly Exp $
 // vim:ft=javascript
 
 ARG_WITH(sqlite, SQLite support, yes);
@@ -27,6 +27,5 @@
if (!PHP_SQLITE_SHARED) {
ADD_DEF_FILE(configure_module_dirname + \\php_sqlite.def);
}
+   ADD_EXTENSION_DEP('sqlite', 'spl')
 }
-
-
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.156r2=1.157ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.156 php-src/ext/sqlite/sqlite.c:1.157
--- php-src/ext/sqlite/sqlite.c:1.156   Tue Jan 25 14:08:38 2005
+++ php-src/ext/sqlite/sqlite.c Tue Feb 15 16:09:42 2005
@@ -17,7 +17,7 @@
|  Marcus Boerger [EMAIL PROTECTED]  |
+--+
 
-   $Id: sqlite.c,v 1.156 2005/01/25 19:08:38 helly Exp $ 
+   $Id: sqlite.c,v 1.157 2005/02/15 21:09:42 helly Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -46,6 +46,7 @@
 
 #ifdef HAVE_SPL
 extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
+extern PHPAPI zend_class_entry *spl_ce_Countable;
 #endif
 
 #ifndef safe_emalloc
@@ -65,6 +66,8 @@
 #define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const 
unsigned char *)in, n, (unsigned char *)out)
 #define php_sqlite_decode_binary(in, out)sqlite_decode_binary((const 
unsigned char *)in, (unsigned char *)out)
 
+static int sqlite_count_elements(zval *object, long *count TSRMLS_DC);
+
 static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb;
 
 static inline void php_sqlite_strtoupper(char *s)
@@ -90,7 +93,6 @@
 PHP_INI_END()
 /* }}} */
 
-
 #define DB_FROM_ZVAL(db, zv)   ZEND_FETCH_RESOURCE2(db, struct php_sqlite_db 
*, zv, -1, sqlite database, le_sqlite_db, le_sqlite_pdb)
 
 #define DB_FROM_OBJECT(db, object) \
@@ -113,10 +115,6 @@
} \
}
 
-#define SQLITE_THROW(message) \
-   PG(suppress_errors) = 0; \
-   EG(exception) = zend_throw_exception(sqlite_ce_exception, message, 0 
TSRMLS_CC);
-
 #define PHP_SQLITE_EMPTY_QUERY \
if (!sql_len) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot execute 
empty query.); \
@@ -234,6 +232,8 @@
PHP_ME_MAPPING(next, sqlite_next, NULL)
PHP_ME_MAPPING(valid, sqlite_valid, NULL)
PHP_ME_MAPPING(rewind, sqlite_rewind, NULL)
+   /* countable */
+   PHP_ME_MAPPING(count, sqlite_num_rows, NULL)
/* additional */
PHP_ME_MAPPING(prev, sqlite_prev, NULL)
PHP_ME_MAPPING(hasPrev, sqlite_has_prev, NULL)
@@ -1009,11 +1009,16 @@
 #endif 
sqlite_object_handlers_query.get_class_entry = sqlite_get_ce_query;
sqlite_object_handlers_ub_query.get_class_entry = 
sqlite_get_ce_ub_query;
+   sqlite_object_handlers_ub_query.count_elements = sqlite_count_elements;
 
sqlite_ce_ub_query-get_iterator = sqlite_get_iterator;
sqlite_ce_ub_query-iterator_funcs.funcs = 
sqlite_ub_query_iterator_funcs;
 
+#ifdef HAVE_SPL
+   zend_class_implements(sqlite_ce_query TSRMLS_CC, 2, zend_ce_iterator, 
spl_ce_Countable);
+#else
zend_class_implements(sqlite_ce_query TSRMLS_CC, 1, zend_ce_iterator);  
+#endif
sqlite_ce_query-get_iterator = sqlite_get_iterator;
sqlite_ce_query-iterator_funcs.funcs = sqlite_query_iterator_funcs;
 
@@ -1081,7 +1086,7 @@
 {
php_info_print_table_start();

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2005-02-12 Thread Wez Furlong 
wez Sat Feb 12 22:15:12 2005 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  same fix here
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.29r2=1.30ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.29 php-src/ext/sqlite/config.m4:1.30
--- php-src/ext/sqlite/config.m4:1.29   Sun Jan  9 16:05:05 2005
+++ php-src/ext/sqlite/config.m4Sat Feb 12 22:15:11 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.29 2005/01/09 21:05:05 sniper Exp $
+dnl $Id: config.m4,v 1.30 2005/02/13 03:15:11 wez Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -90,7 +90,7 @@

 sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ 
$ext_srcdir/libsqlite/src/sqlite.h.in $ext_srcdir/libsqlite/src/sqlite.h
 
-if test $ext_shared = no; then
+if test $ext_shared = no -o $ext_srcdir != $abs_srcdir; then
   echo '#include php_config.h'  $ext_srcdir/libsqlite/src/config.h
 else
   echo #include \$abs_builddir/config.h\  
$ext_srcdir/libsqlite/src/config.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2004-01-10 Thread Rui Hirokawa 
hirokawaSat Jan 10 21:07:46 2004 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  added utf8 support option for sqlite = 2.8.9.
  
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.22 php-src/ext/sqlite/config.m4:1.23
--- php-src/ext/sqlite/config.m4:1.22   Thu Jan  8 09:24:59 2004
+++ php-src/ext/sqlite/config.m4Sat Jan 10 21:07:46 2004
@@ -1,7 +1,10 @@
-dnl $Id: config.m4,v 1.22 2004/01/08 14:24:59 iliaa Exp $
+dnl $Id: config.m4,v 1.23 2004/01/11 02:07:46 hirokawa Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
+PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: 
ISO-8859-1),
+[  --enable-sqlite-utf8Enable UTF-8 support for SQLite], no, no)
+
 PHP_ARG_WITH(sqlite, for sqlite support,
 [  --with-sqlite   Include sqlite support], yes)
 
@@ -68,11 +71,15 @@
 PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
 AC_CHECK_SIZEOF(char *,4)
 AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
-dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
-dnl which is a bit silly and something we want to avoid
-SQLITE_ENCODING=ISO8859
-dnl SQLITE_ENCODING=UTF-8
-dnl AC_DEFINE(SQLITE_UTF8,1,[if SQLite should use utf-8 encoding])
+dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling 
+dnl in funcs.c uses assert(), which is a bit silly and something 
+dnl we want to avoid. This assert() was removed in SQLite 2.8.9.
+if test $PHP_SQLITE_UTF8 = yes; then
+SQLITE_ENCODING=UTF-8
+AC_DEFINE(SQLITE_UTF8, 1, [ ])
+else
+SQLITE_ENCODING=ISO8859
+fi
 PHP_SUBST(SQLITE_ENCODING)
 
 AC_PATH_PROG(LEMON,lemon,no)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2003-12-28 Thread Rui Hirokawa 
hirokawaSun Dec 28 09:26:57 2003 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  added warning message.
  
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.19 php-src/ext/sqlite/config.m4:1.20
--- php-src/ext/sqlite/config.m4:1.19   Sun Dec 28 09:07:33 2003
+++ php-src/ext/sqlite/config.m4Sun Dec 28 09:26:57 2003
@@ -1,9 +1,9 @@
-dnl $Id: config.m4,v 1.19 2003/12/28 14:07:33 hirokawa Exp $
+dnl $Id: config.m4,v 1.20 2003/12/28 14:26:57 hirokawa Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
 PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: 
ISO-8859-1),
-[  --enable-sqlite-utf8Enable UTF-8 support], no, no)
+[  --enable-sqlite-utf8Enable UTF-8 support (DANGEROUS!)], no, no)
 
 PHP_ARG_WITH(sqlite, for sqlite support,
 [  --with-sqlite   Include sqlite support], yes)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src /ext/sqlite config.m4

2003-12-28 Thread Derick Rethans 
On Sun, 28 Dec 2003, Rui Hirokawa wrote:

 hirokawa  Sun Dec 28 09:07:34 2003 EDT

   Modified files:
 /php-src/ext/sqlite   config.m4
   Log:
   added a option to select character encoding for sqlite.

I think Wez didn't add this on purpose as the UTF-8 support is kinda
'unstable': when an incorrect UTF-8 string is found by sqlite it simply
calls abort()... not very good inside a webserver.

Derick

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2003-12-28 Thread Rui Hirokawa 
hirokawaSun Dec 28 09:38:28 2003 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  revert my previous patch because utf-8 support is still in experimental status.
  
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.20 php-src/ext/sqlite/config.m4:1.21
--- php-src/ext/sqlite/config.m4:1.20   Sun Dec 28 09:26:57 2003
+++ php-src/ext/sqlite/config.m4Sun Dec 28 09:38:28 2003
@@ -1,10 +1,7 @@
-dnl $Id: config.m4,v 1.20 2003/12/28 14:26:57 hirokawa Exp $
+dnl $Id: config.m4,v 1.21 2003/12/28 14:38:28 hirokawa Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
-PHP_ARG_ENABLE(sqlite-utf8, whether to enable UTF-8 support in sqlite (default: 
ISO-8859-1),
-[  --enable-sqlite-utf8Enable UTF-8 support (DANGEROUS!)], no, no)
-
 PHP_ARG_WITH(sqlite, for sqlite support,
 [  --with-sqlite   Include sqlite support], yes)
 
@@ -72,12 +69,9 @@
 AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
 dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
 dnl which is a bit silly and something we want to avoid
-if test $PHP_SQLITE_UTF8 = yes; then
-   SQLITE_ENCODING=UTF-8
-   AC_DEFINE(SQLITE_UTF8, 1, [ ])
-else
-   SQLITE_ENCODING=ISO8859
-fi
+SQLITE_ENCODING=ISO8859
+dnl SQLITE_ENCODING=UTF-8
+dnl AC_DEFINE(SQLITE_UTF8,1,[if SQLite should use utf-8 encoding])
 PHP_SUBST(SQLITE_ENCODING)
 
 AC_PATH_PROG(LEMON,lemon,no)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2003-07-19 Thread Jani Taskinen 
sniper  Sat Jul 19 08:44:46 2003 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  OS_UNIX/OS_WIN are set in the bundled libsqlite sources.
  
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.17 php-src/ext/sqlite/config.m4:1.18
--- php-src/ext/sqlite/config.m4:1.17   Tue Jul  1 09:07:37 2003
+++ php-src/ext/sqlite/config.m4Sat Jul 19 08:44:46 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.17 2003/07/01 13:07:37 wez Exp $
+dnl $Id: config.m4,v 1.18 2003/07/19 12:44:46 sniper Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -67,8 +67,6 @@
 PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
 AC_CHECK_SIZEOF(char *,4)
 AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
-AC_DEFINE(OS_UNIX, 1, [if this is unix])
-AC_DEFINE(OS_WIN, 0, [if this is windows])
 dnl use latin 1 for now; the utf-8 handling in funcs.c uses assert(),
 dnl which is a bit silly and something we want to avoid
 SQLITE_ENCODING=ISO8859



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/sqlite config.m4

2003-06-24 Thread Sterling Hughes 
sterlingTue Jun 24 20:18:01 2003 EDT

  Modified files:  
/php-src/ext/sqlite config.m4 
  Log:
  enable sqlite by default
  
  
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.15 php-src/ext/sqlite/config.m4:1.16
--- php-src/ext/sqlite/config.m4:1.15   Fri Jun  6 18:44:56 2003
+++ php-src/ext/sqlite/config.m4Tue Jun 24 20:18:01 2003
@@ -1,9 +1,9 @@
-dnl $Id: config.m4,v 1.15 2003/06/06 22:44:56 wez Exp $
+dnl $Id: config.m4,v 1.16 2003/06/25 00:18:01 sterling Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
 PHP_ARG_WITH(sqlite, for sqlite support,
-[  --with-sqlite   Include sqlite support])
+[  --with-sqlite   Include sqlite support], yes)
 
 if test $PHP_SQLITE != no; then
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php