[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.m4 sqlite_statement.c /ext/pdo_sqlite/tests bug_42589.phpt /ext/sqlite3 config0.m4

2009-01-12 Thread Scott MacVicar 
scottmacTue Jan 13 02:50:23 2009 UTC

  Added files: 
/php-src/ext/pdo_sqlite/tests   bug_42589.phpt 

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 sqlite_statement.c 
/php-src/ext/sqlite3config0.m4 
  Log:
  Add table key to getColumnMeta() with SQLite
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.41&r2=1.42&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.41 
php-src/ext/pdo_sqlite/config.m4:1.42
--- php-src/ext/pdo_sqlite/config.m4:1.41   Mon Jan 12 19:02:41 2009
+++ php-src/ext/pdo_sqlite/config.m4Tue Jan 13 02:50:22 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.41 2009/01/12 19:02:41 scottmac Exp $
+dnl $Id: config.m4,v 1.42 2009/01/13 02:50:22 scottmac Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -79,7 +79,7 @@
 threadsafe_flags="-DSQLITE_THREADSAFE=0"
   fi
 
-  other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+  other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 
-DSQLITE_ENABLE_COLUMN_METADATA=1"
 
   if test "$PHP_SQLITE3" != "yes"; then
 PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.27 
php-src/ext/pdo_sqlite/sqlite_statement.c:1.28
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.27  Wed Dec 31 11:12:34 2008
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Tue Jan 13 02:50:23 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: sqlite_statement.c,v 1.27 2008/12/31 11:12:34 sebastian Exp $ */
+/* $Id: sqlite_statement.c,v 1.28 2009/01/13 02:50:23 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -323,6 +323,13 @@
add_assoc_string(return_value, "sqlite:decl_type", str, 1);
}
 
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
+   str = sqlite3_column_table_name(S->stmt, colno);
+   if (str) {
+   add_assoc_string(return_value, "table", str, 1);
+   }
+#endif
+
add_assoc_zval(return_value, "flags", flags);
 
return SUCCESS;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config0.m4?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/sqlite3/config0.m4
diff -u php-src/ext/sqlite3/config0.m4:1.8 php-src/ext/sqlite3/config0.m4:1.9
--- php-src/ext/sqlite3/config0.m4:1.8  Mon Dec 22 16:42:34 2008
+++ php-src/ext/sqlite3/config0.m4  Tue Jan 13 02:50:23 2009
@@ -1,4 +1,4 @@
-dnl $Id: config0.m4,v 1.8 2008/12/22 16:42:34 scottmac Exp $
+dnl $Id: config0.m4,v 1.9 2009/01/13 02:50:23 scottmac Exp $
 dnl config.m4 for extension sqlite3
 dnl vim:et:ts=2:sw=2
 
@@ -67,7 +67,7 @@
   debug_flags="-DSQLITE_DEBUG=1"
 fi
 
-other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1"
+other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1 
-DSQLITE_ENABLE_COLUMN_METADATA=1"
 
 PHP_SQLITE3_CFLAGS="-...@ext_srcdir@/libsqlite 
-...@ext_builddir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
   fi

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug_42589.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug_42589.phpt
+++ php-src/ext/pdo_sqlite/tests/bug_42589.phpt
--TEST--
PDO SQLite Feature Request #42589 (getColumnMeta() should also return table 
name)
--SKIPIF--

--FILE--
exec('CREATE TABLE test (field1 VARCHAR(10))');
$db->exec('INSERT INTO test VALUES("test")');

$result = $db->query('SELECT * FROM test t1 LEFT JOIN test t2 ON t1.field1 = 
t2.field1');
$meta1 = $result->getColumnMeta(0);
$meta2 = $result->getColumnMeta(1);

var_dump(!empty($meta1[b'table']) && $meta1[b'table'] == b'test');
var_dump(!empty($meta2[b'table']) && $meta2[b'table'] == b'test');
?>
--EXPECTF--
bool(true)
bool(true)



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

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

2009-01-12 Thread Scott MacVicar 
scottmacMon Jan 12 19:02:41 2009 UTC

  Removed files:   
/php-src/ext/sqlite3config.m4 

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  Fix building of pdo_sqlite without sqlite3
  
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.40 
php-src/ext/pdo_sqlite/config.m4:1.41
--- php-src/ext/pdo_sqlite/config.m4:1.40   Fri Aug  1 12:02:40 2008
+++ php-src/ext/pdo_sqlite/config.m4Mon Jan 12 19:02:41 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.40 2008/08/01 12:02:40 scottmac Exp $
+dnl $Id: config.m4,v 1.41 2009/01/12 19:02:41 scottmac Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -81,6 +81,10 @@
 
   other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
 
+  if test "$PHP_SQLITE3" != "yes"; then
+PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c)
+  fi
+
   PHP_NEW_EXTENSION(pdo_sqlite,
 $php_pdo_sqlite_sources_core,
 $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags 
-I$pdo_inc_path)



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

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

2008-08-01 Thread Scott MacVicar 
scottmacFri Aug  1 12:02:40 2008 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  MFB: Make pdo_sqlite use the bundled extension with sqlite3
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.39&r2=1.40&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.39 
php-src/ext/pdo_sqlite/config.m4:1.40
--- php-src/ext/pdo_sqlite/config.m4:1.39   Fri Jul 25 13:38:41 2008
+++ php-src/ext/pdo_sqlite/config.m4Fri Aug  1 12:02:40 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.39 2008/07/25 13:38:41 jani Exp $
+dnl $Id: config.m4,v 1.40 2008/08/01 12:02:40 scottmac Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -72,21 +72,22 @@
 PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
 PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, 
$ext_shared,,-I$pdo_inc_path)
   else
-# use bundled libs
-pdo_sqlite_sources="libsqlite/sqlite3.c"
-
+  # use bundled libs
   if test "$enable_maintainer_zts" = "yes"; then
-threadsafe_flag="-DSQLITE_THREADSAFE=1"
+threadsafe_flags="-DSQLITE_THREADSAFE=1"
   else
-threadsafe_flag="-DSQLITE_THREADSAFE=0"
+threadsafe_flags="-DSQLITE_THREADSAFE=0"
   fi
 
+  other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+
   PHP_NEW_EXTENSION(pdo_sqlite,
-$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
-$ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 
$threadsafe_flag -I$pdo_inc_path)
+$php_pdo_sqlite_sources_core,
+$ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags 
-I$pdo_inc_path)
 
   PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
-  PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1)
+  PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3)
+  PHP_ADD_INCLUDE($abs_srcdir/ext/sqlite3/libsqlite)
  
   AC_CHECK_FUNCS(usleep nanosleep)
   AC_CHECK_HEADERS(time.h)



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

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

2008-07-24 Thread Scott MacVicar 
scottmacThu Jul 24 14:20:51 2008 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 config.w32 
  Log:
  Remove non existent defines, change THREADSAFE to SQLITE_THREADSAFE and sync 
with 5.3
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.37&r2=1.38&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.37 
php-src/ext/pdo_sqlite/config.m4:1.38
--- php-src/ext/pdo_sqlite/config.m4:1.37   Thu Jul 24 01:01:42 2008
+++ php-src/ext/pdo_sqlite/config.m4Thu Jul 24 14:20:51 2008
@@ -1,15 +1,14 @@
-dnl $Id: config.m4,v 1.37 2008/07/24 01:01:42 scottmac Exp $
+dnl $Id: config.m4,v 1.38 2008/07/24 14:20:51 scottmac Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
 if test "$PHP_PDO" != "no"; then
 
-PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
+PHP_ARG_WITH(pdo-sqlite, for sqlite 3 support for PDO,
 [  --without-pdo-sqlite[=DIR]
 PDO: sqlite 3 support.  DIR is the sqlite base
 install directory [BUNDLED]], yes)
 
-
 if test "$PHP_PDO_SQLITE" != "no"; then
 
   ifdef([PHP_CHECK_PDO_INCLUDES],
@@ -74,18 +73,21 @@
 # use bundled libs
 pdo_sqlite_sources="libsqlite/sqlite3.c"
 
-if test "$enable_maintainer_zts" = "yes"; then
-  threadsafe_flag="-DTHREADSAFE=1"
-else
-  threadsafe_flag="-DTHREADSAFE=0"
-fi
+  if test "$enable_maintainer_zts" = "yes"; then
+threadsafe_flag="-DSQLITE_THREADSAFE=1"
+  else
+threadsafe_flag="-DSQLITE_THREADSAFE=0"
+  fi
 
   PHP_NEW_EXTENSION(pdo_sqlite,
 $php_pdo_sqlite_sources_core $pdo_sqlite_sources,
-$ext_shared,,[EMAIL PROTECTED]@/libsqlite -DPDO_SQLITE_BUNDLED=1 
-DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path)
+$ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 
$threadsafe_flag -I$pdo_inc_path)
 
   PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
   PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1)
+ 
+  AC_CHECK_FUNCS(usleep nanosleep)
+  AC_CHECK_HEADERS(time.h)
   fi
 
   dnl Solaris fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.w32?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/pdo_sqlite/config.w32
diff -u php-src/ext/pdo_sqlite/config.w32:1.11 
php-src/ext/pdo_sqlite/config.w32:1.12
--- php-src/ext/pdo_sqlite/config.w32:1.11  Thu Jul 24 11:24:26 2008
+++ php-src/ext/pdo_sqlite/config.w32   Thu Jul 24 14:20:51 2008
@@ -1,13 +1,23 @@
-// $Id: config.w32,v 1.11 2008/07/24 11:24:26 scottmac Exp $
+// $Id: config.w32,v 1.12 2008/07/24 14:20:51 scottmac Exp $
 // vim:ft=javascript
 
 ARG_WITH("pdo-sqlite", "for pdo_sqlite support", "no");
 
 if (PHP_PDO_SQLITE != "no") {
-
-   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_OMIT_CURSOR /DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
+   EXTENSION("pdo_sqlite", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/DSQLITE_THREADSAFE=1 /I" + 
configure_module_dirname + "/libsqlite /I" + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", 
"pdo_sqlite");
 
ADD_EXTENSION_DEP('pdo_sqlite', 'pdo');
 }
 
+ARG_WITH("pdo-sqlite-external", "for pdo_sqlite support from an external dll", 
"no");
+if (PHP_PDO_SQLITE_EXTERNAL != "no") {
+   if (CHECK_HEADER_ADD_INCLUDE("sqlite3.h", "CFLAGS_PDO_SQLITE_EXTERNAL", 
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\include\\sqlite3") &&
+   CHECK_LIB("sqlite3-import.lib", "pdo_sqlite_external", 
PHP_PDO_SQLITE_EXTERNAL + ";" + PHP_PHP_BUILD + "\\lib")
+   && ADD_EXTENSION_DEP('pdo_sqlite_external', 'pdo') ) {
+   EXTENSION("pdo_sqlite_external", "pdo_sqlite.c sqlite_driver.c 
sqlite_statement.c", null, "/I" + configure_module_dirname, null, 
"ext\\pdo_sqlite_external");
+   } else {
+   WARNING("pdo-sqlite-external support can't be enabled, 
libraries or headers are missing")
+   PHP_PDO_SQLITE_EXTERNAL = "no"
+   }
+}



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

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

2007-06-25 Thread Jani Taskinen 
sniper  Mon Jun 25 16:26:19 2007 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  - Fixed bug #41794 (build fails with external libs under Solaris)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.33&r2=1.34&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.33 
php-src/ext/pdo_sqlite/config.m4:1.34
--- php-src/ext/pdo_sqlite/config.m4:1.33   Thu Feb 15 20:53:26 2007
+++ php-src/ext/pdo_sqlite/config.m4Mon Jun 25 16:26:19 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.33 2007/02/15 20:53:26 nlopess Exp $
+dnl $Id: config.m4,v 1.34 2007/06/25 16:26:19 sniper Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -112,11 +112,11 @@
 EOF
   AC_CHECK_FUNCS(usleep nanosleep)
   AC_CHECK_HEADERS(time.h)
-  
-  dnl Solaris fix
-  PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, 
PDO_SQLITE_SHARED_LIBADD)])
   fi
 
+  dnl Solaris fix
+  PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, 
PDO_SQLITE_SHARED_LIBADD)])
+
   ifdef([PHP_ADD_EXTENSION_DEP],
   [
 PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)

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

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

2007-02-15 Thread Nuno Lopes 
nlopess Thu Feb 15 20:53:26 2007 UTC

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  MFB: fix build on cygwin with windows-style EOLs
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.32&r2=1.33&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.32 
php-src/ext/pdo_sqlite/config.m4:1.33
--- php-src/ext/pdo_sqlite/config.m4:1.32   Sat Dec 23 18:00:49 2006
+++ php-src/ext/pdo_sqlite/config.m4Thu Feb 15 20:53:26 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.32 2006/12/23 18:00:49 derick Exp $
+dnl $Id: config.m4,v 1.33 2007/02/15 20:53:26 nlopess Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -89,7 +89,7 @@
   PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
   AC_CHECK_SIZEOF(char *,4)
   AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
-  PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
+  PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION | sed 's/[^0-9.]//g'`
   PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. 
'{printf("%d%03d%03d", $1, $2, $3)}'`
   sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$ext_srcdir/sqlite/src/sqlite.h.in > $ext_builddir/sqlite/src/sqlite3.h
 

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

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

2005-12-30 Thread Jani Taskinen 
sniper  Sat Dec 31 00:53:21 2005 EDT

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  - Fixed bug #35377 (undefined reference to "fdatasync")
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.29 
php-src/ext/pdo_sqlite/config.m4:1.30
--- php-src/ext/pdo_sqlite/config.m4:1.29   Sun Nov 27 23:00:55 2005
+++ php-src/ext/pdo_sqlite/config.m4Sat Dec 31 00:53:21 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.29 2005/11/27 23:00:55 tony2001 Exp $
+dnl $Id: config.m4,v 1.30 2005/12/31 00:53:21 sniper Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -85,6 +85,7 @@
 $php_pdo_sqlite_sources_core $pdo_sqlite_sources,
 $ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1 
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
 
+  PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
   PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
   AC_CHECK_SIZEOF(char *,4)
   AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
@@ -111,8 +112,11 @@
 EOF
   AC_CHECK_FUNCS(usleep nanosleep)
   AC_CHECK_HEADERS(time.h)
-
+  
+  dnl Solaris fix
+  PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, 
PDO_SQLITE_SHARED_LIBADD)])
   fi
+
   ifdef([PHP_ADD_EXTENSION_DEP],
   [
 PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)

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

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

2005-11-27 Thread Antony Dovgal 
tony2001Sun Nov 27 18:00:55 2005 EDT

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  MF51: use || instead of -o to support weird systems with old `test`
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.28&r2=1.29&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.28 
php-src/ext/pdo_sqlite/config.m4:1.29
--- php-src/ext/pdo_sqlite/config.m4:1.28   Sat Sep 24 19:22:44 2005
+++ php-src/ext/pdo_sqlite/config.m4Sun Nov 27 18:00:55 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.28 2005/09/24 23:22:44 sniper Exp $
+dnl $Id: config.m4,v 1.29 2005/11/27 23:00:55 tony2001 Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -94,7 +94,7 @@
 
   touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 
-  if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
+  if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
 echo '#include ' > $ext_srcdir/sqlite/src/config.h
   else
 echo "#include \"$abs_builddir/config.h\"" > 
$ext_srcdir/sqlite/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/pdo_sqlite config.m4

2005-07-29 Thread Ilia Alshanetsky 
iliaa   Fri Jul 29 16:41:53 2005 EDT

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  Fixed sqlite build, sqlite3.h was not being correctly generated.
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.25&r2=1.26&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.25 
php-src/ext/pdo_sqlite/config.m4:1.26
--- php-src/ext/pdo_sqlite/config.m4:1.25   Fri Jul 29 05:50:15 2005
+++ php-src/ext/pdo_sqlite/config.m4Fri Jul 29 16:41:52 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.25 2005/07/29 09:50:15 sniper Exp $
+dnl $Id: config.m4,v 1.26 2005/07/29 20:41:52 iliaa Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -90,7 +90,7 @@
   AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
   PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
   PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. 
'{printf("%d%03d%03d", $1, $2, $3)}'`
-  sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$abs_srcdir/sqlite/src/sqlite.h.in > $ext_builddir/sqlite/src/sqlite3.h
+  sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$ext_srcdir/sqlite/src/sqlite.h.in > $ext_builddir/sqlite/src/sqlite3.h
 
   touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 

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

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

2005-07-29 Thread Jani Taskinen 
sniper  Fri Jul 29 05:50:17 2005 EDT

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  fix VPATH builds
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.24&r2=1.25&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.24 
php-src/ext/pdo_sqlite/config.m4:1.25
--- php-src/ext/pdo_sqlite/config.m4:1.24   Wed Jul 27 07:53:00 2005
+++ php-src/ext/pdo_sqlite/config.m4Fri Jul 29 05:50:15 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.24 2005/07/27 11:53:00 wez Exp $
+dnl $Id: config.m4,v 1.25 2005/07/29 09:50:15 sniper Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -90,7 +90,7 @@
   AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
   PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
   PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. 
'{printf("%d%03d%03d", $1, $2, $3)}'`
-  sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$abs_srcdir/sqlite/src/sqlite.h.in > $abs_srcdir/sqlite/src/sqlite3.h
+  sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$abs_srcdir/sqlite/src/sqlite.h.in > $ext_builddir/sqlite/src/sqlite3.h
 
   touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 

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

[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.m4 post-bundle.sh

2005-07-27 Thread Wez Furlong 
wez Wed Jul 27 07:53:00 2005 EDT

  Added files: 
/php-src/ext/pdo_sqlite post-bundle.sh 

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  fixup the build in HEAD again... moved the maintainer only stuff out of the
  config.m4 and into a separate script to make it cleaner
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.23&r2=1.24&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.23 
php-src/ext/pdo_sqlite/config.m4:1.24
--- php-src/ext/pdo_sqlite/config.m4:1.23   Wed Jul 27 00:07:11 2005
+++ php-src/ext/pdo_sqlite/config.m4Wed Jul 27 07:53:00 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.23 2005/07/27 04:07:11 wez Exp $
+dnl $Id: config.m4,v 1.24 2005/07/27 11:53:00 wez Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -91,19 +91,8 @@
   PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
   PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. 
'{printf("%d%03d%03d", $1, $2, $3)}'`
   sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e 
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ 
$abs_srcdir/sqlite/src/sqlite.h.in > $abs_srcdir/sqlite/src/sqlite3.h
-  if ! test -f $abs_srcdir/sqlite/src/parse.h ; then
-dnl maintainer can comment this line out when upgrading the bundled 
library
-dnl and reinstate it when done
-AC_MSG_ERROR([this package is broken])
-$CC -o $abs_srcdir/sqlite/tool/lemon $abs_srcdir/sqlite/tool/lemon.c
-$abs_srcdir/sqlite/tool/lemon $abs_srcdir/sqlite/src/parse.y
-cat $abs_srcdir/sqlite/src/parse.h $abs_srcdir/sqlite/src/vdbe.c | 
$AWK -f $abs_srcdir/sqlite/mkopcodeh.awk > $abs_srcdir/sqlite/src/opcodes.h
-sort -n +2 $abs_srcdir/sqlite/src/opcodes.h | $AWK -f 
$abs_srcdir/sqlite/mkopcodec.awk > $abs_srcdir/sqlite/src/opcodes.c
-$CC -o $abs_srcdir/sqlite/tool/mkkeywordhash 
$abs_srcdir/sqlite/tool/mkkeywordhash.c
-$abs_srcdir/sqlite/tool/mkkeywordhash > 
$abs_srcdir/sqlite/src/keywordhash.h
-  else
-touch $abs_srcdir/sqlite/src/parse.c $abs_srcdir/sqlite/src/parse.h
-  fi
+
+  touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h
 
   if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
 echo '#include ' > $ext_srcdir/sqlite/src/config.h

http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/post-bundle.sh?r=1.1&p=1
Index: php-src/ext/pdo_sqlite/post-bundle.sh
+++ php-src/ext/pdo_sqlite/post-bundle.sh
#!/bin/sh

# Run this script after updating the bundled sqlite library

cc -o sqlite/tool/lemon sqlite/tool/lemon.c../sqlite/tool/lemon 
sqlite/src/parse.y
cat sqlite/src/parse.h sqlite/src/vdbe.c | awk -f sqlite/mkopcodeh.awk > 
sqlite/src/opcodes.h
sort -n +2 sqlite/src/opcodes.h | awk -f sqlite/mkopcodec.awk > 
sqlite/src/opcodes.c
cc -o sqlite/tool/mkkeywordhash 
sqlite/tool/mkkeywordhash.c../sqlite/tool/mkkeywordhash > 
sqlite/src/keywordhash.h

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

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

2005-02-27 Thread Wez Furlong 
wez Sun Feb 27 22:21:52 2005 EDT

  Added files: 
/php-src/ext/pdo_sqlite/sqlite/src  keywordhash.h 

  Modified files:  
/php-src/ext/pdo_sqlite config.m4 
  Log:
  juggle around a bit; commit generated file
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.10 
php-src/ext/pdo_sqlite/config.m4:1.11
--- php-src/ext/pdo_sqlite/config.m4:1.10   Sun Feb 27 00:20:18 2005
+++ php-src/ext/pdo_sqlite/config.m4Sun Feb 27 22:21:52 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.10 2005/02/27 05:20:18 wez Exp $
+dnl $Id: config.m4,v 1.11 2005/02/28 03:21:52 wez Exp $
 dnl config.m4 for extension pdo_sqlite
 dnl vim:et:sw=2:ts=2:
 
@@ -92,7 +92,7 @@
  cat $ext_srcdir/sqlite/src/parse.h $ext_srcdir/sqlite/src/vdbe.c 
| awk -f $ext_srcdir/sqlite/mkopcodeh.awk > $ext_srcdir/sqlite/src/opcodes.h
 sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | awk -f 
$ext_srcdir/sqlite/mkopcodec.awk > $ext_srcdir/sqlite/src/opcodes.c
 $CC -o $ext_srcdir/sqlite/tool/mkkeywordhash 
$ext_srcdir/sqlite/tool/mkkeywordhash.c
-$ext_srcdir/sqlite/tool/mkkeywordhash > $ext_srcdir/keywordhash.h
+$ext_srcdir/sqlite/tool/mkkeywordhash > 
$ext_srcdir/sqlite/src/keywordhash.h
   fi
 
   if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then

http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h?r=1.1&p=1
Index: php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h
+++ php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h
/* Hash score: 148 */
static int keywordCode(const char *z, int n){
  static const char zText[504] =
"ABORTABLEFTEMPORARYAFTERAISELECTHENDATABASEACHECKEYALTEREFERENCES"
"CAPELSEXCEPTRANSACTIONATURALIKEXCLUSIVEXISTSTATEMENTRIGGEREINDEX"
"PLAINITIALLYANDEFAULTATTACHAVINGLOBEFOREIGNORENAMEAUTOINCREMENT"
"BEGINNEREPLACEBETWEENOTNULLIMITBYCASCADEFERRABLECASECOLLATECOMMIT"
"CONFLICTCONSTRAINTERSECTCREATECROSSCURRENT_DATECURRENT_TIMESTAMP"
"RAGMATCHDEFERREDELETEDESCDETACHDISTINCTDROPRIMARYFAILFROMFULL"
"GROUPDATEIMMEDIATEINSERTINSTEADINTOFFSETISNULLJOINORDERESTRICT"
"OUTERIGHTROLLBACKROWHENUNIONUNIQUEUSINGVACUUMVALUESVIEWHERE";
  static const unsigned char aHash[127] = {
  87,  78,  99,  86,   0,   4,   0,   0, 106,   0,  72,   0,   0,
  90,  43,   0,  88,   0,  98, 101,  92,   0,   0,   9,   0,   0,
 105,   0, 102,  96,   0,  10,  46,   0,  40,   0,   0,  61,  66,
   0,  60,  14,   0,   0,  35,  80,   0, 100,  69,   0,   0,  26,
   0,  73,  59,   0,  12,   0, 107,  37,  11,   0,  75,  39,  20,
   0,   0,   0,  34,  79,  51,  33,  48,  15,  84,   0,  36,   0,
  70,  21,   0,  67,   0,   0,   0,   0,  45,  62,  17,  83,  32,
  64,  82,   0,   1,   0,  13,  50,  56,   8,   0, 104,  71,  94,
  52,   6,  55,   0,   0,  47,  89,   0,  97,   0,  65,   0,   0,
  23,   0, 108,  49,  54,   0,   2,  53,   0, 103,
  };
  static const unsigned char aNext[108] = {
   0,   0,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,
   0,   0,   0,   7,   0,   0,   0,   0,   0,   0,   0,  18,   5,
   0,   0,   0,   0,   0,   0,   0,   0,   0,  27,   0,   0,   0,
   0,   0,   0,   0,   0,  42,   0,   0,   0,   0,   0,   0,   0,
  24,   0,   0,  44,   0,   0,   0,  30,  57,   0,   0,   0,   0,
   0,   0,   0,  68,  41,   0,   0,   0,   0,  19,  58,  16,   0,
  77,   0,  63,   0,  81,  31,   0,   0,   0,   0,   0,   0,   0,
  38,  91,  93,   0,   0,  95,  22,  29,  76,   0,  25,  85,   0,
  28,   0,  74,   0,
  };
  static const unsigned char aLen[108] = {
   5,   5,   4,   4,   9,   2,   5,   5,   6,   4,   3,   8,   2,
   4,   5,   3,   5,  10,   6,   4,   6,  11,   2,   7,   4,   9,
   6,   9,   7,   7,   5,   7,   9,   3,   3,   7,   6,   6,   4,
   6,   3,   7,   6,   6,  13,   2,   2,   5,   5,   7,   7,   3,
   7,   4,   5,   2,   7,   3,  10,   4,   7,   6,   8,  10,   9,
   6,   5,  12,  12,  17,   6,   5,   8,   6,   4,   6,   8,   2,
   4,   7,   4,   4,   4,   5,   6,   9,   6,   7,   4,   2,   6,
   3,   6,   4,   5,   8,   5,   5,   8,   3,   4,   5,   6,   5,
   6,   6,   4,   5,
  };
  static const unsigned short int aOffset[108] = {
   0,   4,   7,  10,  10,  14,  19,  23,  26,  31,  33,  35,  40,
  42,  44,  48,  51,  55,  63,  68,  71,  76,  85,  86,  92,  95,
 103, 108, 116, 122, 124, 127, 132, 137, 141, 143, 150, 155, 160,
 163, 165, 165, 169, 173, 179, 181, 183, 192, 195, 199, 206, 212,
 212, 215, 218, 223, 225, 226, 230, 240, 244, 251, 257, 265, 272,
 281, 287, 292, 304, 304, 320, 324, 329, 336, 342, 346, 352, 353,
 360, 363, 370, 374, 378, 382, 385, 391, 400, 406, 413, 416, 416,
 419, 422, 428, 432, 436, 444, 448, 453, 461, 463, 467, 472, 478,
 483, 489, 495, 498,
  };
  static const unsigned char aCode[108] = {