summaryrefslogtreecommitdiff
path: root/ext/pdo_sqlite
diff options
context:
space:
mode:
Diffstat (limited to 'ext/pdo_sqlite')
-rw-r--r--ext/pdo_sqlite/config.m410
-rwxr-xr-xext/pdo_sqlite/package.xml177
-rw-r--r--ext/pdo_sqlite/package2.xml187
-rw-r--r--ext/pdo_sqlite/pdo_sqlite.c14
-rw-r--r--ext/pdo_sqlite/php_pdo_sqlite.h8
-rw-r--r--ext/pdo_sqlite/php_pdo_sqlite_int.h8
-rw-r--r--ext/pdo_sqlite/sqlite/VERSION2
-rw-r--r--ext/pdo_sqlite/sqlite/src/pager.c2
-rw-r--r--ext/pdo_sqlite/sqlite/src/parse.c778
-rw-r--r--ext/pdo_sqlite/sqlite_driver.c23
-rw-r--r--ext/pdo_sqlite/sqlite_statement.c8
-rw-r--r--ext/pdo_sqlite/tests/bug35336.phpt4
12 files changed, 624 insertions, 597 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index 7f7d7e5a0..cd9db22b4 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.6 2005/11/01 03:13:32 wez Exp $
+dnl $Id: config.m4,v 1.26.2.8 2005/12/31 00:56:06 sniper Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -85,6 +85,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
$ext_shared,,-I$ext_srcdir/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])
@@ -94,7 +95,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
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 <php_config.h>' > $ext_srcdir/sqlite/src/config.h
else
echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/sqlite/src/config.h
@@ -111,8 +112,11 @@ if test "$PHP_PDO_SQLITE" != "no"; then
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)
diff --git a/ext/pdo_sqlite/package.xml b/ext/pdo_sqlite/package.xml
deleted file mode 100755
index 19ac59893..000000000
--- a/ext/pdo_sqlite/package.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE package SYSTEM "../pear/package.dtd">
-<package version="1.0">
- <name>PDO_SQLITE</name>
- <summary>SQLite v3 Interface driver for PDO</summary>
- <maintainers>
- <maintainer>
- <user>wez</user>
- <name>Wez Furlong</name>
- <email>wez@php.net</email>
- <role>lead</role>
- </maintainer>
- </maintainers>
- <!-- configureoptions>
- <configureoption name="with-pdo-sqlite" prompt="Path to your sqlite3 install"/>
-</configureoptions -->
- <description>
- This extension provides an SQLite v3 driver for PDO.
- SQLite V3 is NOT compatible with the bundled SQLite 2 in PHP 5, but is a significant
- step forwards, featuring complete utf-8 support, native support for blobs,
- native support for prepared statements with bound parameters and improved
- concurrency.
- </description>
- <license>PHP</license>
- <release>
- <state>stable</state>
- <version>1.0</version>
- <date>2005-11-26</date>
-
- <notes>
-You need to install the PDO core module before you can make use of this one.
-This package includes a bundled SQLite 3 library.
-
-Windows binary:
-http://pecl4win.php.net/ext.php/php_pdo_sqlite.dll
-
-- Fixed PECL Bug #5633; build issues
-- Added sqliteCreateFunction() and sqliteCreateAggregate()
-- Fixed PECL Bug #3452; problem when first row of a result set contains a NULL value.
-- Upgraded bundled sqlite to 3.1.3
-- setting PDO_ATTR_TIMEOUT controls the busy timeout
-- Fixed PECL Bug #3391; cannot bind NULL parameters
-- Fixed build problem when building the bundled sqlite library
- </notes>
-
- <filelist>
- <file role="src" name="config.m4"/>
- <file role="src" name="config.w32"/>
- <file role="src" name="pdo_sqlite.c"/>
- <file role="src" name="sqlite_driver.c"/>
- <file role="src" name="sqlite_statement.c"/>
- <file role="src" name="php_pdo_sqlite.h"/>
- <file role="src" name="php_pdo_sqlite_int.h"/>
-
- <file role="doc" name="CREDITS"/>
-
- <dir name="sqlite">
-<file role="src" name="aclocal.m4"/>
-<file role="src" name="config.guess"/>
-<file role="src" name="config.sub"/>
-<file role="src" name="configure"/>
-<file role="src" name="configure.ac"/>
-<file role="src" name="install-sh"/>
-<file role="src" name="ltmain.sh"/>
-<file role="src" name="main.mk"/>
-<file role="src" name="Makefile.in"/>
-<file role="src" name="Makefile.linux-gcc"/>
-<file role="src" name="mkdll.sh"/>
-<file role="src" name="mkopcodec.awk"/>
-<file role="src" name="mkopcodeh.awk"/>
-<file role="src" name="mkso.sh"/>
-<file role="src" name="publish.sh"/>
-<file role="src" name="README"/>
-<file role="src" name="spec.template"/>
-<file role="src" name="sqlite.1"/>
-<file role="src" name="sqlite3.def"/>
-<file role="src" name="sqlite3.pc.in"/>
-<file role="src" name="sqlite.pc.in"/>
-<file role="src" name="VERSION"/>
-<dir name="src">
-<file role="src" name="analyze.c"/>
-<file role="src" name="attach.c"/>
-<file role="src" name="alter.c"/>
-<file role="src" name="auth.c"/>
-<file role="src" name="btree.c"/>
-<file role="src" name="btree.h"/>
-<file role="src" name="build.c"/>
-<file role="src" name="callback.c"/>
-<file role="src" name="date.c"/>
-<file role="src" name="delete.c"/>
-<file role="src" name="expr.c"/>
-<file role="src" name="experimental.c"/>
-<file role="src" name="func.c"/>
-<file role="src" name="hash.c"/>
-<file role="src" name="hash.h"/>
-<file role="src" name="insert.c"/>
-<file role="src" name="legacy.c"/>
-<file role="src" name="main.c"/>
-<file role="src" name="md5.c"/>
-<file role="src" name="keywordhash.h"/>
-<file role="src" name="opcodes.c"/>
-<file role="src" name="opcodes.h"/>
-<file role="src" name="os_common.h"/>
-<file role="src" name="os.h"/>
-<file role="src" name="os_mac.c"/>
-<file role="src" name="os_mac.h"/>
-<file role="src" name="os_test.c"/>
-<file role="src" name="os_test.h"/>
-<file role="src" name="os_unix.c"/>
-<file role="src" name="os_unix.h"/>
-<file role="src" name="os_win.c"/>
-<file role="src" name="os_win.h"/>
-<file role="src" name="pager.c"/>
-<file role="src" name="pager.h"/>
-<file role="src" name="parse.y"/>
-<file role="src" name="parse.c"/>
-<file role="src" name="parse.h"/>
-<file role="src" name="pragma.c"/>
-<file role="src" name="prepare.c"/>
-<file role="src" name="printf.c"/>
-<file role="src" name="random.c"/>
-<file role="src" name="select.c"/>
-<file role="src" name="shell.c"/>
-<file role="src" name="sqlite.h.in"/>
-<file role="src" name="sqliteInt.h"/>
-<file role="src" name="table.c"/>
-<file role="src" name="tclsqlite.c"/>
-<file role="src" name="test1.c"/>
-<file role="src" name="test2.c"/>
-<file role="src" name="test3.c"/>
-<file role="src" name="test4.c"/>
-<file role="src" name="test5.c"/>
-<file role="src" name="tokenize.c"/>
-<file role="src" name="trigger.c"/>
-<file role="src" name="update.c"/>
-<file role="src" name="utf.c"/>
-<file role="src" name="util.c"/>
-<file role="src" name="vacuum.c"/>
-<file role="src" name="vdbeapi.c"/>
-<file role="src" name="vdbeaux.c"/>
-<file role="src" name="vdbe.c"/>
-<file role="src" name="vdbefifo.c"/>
-<file role="src" name="vdbe.h"/>
-<file role="src" name="vdbeInt.h"/>
-<file role="src" name="vdbemem.c"/>
-<file role="src" name="where.c"/>
-</dir>
-
-<dir name="tool">
-<file role="src" name="diffdb.c"/>
-<file role="src" name="lemon.c"/>
-<file role="src" name="lempar.c"/>
-<file role="src" name="memleak2.awk"/>
-<file role="src" name="memleak3.tcl"/>
-<file role="src" name="memleak.awk"/>
-<file role="src" name="mkkeywordhash.c"/>
-<file role="src" name="mkopts.tcl"/>
-<file role="src" name="opcodeDoc.awk"/>
-<file role="src" name="report1.txt"/>
-<file role="src" name="showdb.c"/>
-<file role="src" name="showjournal.c"/>
-<file role="src" name="spaceanal.tcl"/>
-<file role="src" name="space_used.tcl"/>
-<file role="src" name="speedtest2.tcl"/>
-<file role="src" name="speedtest.tcl"/>
-</dir>
-
- </dir>
-
- </filelist>
- <deps>
- <dep type="php" rel="ge" version="5.0.3"/>
- <dep type="ext" rel="ge" name="pdo" version="1.0"/>
- </deps>
- </release>
-</package>
-<!-- vim: se ts=2 sw=2 et: -->
diff --git a/ext/pdo_sqlite/package2.xml b/ext/pdo_sqlite/package2.xml
new file mode 100644
index 000000000..25d6e95dd
--- /dev/null
+++ b/ext/pdo_sqlite/package2.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>PDO_SQLITE</name>
+ <channel>pecl.php.net</channel>
+ <summary>SQLite v3 Interface driver for PDO</summary>
+ <description>This extension provides an SQLite v3 driver for PDO.
+SQLite V3 is NOT compatible with the bundled SQLite 2 in PHP 5, but is a significant
+step forwards, featuring complete utf-8 support, native support for blobs,
+native support for prepared statements with bound parameters and improved
+concurrency.
+
+ </description>
+ <lead>
+ <name>Wez Furlong</name>
+ <user>wez</user>
+ <email>wez@php.net</email>
+ <active>yes</active>
+ </lead>
+ <date>2005-12-04</date>
+ <version>
+ <release>1.0.1</release>
+ <api>1.0.1</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>
+- Upgraded to new package2 format; no code changes in this release
+
+- Fixed PECL Bug #5633; build issues
+- Added sqliteCreateFunction() and sqliteCreateAggregate()
+- Fixed PECL Bug #3452; problem when first row of a result set contains a NULL value.
+- Upgraded bundled sqlite to 3.1.3
+- setting PDO_ATTR_TIMEOUT controls the busy timeout
+- Fixed PECL Bug #3391; cannot bind NULL parameters
+- Fixed build problem when building the bundled sqlite library
+
+Windows binary:
+http://pecl4win.php.net/ext.php/php_pdo_sqlite.dll
+ </notes>
+ <contents>
+ <dir name="/">
+ <dir name="sqlite">
+ <dir name="src">
+ <file name="alter.c" role="src" />
+ <file name="analyze.c" role="src" />
+ <file name="attach.c" role="src" />
+ <file name="auth.c" role="src" />
+ <file name="btree.c" role="src" />
+ <file name="btree.h" role="src" />
+ <file name="build.c" role="src" />
+ <file name="callback.c" role="src" />
+ <file name="date.c" role="src" />
+ <file name="delete.c" role="src" />
+ <file name="experimental.c" role="src" />
+ <file name="expr.c" role="src" />
+ <file name="func.c" role="src" />
+ <file name="hash.c" role="src" />
+ <file name="hash.h" role="src" />
+ <file name="insert.c" role="src" />
+ <file name="keywordhash.h" role="src" />
+ <file name="legacy.c" role="src" />
+ <file name="main.c" role="src" />
+ <file name="md5.c" role="src" />
+ <file name="opcodes.c" role="src" />
+ <file name="opcodes.h" role="src" />
+ <file name="os.h" role="src" />
+ <file name="os_common.h" role="src" />
+ <file name="os_mac.c" role="src" />
+ <file name="os_mac.h" role="src" />
+ <file name="os_test.c" role="src" />
+ <file name="os_test.h" role="src" />
+ <file name="os_unix.c" role="src" />
+ <file name="os_unix.h" role="src" />
+ <file name="os_win.c" role="src" />
+ <file name="os_win.h" role="src" />
+ <file name="pager.c" role="src" />
+ <file name="pager.h" role="src" />
+ <file name="parse.c" role="src" />
+ <file name="parse.h" role="src" />
+ <file name="parse.y" role="src" />
+ <file name="pragma.c" role="src" />
+ <file name="prepare.c" role="src" />
+ <file name="printf.c" role="src" />
+ <file name="random.c" role="src" />
+ <file name="select.c" role="src" />
+ <file name="shell.c" role="src" />
+ <file name="sqlite.h.in" role="src" />
+ <file name="sqliteInt.h" role="src" />
+ <file name="table.c" role="src" />
+ <file name="tclsqlite.c" role="src" />
+ <file name="test1.c" role="src" />
+ <file name="test2.c" role="src" />
+ <file name="test3.c" role="src" />
+ <file name="test4.c" role="src" />
+ <file name="test5.c" role="src" />
+ <file name="tokenize.c" role="src" />
+ <file name="trigger.c" role="src" />
+ <file name="update.c" role="src" />
+ <file name="utf.c" role="src" />
+ <file name="util.c" role="src" />
+ <file name="vacuum.c" role="src" />
+ <file name="vdbe.c" role="src" />
+ <file name="vdbe.h" role="src" />
+ <file name="vdbeapi.c" role="src" />
+ <file name="vdbeaux.c" role="src" />
+ <file name="vdbefifo.c" role="src" />
+ <file name="vdbeInt.h" role="src" />
+ <file name="vdbemem.c" role="src" />
+ <file name="where.c" role="src" />
+ </dir> <!-- //sqlite/src -->
+ <dir name="tool">
+ <file name="diffdb.c" role="src" />
+ <file name="lemon.c" role="src" />
+ <file name="lempar.c" role="src" />
+ <file name="memleak.awk" role="src" />
+ <file name="memleak2.awk" role="src" />
+ <file name="memleak3.tcl" role="src" />
+ <file name="mkkeywordhash.c" role="src" />
+ <file name="mkopts.tcl" role="src" />
+ <file name="opcodeDoc.awk" role="src" />
+ <file name="report1.txt" role="src" />
+ <file name="showdb.c" role="src" />
+ <file name="showjournal.c" role="src" />
+ <file name="spaceanal.tcl" role="src" />
+ <file name="space_used.tcl" role="src" />
+ <file name="speedtest.tcl" role="src" />
+ <file name="speedtest2.tcl" role="src" />
+ </dir> <!-- //sqlite/tool -->
+ <file name="aclocal.m4" role="src" />
+ <file name="config.guess" role="src" />
+ <file name="config.sub" role="src" />
+ <file name="configure" role="src" />
+ <file name="configure.ac" role="src" />
+ <file name="install-sh" role="src" />
+ <file name="ltmain.sh" role="src" />
+ <file name="main.mk" role="src" />
+ <file name="Makefile.in" role="src" />
+ <file name="Makefile.linux-gcc" role="src" />
+ <file name="mkdll.sh" role="src" />
+ <file name="mkopcodec.awk" role="src" />
+ <file name="mkopcodeh.awk" role="src" />
+ <file name="mkso.sh" role="src" />
+ <file name="publish.sh" role="src" />
+ <file name="README" role="src" />
+ <file name="spec.template" role="src" />
+ <file name="sqlite.1" role="src" />
+ <file name="sqlite.pc.in" role="src" />
+ <file name="sqlite3.def" role="src" />
+ <file name="sqlite3.pc.in" role="src" />
+ <file name="VERSION" role="src" />
+ </dir> <!-- //sqlite -->
+ <file name="config.m4" role="src" />
+ <file name="config.w32" role="src" />
+ <file name="CREDITS" role="doc" />
+ <file name="pdo_sqlite.c" role="src" />
+ <file name="php_pdo_sqlite.h" role="src" />
+ <file name="php_pdo_sqlite_int.h" role="src" />
+ <file name="sqlite_driver.c" role="src" />
+ <file name="sqlite_statement.c" role="src" />
+ </dir> <!-- / -->
+ </contents>
+ <dependencies>
+ <required>
+ <php>
+ <min>5.0.3</min>
+ </php>
+ <pearinstaller>
+ <min>1.4.0</min>
+ </pearinstaller>
+ <package>
+ <name>pdo</name>
+ <channel>pecl.php.net</channel>
+ <min>1.0</min>
+ <providesextension>PDO</providesextension>
+ </package>
+ </required>
+ </dependencies>
+ <providesextension>PDO_SQLITE</providesextension>
+ <extsrcrelease />
+</package>
+<!-- vim:se ts=1 sw=1 et: -->
diff --git a/ext/pdo_sqlite/pdo_sqlite.c b/ext/pdo_sqlite/pdo_sqlite.c
index 7e9013168..4f04600ba 100644
--- a/ext/pdo_sqlite/pdo_sqlite.c
+++ b/ext/pdo_sqlite/pdo_sqlite.c
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite.c,v 1.10.2.3 2005/11/26 20:50:08 wez Exp $ */
+/* $Id: pdo_sqlite.c,v 1.10.2.6 2006/01/01 12:50:12 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,10 +31,10 @@
#include "php_pdo_sqlite_int.h"
#include "zend_exceptions.h"
-#define PHP_PDO_SQLITE_MODULE_VERSION "1.0"
+#define PHP_PDO_SQLITE_MODULE_VERSION "1.0.1"
/* {{{ pdo_sqlite_functions[] */
-function_entry pdo_sqlite_functions[] = {
+zend_function_entry pdo_sqlite_functions[] = {
{NULL, NULL, NULL}
};
/* }}} */
@@ -100,7 +100,7 @@ PHP_MINFO_FUNCTION(pdo_sqlite)
"(bundled) "
#endif
PHP_PDO_SQLITE_MODULE_VERSION
- " $Id: pdo_sqlite.c,v 1.10.2.3 2005/11/26 20:50:08 wez Exp $");
+ " $Id: pdo_sqlite.c,v 1.10.2.6 2006/01/01 12:50:12 sniper Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite3_libversion());
php_info_print_table_end();
}
diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h
index dd0f8491b..a5a9fad4c 100644
--- a/ext/pdo_sqlite/php_pdo_sqlite.h
+++ b/ext/pdo_sqlite/php_pdo_sqlite.h
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_sqlite.h,v 1.2 2005/08/03 14:07:39 sniper Exp $ */
+/* $Id: php_pdo_sqlite.h,v 1.2.2.1 2006/01/01 12:50:12 sniper Exp $ */
#ifndef PHP_PDO_SQLITE_H
diff --git a/ext/pdo_sqlite/php_pdo_sqlite_int.h b/ext/pdo_sqlite/php_pdo_sqlite_int.h
index ad2d1d330..2f9c11621 100644
--- a/ext/pdo_sqlite/php_pdo_sqlite_int.h
+++ b/ext/pdo_sqlite/php_pdo_sqlite_int.h
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_sqlite_int.h,v 1.3 2005/06/10 02:50:37 wez Exp $ */
+/* $Id: php_pdo_sqlite_int.h,v 1.3.2.1 2006/01/01 12:50:12 sniper Exp $ */
#ifndef PHP_PDO_SQLITE_INT_H
#define PHP_PDO_SQLITE_INT_H
diff --git a/ext/pdo_sqlite/sqlite/VERSION b/ext/pdo_sqlite/sqlite/VERSION
index 406ebcbd9..f092941a7 100644
--- a/ext/pdo_sqlite/sqlite/VERSION
+++ b/ext/pdo_sqlite/sqlite/VERSION
@@ -1 +1 @@
-3.2.7
+3.2.8
diff --git a/ext/pdo_sqlite/sqlite/src/pager.c b/ext/pdo_sqlite/sqlite/src/pager.c
index 1edfbb4e7..f06d3fec6 100644
--- a/ext/pdo_sqlite/sqlite/src/pager.c
+++ b/ext/pdo_sqlite/sqlite/src/pager.c
@@ -2981,7 +2981,7 @@ void sqlite3pager_dont_write(Pager *pPager, Pgno pgno){
pPg = pager_lookup(pPager, pgno);
pPg->alwaysRollback = 1;
- if( pPg && pPg->dirty ){
+ if( pPg && pPg->dirty && !pPager->stmtInUse ){
if( pPager->dbSize==(int)pPg->pgno && pPager->origDbSize<pPager->dbSize ){
/* If this pages is the last page in the file and the file has grown
** during the current transaction, then do NOT mark the page as clean.
diff --git a/ext/pdo_sqlite/sqlite/src/parse.c b/ext/pdo_sqlite/sqlite/src/parse.c
index 8fe3ccde6..432a262fd 100644
--- a/ext/pdo_sqlite/sqlite/src/parse.c
+++ b/ext/pdo_sqlite/sqlite/src/parse.c
@@ -1,10 +1,10 @@
/* Driver template for the LEMON parser generator.
-** The author disclaims copyright to this source code.
+** The author disclaims copyright to this source code.
*/
/* First off, code is include which follows the "include" declaration
** in the input file. */
#include <stdio.h>
-#line 51 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 51 "ext/pdo_sqlite/sqlite/src/parse.y"
#include "sqliteInt.h"
#include "parse.h"
@@ -43,7 +43,7 @@ struct TrigEvent { int a; IdList * b; };
*/
struct AttachKey { int type; Token key; };
-#line 48 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 48 "ext/pdo_sqlite/sqlite/src/parse.c"
/* Next is all token values, in a form suitable for use by makeheaders.
** This section will be null unless lemon is run with the -m switch.
*/
@@ -1325,9 +1325,9 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){
case 162:
case 195:
case 212:
-#line 370 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 370 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3SelectDelete((yypminor->yy375));}
-#line 1332 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1332 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 176:
case 177:
@@ -1336,9 +1336,9 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){
case 210:
case 216:
case 230:
-#line 629 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 629 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3ExprDelete((yypminor->yy62));}
-#line 1343 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1343 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 181:
case 189:
@@ -1351,43 +1351,43 @@ static void yy_destructor(YYCODETYPE yymajor, YYMINORTYPE *yypminor){
case 219:
case 222:
case 228:
-#line 876 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 876 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3ExprListDelete((yypminor->yy418));}
-#line 1358 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1358 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 194:
case 199:
case 207:
case 208:
-#line 499 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 499 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3SrcListDelete((yypminor->yy151));}
-#line 1366 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1366 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 204:
-#line 561 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 561 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3ExprDelete((yypminor->yy220).pLimit);
sqlite3ExprDelete((yypminor->yy220).pOffset);
}
-#line 1374 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1374 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 211:
case 214:
case 221:
-#line 517 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 517 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3IdListDelete((yypminor->yy240));}
-#line 1381 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1381 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 236:
case 241:
-#line 969 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 969 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3DeleteTriggerStep((yypminor->yy360));}
-#line 1387 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1387 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 238:
-#line 953 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 953 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3IdListDelete((yypminor->yy30).b);}
-#line 1392 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1392 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
default: break; /* If no destructor action specified: do nothing */
}
@@ -1923,34 +1923,34 @@ static void yy_reduce(
** break;
*/
case 3:
-#line 102 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 102 "ext/pdo_sqlite/sqlite/src/parse.y"
{ sqlite3FinishCoding(pParse); }
-#line 1930 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1930 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 6:
-#line 105 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 105 "ext/pdo_sqlite/sqlite/src/parse.y"
{ sqlite3BeginParse(pParse, 0); }
-#line 1935 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1935 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 7:
-#line 107 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 107 "ext/pdo_sqlite/sqlite/src/parse.y"
{ sqlite3BeginParse(pParse, 1); }
-#line 1940 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1940 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 8:
-#line 108 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 108 "ext/pdo_sqlite/sqlite/src/parse.y"
{ sqlite3BeginParse(pParse, 2); }
-#line 1945 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1945 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 9:
-#line 114 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 114 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy280);}
-#line 1950 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1950 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 13:
-#line 119 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 119 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = TK_DEFERRED;}
-#line 1955 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1955 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 14:
case 15:
@@ -1958,27 +1958,27 @@ static void yy_reduce(
case 104:
case 106:
case 107:
-#line 120 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 120 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = yymsp[0].major;}
-#line 1965 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1965 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 17:
case 18:
-#line 123 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 123 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3CommitTransaction(pParse);}
-#line 1971 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1971 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 19:
-#line 125 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 125 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3RollbackTransaction(pParse);}
-#line 1976 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1976 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 21:
-#line 130 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 130 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3StartTable(pParse,&yymsp[-4].minor.yy0,&yymsp[-1].minor.yy198,&yymsp[0].minor.yy198,yymsp[-3].minor.yy280,0);
}
-#line 1983 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1983 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 22:
case 63:
@@ -1986,9 +1986,9 @@ static void yy_reduce(
case 109:
case 224:
case 227:
-#line 135 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 135 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = 1;}
-#line 1993 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 1993 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 23:
case 62:
@@ -1999,40 +1999,40 @@ static void yy_reduce(
case 111:
case 223:
case 226:
-#line 137 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 137 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = 0;}
-#line 2006 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2006 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 24:
-#line 138 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 138 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3EndTable(pParse,&yymsp[-1].minor.yy198,&yymsp[0].minor.yy0,0);
}
-#line 2013 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2013 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 25:
-#line 141 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 141 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3EndTable(pParse,0,0,yymsp[0].minor.yy375);
sqlite3SelectDelete(yymsp[0].minor.yy375);
}
-#line 2021 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2021 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 28:
-#line 153 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 153 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy198.z = yymsp[-2].minor.yy198.z;
yygotominor.yy198.n = (pParse->sLastToken.z-yymsp[-2].minor.yy198.z) + pParse->sLastToken.n;
}
-#line 2029 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2029 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 29:
-#line 157 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 157 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3AddColumn(pParse,&yymsp[0].minor.yy198);
yygotominor.yy198 = yymsp[0].minor.yy198;
}
-#line 2037 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2037 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 30:
case 31:
@@ -2042,14 +2042,14 @@ static void yy_reduce(
case 35:
case 263:
case 264:
-#line 167 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 167 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198 = yymsp[0].minor.yy0;}
-#line 2049 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2049 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 37:
-#line 227 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 227 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddColumnType(pParse,&yymsp[0].minor.yy198);}
-#line 2054 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2054 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 38:
case 41:
@@ -2060,152 +2060,152 @@ static void yy_reduce(
case 251:
case 261:
case 262:
-#line 228 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 228 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198 = yymsp[0].minor.yy198;}
-#line 2067 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2067 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 39:
-#line 229 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 229 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy198.z = yymsp[-3].minor.yy198.z;
yygotominor.yy198.n = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-3].minor.yy198.z;
}
-#line 2075 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2075 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 40:
-#line 233 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 233 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy198.z = yymsp[-5].minor.yy198.z;
yygotominor.yy198.n = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-5].minor.yy198.z;
}
-#line 2083 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2083 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 42:
-#line 239 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 239 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198.z=yymsp[-1].minor.yy198.z; yygotominor.yy198.n=yymsp[0].minor.yy198.n+(yymsp[0].minor.yy198.z-yymsp[-1].minor.yy198.z);}
-#line 2088 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2088 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 43:
-#line 241 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 241 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = atoi(yymsp[0].minor.yy198.z); }
-#line 2093 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2093 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 44:
-#line 242 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 242 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = -atoi(yymsp[0].minor.yy198.z); }
-#line 2098 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2098 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 49:
case 51:
-#line 251 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 251 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddDefaultValue(pParse,yymsp[0].minor.yy62);}
-#line 2104 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2104 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 50:
-#line 252 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 252 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddDefaultValue(pParse,yymsp[-1].minor.yy62);}
-#line 2109 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2109 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 52:
-#line 254 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 254 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *p = sqlite3Expr(TK_UMINUS, yymsp[0].minor.yy62, 0, 0);
sqlite3AddDefaultValue(pParse,p);
}
-#line 2117 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2117 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 53:
-#line 258 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 258 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *p = sqlite3Expr(TK_STRING, 0, 0, &yymsp[0].minor.yy198);
sqlite3AddDefaultValue(pParse,p);
}
-#line 2125 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2125 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 55:
-#line 267 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 267 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddNotNull(pParse, yymsp[0].minor.yy280);}
-#line 2130 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2130 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 56:
-#line 269 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 269 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy280,yymsp[0].minor.yy280);}
-#line 2135 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2135 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 57:
-#line 270 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 270 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3CreateIndex(pParse,0,0,0,0,yymsp[0].minor.yy280,0,0);}
-#line 2140 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2140 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 58:
-#line 271 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 271 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3ExprDelete(yymsp[-2].minor.yy62);}
-#line 2145 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2145 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 59:
-#line 273 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 273 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy198,yymsp[-1].minor.yy418,yymsp[0].minor.yy280);}
-#line 2150 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2150 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 60:
-#line 274 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 274 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy280);}
-#line 2155 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2155 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 61:
-#line 275 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 275 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddCollateType(pParse, yymsp[0].minor.yy198.z, yymsp[0].minor.yy198.n);}
-#line 2160 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2160 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 64:
-#line 288 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 288 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = OE_Restrict * 0x010101; }
-#line 2165 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2165 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 65:
-#line 289 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 289 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = (yymsp[-1].minor.yy280 & yymsp[0].minor.yy359.mask) | yymsp[0].minor.yy359.value; }
-#line 2170 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2170 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 66:
-#line 291 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 291 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy359.value = 0; yygotominor.yy359.mask = 0x000000; }
-#line 2175 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2175 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 67:
-#line 292 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 292 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy359.value = yymsp[0].minor.yy280; yygotominor.yy359.mask = 0x0000ff; }
-#line 2180 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2180 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 68:
-#line 293 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 293 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy359.value = yymsp[0].minor.yy280<<8; yygotominor.yy359.mask = 0x00ff00; }
-#line 2185 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2185 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 69:
-#line 294 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 294 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy359.value = yymsp[0].minor.yy280<<16; yygotominor.yy359.mask = 0xff0000; }
-#line 2190 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2190 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 70:
-#line 296 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 296 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = OE_SetNull; }
-#line 2195 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2195 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 71:
-#line 297 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 297 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = OE_SetDflt; }
-#line 2200 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2200 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 72:
-#line 298 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 298 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = OE_Cascade; }
-#line 2205 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2205 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 73:
-#line 299 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 299 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = OE_Restrict; }
-#line 2210 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2210 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 74:
case 75:
@@ -2214,92 +2214,92 @@ static void yy_reduce(
case 94:
case 95:
case 166:
-#line 301 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 301 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = yymsp[0].minor.yy280;}
-#line 2221 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2221 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 79:
-#line 311 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 311 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198.n = 0; yygotominor.yy198.z = 0;}
-#line 2226 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2226 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 80:
-#line 312 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 312 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198 = yymsp[-1].minor.yy0;}
-#line 2231 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2231 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 85:
-#line 318 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 318 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy418,yymsp[0].minor.yy280,yymsp[-2].minor.yy280);}
-#line 2236 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2236 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 86:
-#line 320 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 320 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3CreateIndex(pParse,0,0,0,yymsp[-2].minor.yy418,yymsp[0].minor.yy280,0,0);}
-#line 2241 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2241 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 88:
-#line 323 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 323 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy418, &yymsp[-3].minor.yy198, yymsp[-2].minor.yy418, yymsp[-1].minor.yy280);
sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy280);
}
-#line 2249 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2249 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 91:
case 93:
-#line 337 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 337 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_Default;}
-#line 2255 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2255 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 96:
-#line 342 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 342 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_Ignore;}
-#line 2260 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2260 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 97:
case 167:
-#line 343 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 343 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_Replace;}
-#line 2266 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2266 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 98:
-#line 347 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 347 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3DropTable(pParse, yymsp[0].minor.yy151, 0);
}
-#line 2273 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2273 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 99:
-#line 354 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 354 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3CreateView(pParse, &yymsp[-6].minor.yy0, &yymsp[-3].minor.yy198, &yymsp[-2].minor.yy198, yymsp[0].minor.yy375, yymsp[-5].minor.yy280);
}
-#line 2280 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2280 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 100:
-#line 357 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 357 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3DropTable(pParse, yymsp[0].minor.yy151, 1);
}
-#line 2287 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2287 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 101:
-#line 364 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 364 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3Select(pParse, yymsp[0].minor.yy375, SRT_Callback, 0, 0, 0, 0, 0);
sqlite3SelectDelete(yymsp[0].minor.yy375);
}
-#line 2295 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2295 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 102:
case 126:
-#line 374 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 374 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy375 = yymsp[0].minor.yy375;}
-#line 2301 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2301 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 103:
-#line 376 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 376 "ext/pdo_sqlite/sqlite/src/parse.y"
{
if( yymsp[0].minor.yy375 ){
yymsp[0].minor.yy375->op = yymsp[-1].minor.yy280;
@@ -2307,87 +2307,87 @@ static void yy_reduce(
}
yygotominor.yy375 = yymsp[0].minor.yy375;
}
-#line 2312 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2312 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 105:
-#line 385 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 385 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = TK_ALL;}
-#line 2317 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2317 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 108:
-#line 390 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 390 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy375 = sqlite3SelectNew(yymsp[-6].minor.yy418,yymsp[-5].minor.yy151,yymsp[-4].minor.yy62,yymsp[-3].minor.yy418,yymsp[-2].minor.yy62,yymsp[-1].minor.yy418,yymsp[-7].minor.yy280,yymsp[0].minor.yy220.pLimit,yymsp[0].minor.yy220.pOffset);
}
-#line 2324 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2324 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 112:
case 248:
-#line 411 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 411 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = yymsp[-1].minor.yy418;}
-#line 2330 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2330 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 113:
case 140:
case 150:
case 247:
-#line 412 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 412 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = 0;}
-#line 2338 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2338 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 114:
-#line 413 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 413 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-2].minor.yy418,yymsp[-1].minor.yy62,yymsp[0].minor.yy198.n?&yymsp[0].minor.yy198:0);
}
-#line 2345 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2345 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 115:
-#line 416 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 416 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-1].minor.yy418, sqlite3Expr(TK_ALL, 0, 0, 0), 0);
}
-#line 2352 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2352 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 116:
-#line 419 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 419 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *pRight = sqlite3Expr(TK_ALL, 0, 0, 0);
Expr *pLeft = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy198);
yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-3].minor.yy418, sqlite3Expr(TK_DOT, pLeft, pRight, 0), 0);
}
-#line 2361 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2361 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 119:
-#line 431 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 431 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198.n = 0;}
-#line 2366 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2366 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 120:
-#line 443 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 443 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy151 = sqliteMalloc(sizeof(*yygotominor.yy151));}
-#line 2371 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2371 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 121:
-#line 444 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 444 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy151 = yymsp[0].minor.yy151;}
-#line 2376 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2376 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 122:
-#line 449 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 449 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy151 = yymsp[-1].minor.yy151;
if( yygotominor.yy151 && yygotominor.yy151->nSrc>0 ) yygotominor.yy151->a[yygotominor.yy151->nSrc-1].jointype = yymsp[0].minor.yy280;
}
-#line 2384 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2384 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 123:
-#line 453 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 453 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy151 = 0;}
-#line 2389 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2389 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 124:
-#line 454 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 454 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy151 = sqlite3SrcListAppend(yymsp[-5].minor.yy151,&yymsp[-4].minor.yy198,&yymsp[-3].minor.yy198);
if( yymsp[-2].minor.yy198.n ) sqlite3SrcListAddAlias(yygotominor.yy151,&yymsp[-2].minor.yy198);
@@ -2400,10 +2400,10 @@ static void yy_reduce(
else { sqlite3IdListDelete(yymsp[0].minor.yy240); }
}
}
-#line 2405 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2405 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 125:
-#line 468 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 468 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy151 = sqlite3SrcListAppend(yymsp[-6].minor.yy151,0,0);
yygotominor.yy151->a[yygotominor.yy151->nSrc-1].pSelect = yymsp[-4].minor.yy375;
@@ -2417,45 +2417,45 @@ static void yy_reduce(
else { sqlite3IdListDelete(yymsp[0].minor.yy240); }
}
}
-#line 2422 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2422 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 127:
-#line 489 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 489 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy375 = sqlite3SelectNew(0,yymsp[0].minor.yy151,0,0,0,0,0,0,0);
}
-#line 2429 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2429 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 128:
-#line 495 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 495 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198.z=0; yygotominor.yy198.n=0;}
-#line 2434 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2434 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 130:
-#line 500 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 500 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy151 = sqlite3SrcListAppend(0,&yymsp[-1].minor.yy198,&yymsp[0].minor.yy198);}
-#line 2439 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2439 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 131:
case 132:
-#line 504 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 504 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = JT_INNER; }
-#line 2445 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2445 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 133:
-#line 506 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 506 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
-#line 2450 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2450 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 134:
-#line 507 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 507 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy198,0); }
-#line 2455 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2455 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 135:
-#line 509 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 509 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy198,&yymsp[-1].minor.yy198); }
-#line 2460 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2460 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 136:
case 144:
@@ -2466,9 +2466,9 @@ static void yy_reduce(
case 236:
case 238:
case 242:
-#line 513 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 513 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = yymsp[0].minor.yy62;}
-#line 2473 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2473 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 137:
case 152:
@@ -2477,163 +2477,163 @@ static void yy_reduce(
case 237:
case 239:
case 243:
-#line 514 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 514 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = 0;}
-#line 2484 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2484 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 138:
case 171:
-#line 518 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 518 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy240 = yymsp[-1].minor.yy240;}
-#line 2490 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2490 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 139:
case 170:
-#line 519 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 519 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy240 = 0;}
-#line 2496 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2496 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 141:
case 151:
-#line 530 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 530 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = yymsp[0].minor.yy418;}
-#line 2502 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2502 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 142:
-#line 531 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 531 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-4].minor.yy418,yymsp[-2].minor.yy62,yymsp[-1].minor.yy198.n>0?&yymsp[-1].minor.yy198:0);
if( yygotominor.yy418 ) yygotominor.yy418->a[yygotominor.yy418->nExpr-1].sortOrder = yymsp[0].minor.yy280;
}
-#line 2510 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2510 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 143:
-#line 535 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 535 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy418 = sqlite3ExprListAppend(0,yymsp[-2].minor.yy62,yymsp[-1].minor.yy198.n>0?&yymsp[-1].minor.yy198:0);
if( yygotominor.yy418 && yygotominor.yy418->a ) yygotominor.yy418->a[0].sortOrder = yymsp[0].minor.yy280;
}
-#line 2518 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2518 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 145:
case 147:
-#line 544 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 544 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = SQLITE_SO_ASC;}
-#line 2524 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2524 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 146:
-#line 545 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 545 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = SQLITE_SO_DESC;}
-#line 2529 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2529 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 148:
-#line 547 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 547 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy198.z = 0; yygotominor.yy198.n = 0;}
-#line 2534 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2534 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 154:
-#line 565 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 565 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy220.pLimit = 0; yygotominor.yy220.pOffset = 0;}
-#line 2539 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2539 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 155:
-#line 566 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 566 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy220.pLimit = yymsp[0].minor.yy62; yygotominor.yy220.pOffset = 0;}
-#line 2544 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2544 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 156:
-#line 568 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 568 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy220.pLimit = yymsp[-2].minor.yy62; yygotominor.yy220.pOffset = yymsp[0].minor.yy62;}
-#line 2549 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2549 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 157:
-#line 570 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 570 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy220.pOffset = yymsp[-2].minor.yy62; yygotominor.yy220.pLimit = yymsp[0].minor.yy62;}
-#line 2554 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2554 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 158:
-#line 574 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 574 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3DeleteFrom(pParse,yymsp[-1].minor.yy151,yymsp[0].minor.yy62);}
-#line 2559 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2559 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 161:
-#line 585 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 585 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Update(pParse,yymsp[-3].minor.yy151,yymsp[-1].minor.yy418,yymsp[0].minor.yy62,yymsp[-4].minor.yy280);}
-#line 2564 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2564 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 162:
-#line 591 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 591 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-4].minor.yy418,yymsp[0].minor.yy62,&yymsp[-2].minor.yy198);}
-#line 2569 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2569 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 163:
-#line 592 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 592 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = sqlite3ExprListAppend(0,yymsp[0].minor.yy62,&yymsp[-2].minor.yy198);}
-#line 2574 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2574 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 164:
-#line 598 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 598 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Insert(pParse, yymsp[-5].minor.yy151, yymsp[-1].minor.yy418, 0, yymsp[-4].minor.yy240, yymsp[-7].minor.yy280);}
-#line 2579 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2579 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 165:
-#line 600 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 600 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Insert(pParse, yymsp[-2].minor.yy151, 0, yymsp[0].minor.yy375, yymsp[-1].minor.yy240, yymsp[-4].minor.yy280);}
-#line 2584 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2584 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 168:
case 240:
-#line 610 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 610 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-2].minor.yy418,yymsp[0].minor.yy62,0);}
-#line 2590 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2590 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 169:
case 241:
-#line 611 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 611 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy418 = sqlite3ExprListAppend(0,yymsp[0].minor.yy62,0);}
-#line 2596 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2596 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 172:
-#line 620 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 620 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy240 = sqlite3IdListAppend(yymsp[-2].minor.yy240,&yymsp[0].minor.yy198);}
-#line 2601 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2601 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 173:
-#line 621 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 621 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy240 = sqlite3IdListAppend(0,&yymsp[0].minor.yy198);}
-#line 2606 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2606 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 175:
-#line 632 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 632 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = yymsp[-1].minor.yy62; sqlite3ExprSpan(yygotominor.yy62,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0); }
-#line 2611 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2611 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 176:
case 181:
case 182:
case 183:
case 184:
-#line 633 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 633 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = sqlite3Expr(yymsp[0].major, 0, 0, &yymsp[0].minor.yy0);}
-#line 2620 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2620 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 177:
case 178:
-#line 634 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 634 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy0);}
-#line 2626 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2626 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 179:
-#line 636 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 636 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *temp1 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy198);
Expr *temp2 = sqlite3Expr(TK_ID, 0, 0, &yymsp[0].minor.yy198);
yygotominor.yy62 = sqlite3Expr(TK_DOT, temp1, temp2, 0);
}
-#line 2635 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2635 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 180:
-#line 641 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 641 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *temp1 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-4].minor.yy198);
Expr *temp2 = sqlite3Expr(TK_ID, 0, 0, &yymsp[-2].minor.yy198);
@@ -2641,32 +2641,32 @@ static void yy_reduce(
Expr *temp4 = sqlite3Expr(TK_DOT, temp2, temp3, 0);
yygotominor.yy62 = sqlite3Expr(TK_DOT, temp1, temp4, 0);
}
-#line 2646 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2646 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 185:
-#line 652 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 652 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = sqlite3RegisterExpr(pParse, &yymsp[0].minor.yy0);}
-#line 2651 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2651 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 186:
-#line 653 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 653 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Token *pToken = &yymsp[0].minor.yy0;
Expr *pExpr = yygotominor.yy62 = sqlite3Expr(TK_VARIABLE, 0, 0, pToken);
sqlite3ExprAssignVarNumber(pParse, pExpr);
}
-#line 2660 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2660 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 187:
-#line 659 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 659 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_CAST, yymsp[-3].minor.yy62, 0, &yymsp[-1].minor.yy198);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);
}
-#line 2668 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2668 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 188:
-#line 664 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 664 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3ExprFunction(yymsp[-1].minor.yy418, &yymsp[-4].minor.yy0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
@@ -2674,25 +2674,25 @@ static void yy_reduce(
yygotominor.yy62->flags |= EP_Distinct;
}
}
-#line 2679 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2679 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 189:
-#line 671 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 671 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3ExprFunction(0, &yymsp[-3].minor.yy0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
}
-#line 2687 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2687 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 190:
-#line 675 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 675 "ext/pdo_sqlite/sqlite/src/parse.y"
{
/* The CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP values are
** treated as functions that return constants */
yygotominor.yy62 = sqlite3ExprFunction(0,&yymsp[0].minor.yy0);
if( yygotominor.yy62 ) yygotominor.yy62->op = TK_CONST_FUNC;
}
-#line 2697 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2697 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 191:
case 192:
@@ -2712,22 +2712,22 @@ static void yy_reduce(
case 206:
case 207:
case 208:
-#line 681 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 681 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy62 = sqlite3Expr(yymsp[-1].major, yymsp[-2].minor.yy62, yymsp[0].minor.yy62, 0);}
-#line 2719 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2719 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 209:
-#line 700 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 700 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy222.operator = yymsp[0].minor.yy0; yygotominor.yy222.not = 0;}
-#line 2724 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2724 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 210:
-#line 701 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 701 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy222.operator = yymsp[0].minor.yy0; yygotominor.yy222.not = 1;}
-#line 2729 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2729 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 213:
-#line 705 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 705 "ext/pdo_sqlite/sqlite/src/parse.y"
{
ExprList *pList = sqlite3ExprListAppend(0, yymsp[-1].minor.yy62, 0);
pList = sqlite3ExprListAppend(pList, yymsp[-3].minor.yy62, 0);
@@ -2738,75 +2738,75 @@ static void yy_reduce(
if( yymsp[-2].minor.yy222.not ) yygotominor.yy62 = sqlite3Expr(TK_NOT, yygotominor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62, &yymsp[-3].minor.yy62->span, &yymsp[-1].minor.yy62->span);
}
-#line 2743 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2743 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 214:
-#line 716 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 716 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_ISNULL, yymsp[-1].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-1].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2751 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2751 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 215:
-#line 720 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 720 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_ISNULL, yymsp[-2].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-2].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2759 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2759 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 216:
-#line 724 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 724 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_NOTNULL, yymsp[-1].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-1].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2767 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2767 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 217:
-#line 728 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 728 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_NOTNULL, yymsp[-2].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-2].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2775 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2775 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 218:
-#line 732 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 732 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_NOTNULL, yymsp[-3].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-3].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2783 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2783 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 219:
case 220:
-#line 736 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 736 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(yymsp[-1].major, yymsp[0].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy62->span);
}
-#line 2792 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2792 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 221:
-#line 744 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 744 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_UMINUS, yymsp[0].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy62->span);
}
-#line 2800 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2800 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 222:
-#line 748 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 748 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_UPLUS, yymsp[0].minor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy62->span);
}
-#line 2808 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2808 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 225:
-#line 755 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 755 "ext/pdo_sqlite/sqlite/src/parse.y"
{
ExprList *pList = sqlite3ExprListAppend(0, yymsp[-2].minor.yy62, 0);
pList = sqlite3ExprListAppend(pList, yymsp[0].minor.yy62, 0);
@@ -2819,10 +2819,10 @@ static void yy_reduce(
if( yymsp[-3].minor.yy280 ) yygotominor.yy62 = sqlite3Expr(TK_NOT, yygotominor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-4].minor.yy62->span,&yymsp[0].minor.yy62->span);
}
-#line 2824 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2824 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 228:
-#line 771 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 771 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_IN, yymsp[-4].minor.yy62, 0, 0);
if( yygotominor.yy62 ){
@@ -2833,10 +2833,10 @@ static void yy_reduce(
if( yymsp[-3].minor.yy280 ) yygotominor.yy62 = sqlite3Expr(TK_NOT, yygotominor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-4].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2838 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2838 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 229:
-#line 781 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 781 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_SELECT, 0, 0, 0);
if( yygotominor.yy62 ){
@@ -2846,10 +2846,10 @@ static void yy_reduce(
}
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
}
-#line 2851 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2851 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 230:
-#line 790 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 790 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_IN, yymsp[-4].minor.yy62, 0, 0);
if( yygotominor.yy62 ){
@@ -2860,10 +2860,10 @@ static void yy_reduce(
if( yymsp[-3].minor.yy280 ) yygotominor.yy62 = sqlite3Expr(TK_NOT, yygotominor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-4].minor.yy62->span,&yymsp[0].minor.yy0);
}
-#line 2865 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2865 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 231:
-#line 800 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 800 "ext/pdo_sqlite/sqlite/src/parse.y"
{
SrcList *pSrc = sqlite3SrcListAppend(0,&yymsp[-1].minor.yy198,&yymsp[0].minor.yy198);
yygotominor.yy62 = sqlite3Expr(TK_IN, yymsp[-3].minor.yy62, 0, 0);
@@ -2875,10 +2875,10 @@ static void yy_reduce(
if( yymsp[-2].minor.yy280 ) yygotominor.yy62 = sqlite3Expr(TK_NOT, yygotominor.yy62, 0, 0);
sqlite3ExprSpan(yygotominor.yy62,&yymsp[-3].minor.yy62->span,yymsp[0].minor.yy198.z?&yymsp[0].minor.yy198:&yymsp[-1].minor.yy198);
}
-#line 2880 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2880 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 232:
-#line 811 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 811 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *p = yygotominor.yy62 = sqlite3Expr(TK_EXISTS, 0, 0, 0);
if( p ){
@@ -2888,10 +2888,10 @@ static void yy_reduce(
sqlite3SelectDelete(yymsp[-1].minor.yy375);
}
}
-#line 2893 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2893 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 233:
-#line 823 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 823 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_CASE, yymsp[-3].minor.yy62, yymsp[-1].minor.yy62, 0);
if( yygotominor.yy62 ){
@@ -2901,46 +2901,46 @@ static void yy_reduce(
}
sqlite3ExprSpan(yygotominor.yy62, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0);
}
-#line 2906 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2906 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 234:
-#line 834 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 834 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-4].minor.yy418, yymsp[-2].minor.yy62, 0);
yygotominor.yy418 = sqlite3ExprListAppend(yygotominor.yy418, yymsp[0].minor.yy62, 0);
}
-#line 2914 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2914 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 235:
-#line 838 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 838 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy418 = sqlite3ExprListAppend(0, yymsp[-2].minor.yy62, 0);
yygotominor.yy418 = sqlite3ExprListAppend(yygotominor.yy418, yymsp[0].minor.yy62, 0);
}
-#line 2922 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2922 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 244:
-#line 863 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 863 "ext/pdo_sqlite/sqlite/src/parse.y"
{
if( yymsp[-9].minor.yy280!=OE_None ) yymsp[-9].minor.yy280 = yymsp[0].minor.yy280;
if( yymsp[-9].minor.yy280==OE_Default) yymsp[-9].minor.yy280 = OE_Abort;
sqlite3CreateIndex(pParse, &yymsp[-7].minor.yy198, &yymsp[-6].minor.yy198, sqlite3SrcListAppend(0,&yymsp[-4].minor.yy198,0),yymsp[-2].minor.yy418,yymsp[-9].minor.yy280, &yymsp[-10].minor.yy0, &yymsp[-1].minor.yy0);
}
-#line 2931 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2931 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 245:
case 292:
-#line 870 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 870 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_Abort;}
-#line 2937 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2937 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 246:
-#line 871 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 871 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_None;}
-#line 2942 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2942 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 249:
-#line 881 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 881 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *p = 0;
if( yymsp[-1].minor.yy198.n>0 ){
@@ -2949,10 +2949,10 @@ static void yy_reduce(
}
yygotominor.yy418 = sqlite3ExprListAppend(yymsp[-4].minor.yy418, p, &yymsp[-2].minor.yy198);
}
-#line 2954 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2954 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 250:
-#line 889 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 889 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Expr *p = 0;
if( yymsp[-1].minor.yy198.n>0 ){
@@ -2961,256 +2961,256 @@ static void yy_reduce(
}
yygotominor.yy418 = sqlite3ExprListAppend(0, p, &yymsp[-2].minor.yy198);
}
-#line 2966 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2966 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 252:
-#line 902 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 902 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3DropIndex(pParse, yymsp[0].minor.yy151);}
-#line 2971 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2971 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 253:
case 254:
-#line 906 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 906 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Vacuum(pParse,0);}
-#line 2977 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2977 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 255:
case 257:
-#line 912 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 912 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Pragma(pParse,&yymsp[-3].minor.yy198,&yymsp[-2].minor.yy198,&yymsp[0].minor.yy198,0);}
-#line 2983 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2983 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 256:
-#line 913 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 913 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Pragma(pParse,&yymsp[-3].minor.yy198,&yymsp[-2].minor.yy198,&yymsp[0].minor.yy0,0);}
-#line 2988 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2988 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 258:
-#line 915 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 915 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3Pragma(pParse,&yymsp[-3].minor.yy198,&yymsp[-2].minor.yy198,&yymsp[0].minor.yy198,1);
}
-#line 2995 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 2995 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 259:
-#line 918 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 918 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Pragma(pParse,&yymsp[-4].minor.yy198,&yymsp[-3].minor.yy198,&yymsp[-1].minor.yy198,0);}
-#line 3000 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3000 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 260:
-#line 919 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 919 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Pragma(pParse,&yymsp[-1].minor.yy198,&yymsp[0].minor.yy198,0,0);}
-#line 3005 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3005 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 267:
-#line 932 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 932 "ext/pdo_sqlite/sqlite/src/parse.y"
{
Token all;
all.z = yymsp[-3].minor.yy198.z;
all.n = (yymsp[0].minor.yy0.z - yymsp[-3].minor.yy198.z) + yymsp[0].minor.yy0.n;
sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy360, &all);
}
-#line 3015 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3015 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 268:
-#line 941 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 941 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3BeginTrigger(pParse, &yymsp[-7].minor.yy198, &yymsp[-6].minor.yy198, yymsp[-5].minor.yy280, yymsp[-4].minor.yy30.a, yymsp[-4].minor.yy30.b, yymsp[-2].minor.yy151, yymsp[-1].minor.yy280, yymsp[0].minor.yy62, yymsp[-9].minor.yy280);
yygotominor.yy198 = (yymsp[-6].minor.yy198.n==0?yymsp[-7].minor.yy198:yymsp[-6].minor.yy198);
}
-#line 3023 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3023 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 269:
case 272:
-#line 947 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 947 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = TK_BEFORE; }
-#line 3029 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3029 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 270:
-#line 948 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 948 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = TK_AFTER; }
-#line 3034 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3034 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 271:
-#line 949 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 949 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = TK_INSTEAD;}
-#line 3039 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3039 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 273:
case 274:
case 275:
-#line 954 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 954 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy30.a = yymsp[0].major; yygotominor.yy30.b = 0;}
-#line 3046 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3046 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 276:
-#line 957 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 957 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy30.a = TK_UPDATE; yygotominor.yy30.b = yymsp[0].minor.yy240;}
-#line 3051 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3051 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 277:
case 278:
-#line 960 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 960 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = TK_ROW; }
-#line 3057 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3057 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 279:
-#line 962 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 962 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy280 = TK_STATEMENT; }
-#line 3062 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3062 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 280:
-#line 965 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 965 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy62 = 0; }
-#line 3067 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3067 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 281:
-#line 966 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 966 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy62 = yymsp[0].minor.yy62; }
-#line 3072 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3072 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 282:
-#line 970 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 970 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yymsp[-2].minor.yy360->pNext = yymsp[0].minor.yy360;
yygotominor.yy360 = yymsp[-2].minor.yy360;
}
-#line 3080 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3080 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 283:
-#line 974 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 974 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy360 = 0; }
-#line 3085 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3085 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 284:
-#line 980 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 980 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy360 = sqlite3TriggerUpdateStep(&yymsp[-3].minor.yy198, yymsp[-1].minor.yy418, yymsp[0].minor.yy62, yymsp[-4].minor.yy280); }
-#line 3090 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3090 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 285:
-#line 985 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 985 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy360 = sqlite3TriggerInsertStep(&yymsp[-5].minor.yy198, yymsp[-4].minor.yy240, yymsp[-1].minor.yy418, 0, yymsp[-7].minor.yy280);}
-#line 3095 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3095 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 286:
-#line 988 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 988 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy360 = sqlite3TriggerInsertStep(&yymsp[-2].minor.yy198, yymsp[-1].minor.yy240, 0, yymsp[0].minor.yy375, yymsp[-4].minor.yy280);}
-#line 3100 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3100 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 287:
-#line 992 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 992 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy360 = sqlite3TriggerDeleteStep(&yymsp[-1].minor.yy198, yymsp[0].minor.yy62);}
-#line 3105 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3105 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 288:
-#line 995 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 995 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy360 = sqlite3TriggerSelectStep(yymsp[0].minor.yy375); }
-#line 3110 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3110 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 289:
-#line 998 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 998 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_RAISE, 0, 0, 0);
yygotominor.yy62->iColumn = OE_Ignore;
sqlite3ExprSpan(yygotominor.yy62, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0);
}
-#line 3119 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3119 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 290:
-#line 1003 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1003 "ext/pdo_sqlite/sqlite/src/parse.y"
{
yygotominor.yy62 = sqlite3Expr(TK_RAISE, 0, 0, &yymsp[-1].minor.yy198);
yygotominor.yy62->iColumn = yymsp[-3].minor.yy280;
sqlite3ExprSpan(yygotominor.yy62, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0);
}
-#line 3128 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3128 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 291:
-#line 1011 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1011 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_Rollback;}
-#line 3133 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3133 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 293:
-#line 1013 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1013 "ext/pdo_sqlite/sqlite/src/parse.y"
{yygotominor.yy280 = OE_Fail;}
-#line 3138 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3138 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 294:
-#line 1018 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1018 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3DropTrigger(pParse,yymsp[0].minor.yy151);
}
-#line 3145 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3145 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 295:
-#line 1024 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1024 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3Attach(pParse, &yymsp[-3].minor.yy198, &yymsp[-1].minor.yy198, yymsp[0].minor.yy361.type, &yymsp[0].minor.yy361.key);
}
-#line 3152 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3152 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 296:
-#line 1028 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1028 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy361.type = 0; }
-#line 3157 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3157 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 297:
-#line 1029 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1029 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy361.type=1; yygotominor.yy361.key = yymsp[0].minor.yy198; }
-#line 3162 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3162 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 298:
-#line 1030 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1030 "ext/pdo_sqlite/sqlite/src/parse.y"
{ yygotominor.yy361.type=2; yygotominor.yy361.key = yymsp[0].minor.yy0; }
-#line 3167 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3167 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 301:
-#line 1036 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1036 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3Detach(pParse, &yymsp[0].minor.yy198);
}
-#line 3174 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3174 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 302:
-#line 1042 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1042 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Reindex(pParse, 0, 0);}
-#line 3179 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3179 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 303:
-#line 1043 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1043 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Reindex(pParse, &yymsp[-1].minor.yy198, &yymsp[0].minor.yy198);}
-#line 3184 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3184 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 304:
-#line 1048 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1048 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Analyze(pParse, 0, 0);}
-#line 3189 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3189 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 305:
-#line 1049 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1049 "ext/pdo_sqlite/sqlite/src/parse.y"
{sqlite3Analyze(pParse, &yymsp[-1].minor.yy198, &yymsp[0].minor.yy198);}
-#line 3194 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3194 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 306:
-#line 1054 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1054 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy151,&yymsp[0].minor.yy198);
}
-#line 3201 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3201 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 307:
-#line 1057 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1057 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3AlterFinishAddColumn(pParse, &yymsp[0].minor.yy198);
}
-#line 3208 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3208 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
case 308:
-#line 1060 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 1060 "ext/pdo_sqlite/sqlite/src/parse.y"
{
sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy151);
}
-#line 3215 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3215 "ext/pdo_sqlite/sqlite/src/parse.c"
break;
};
yygoto = yyRuleInfo[yyruleno].lhs;
@@ -3267,7 +3267,7 @@ static void yy_syntax_error(
){
sqlite3ParserARG_FETCH;
#define TOKEN (yyminor.yy0)
-#line 34 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.y"
+#line 34 "ext/pdo_sqlite/sqlite/src/parse.y"
if( pParse->zErrMsg==0 ){
if( TOKEN.z[0] ){
@@ -3276,7 +3276,7 @@ static void yy_syntax_error(
sqlite3ErrorMsg(pParse, "incomplete SQL statement");
}
}
-#line 3282 "/home/rei/php_dev/php5.1/ext/pdo_sqlite/sqlite/src/parse.c"
+#line 3282 "ext/pdo_sqlite/sqlite/src/parse.c"
sqlite3ParserARG_STORE; /* Suppress warning about unused %extra_argument variable */
}
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
index 763018aca..8caba37aa 100644
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_driver.c,v 1.20.2.1 2005/09/20 19:52:24 iliaa Exp $ */
+/* $Id: sqlite_driver.c,v 1.20.2.5 2006/01/01 12:50:12 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -42,7 +42,10 @@ int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int li
einfo->line = line;
if (einfo->errcode != SQLITE_OK) {
- einfo->errmsg = (char*)sqlite3_errmsg(H->db);
+ if (einfo->errmsg) {
+ pefree(einfo->errmsg, dbh->is_persistent);
+ }
+ einfo->errmsg = pestrdup((char*)sqlite3_errmsg(H->db), dbh->is_persistent);
} else { /* no error */
strcpy(*pdo_err, PDO_ERR_NONE);
return 0;
@@ -133,11 +136,17 @@ static int sqlite_handle_closer(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
pdo_sqlite_db_handle *H = (pdo_sqlite_db_handle *)dbh->driver_data;
if (H) {
+ pdo_sqlite_error_info *einfo = &H->einfo;
+
pdo_sqlite_cleanup_callbacks(H TSRMLS_CC);
if (H->db) {
sqlite3_close(H->db);
H->db = NULL;
}
+ if (einfo->errmsg) {
+ pefree(einfo->errmsg, dbh->is_persistent);
+ einfo->errmsg = NULL;
+ }
pefree(H, dbh->is_persistent);
dbh->driver_data = NULL;
}
@@ -584,13 +593,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
RETURN_FALSE;
}
/* }}} */
-static function_entry dbh_methods[] = {
+static zend_function_entry dbh_methods[] = {
PHP_ME(SQLite, sqliteCreateFunction, NULL, ZEND_ACC_PUBLIC)
PHP_ME(SQLite, sqliteCreateAggregate, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
-static function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
+static zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC)
{
switch (kind) {
case PDO_DBH_DRIVER_METHOD_KIND_DBH:
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c
index c0e759e8b..15110772c 100644
--- a/ext/pdo_sqlite/sqlite_statement.c
+++ b/ext/pdo_sqlite/sqlite_statement.c
@@ -2,12 +2,12 @@
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997-2005 The PHP Group |
+ | Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_0.txt. |
+ | http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.3 2005/09/29 19:57:13 helly Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.4 2006/01/01 12:50:12 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/ext/pdo_sqlite/tests/bug35336.phpt b/ext/pdo_sqlite/tests/bug35336.phpt
index 9fe77e19b..59dbda38b 100644
--- a/ext/pdo_sqlite/tests/bug35336.phpt
+++ b/ext/pdo_sqlite/tests/bug35336.phpt
@@ -1,5 +1,9 @@
--TEST--
Bug #35336 (crash on PDO::FETCH_CLASS + __set())
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
+?>
--FILE--
<?php
class EEE {
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-12 00:07:56 +0000