Update sqlite3 module to match current version of pysqlite.

gerhard.haering · gerhard.haering · commit c3f5f9203ef2 · 2008-03-28T20:08:36.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@62011 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/sqlite3/test/factory.py b/Lib/sqlite3/test/factory.py
@@ -1,7 +1,7 @@
 #-*- coding: ISO-8859-1 -*-
 # pysqlite2/test/factory.py: tests for the various factories in pysqlite
 #
-# Copyright (C) 2005 Gerhard H�ring <gh@ghaering.de>
+# Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
 #
 # This file is part of pysqlite.
 #
diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py
@@ -2,7 +2,7 @@
 # pysqlite2/test/userfunctions.py: tests for user-defined functions and
 #                                  aggregates.
 #
-# Copyright (C) 2005 Gerhard H�ring <gh@ghaering.de>
+# Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
 #
 # This file is part of pysqlite.
 #
diff --git a/Modules/_sqlite/cache.c b/Modules/_sqlite/cache.c
@@ -1,6 +1,6 @@
 /* cache .c - a LRU cache
  *
- * Copyright (C) 2004-2006 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2004-2007 Gerhard H�ring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *
diff --git a/Modules/_sqlite/cache.h b/Modules/_sqlite/cache.h
@@ -1,6 +1,6 @@
 /* cache.h - definitions for the LRU cache
  *
- * Copyright (C) 2004-2006 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2004-2007 Gerhard H�ring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -424,10 +424,14 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
     PyObject* descriptor;
     PyObject* second_argument = NULL;
     long rowcount = 0;
+    int allow_8bit_chars;
 
     if (!pysqlite_check_thread(self->connection) || !pysqlite_check_connection(self->connection)) {
         return NULL;
     }
+    /* Make shooting yourself in the foot with not utf-8 decodable 8-bit-strings harder */
+    allow_8bit_chars = ((self->connection->text_factory != (PyObject*)&PyUnicode_Type) &&
+        (self->connection->text_factory != (PyObject*)&PyUnicode_Type && pysqlite_OptimizedUnicode));
 
     Py_XDECREF(self->next_row);
     self->next_row = NULL;
@@ -592,7 +596,7 @@ PyObject* _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject*
 
         pysqlite_statement_mark_dirty(self->statement);
 
-        pysqlite_statement_bind_parameters(self->statement, parameters);
+        pysqlite_statement_bind_parameters(self->statement, parameters, allow_8bit_chars);
         if (PyErr_Occurred()) {
             goto error;
         }
diff --git a/Modules/_sqlite/prepare_protocol.h b/Modules/_sqlite/prepare_protocol.h
@@ -1,6 +1,6 @@
 /* prepare_protocol.h - the protocol for preparing values for SQLite
  *
- * Copyright (C) 2005 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
@@ -1,6 +1,6 @@
 /* row.h - an enhanced tuple for database rows
  *
- * Copyright (C) 2005 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
@@ -96,7 +96,7 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con
     return rc;
 }
 
-int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter)
+int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter, int allow_8bit_chars)
 {
     int rc = SQLITE_OK;
     long longval;
@@ -108,6 +108,7 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec
     Py_ssize_t buflen;
     PyObject* stringval;
     parameter_type paramtype;
+    char* c;
 
     if (parameter == Py_None) {
         rc = sqlite3_bind_null(self->st, pos);
@@ -140,6 +141,17 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec
         paramtype = TYPE_UNKNOWN;
     }
 
+    if (paramtype == TYPE_STRING && !allow_8bit_chars) {
+        string = PyString_AS_STRING(parameter);
+        for (c = string; *c != 0; c++) {
+            if (*c & 0x80) {
+                PyErr_SetString(pysqlite_ProgrammingError, "You must not use 8-bit bytestrings unless you use a text_factory that can interpret 8-bit bytestrings (like text_factory = str). It is highly recommended that you instead just switch your application to Unicode strings.");
+                rc = -1;
+                goto final;
+            }
+        }
+    }
+
     switch (paramtype) {
         case TYPE_INT:
             longval = PyInt_AsLong(parameter);
@@ -197,7 +209,7 @@ static int _need_adapt(PyObject* obj)
     }
 }
 
-void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters)
+void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters, int allow_8bit_chars)
 {
     PyObject* current_param;
     PyObject* adapted;
@@ -251,11 +263,13 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
                 }
             }
 
-            rc = pysqlite_statement_bind_parameter(self, i + 1, adapted);
+            rc = pysqlite_statement_bind_parameter(self, i + 1, adapted, allow_8bit_chars);
             Py_DECREF(adapted);
 
             if (rc != SQLITE_OK) {
-                PyErr_Format(pysqlite_InterfaceError, "Error binding parameter %d - probably unsupported type.", i);
+                if (!PyErr_Occurred()) {
+                    PyErr_Format(pysqlite_InterfaceError, "Error binding parameter %d - probably unsupported type.", i);
+                }
                 return;
             }
         }
@@ -294,11 +308,13 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
                 }
             }
 
-            rc = pysqlite_statement_bind_parameter(self, i, adapted);
+            rc = pysqlite_statement_bind_parameter(self, i, adapted, allow_8bit_chars);
             Py_DECREF(adapted);
 
             if (rc != SQLITE_OK) {
-                PyErr_Format(pysqlite_InterfaceError, "Error binding parameter :%s - probably unsupported type.", binding_name);
+                if (!PyErr_Occurred()) {
+                    PyErr_Format(pysqlite_InterfaceError, "Error binding parameter :%s - probably unsupported type.", binding_name);
+                }
                 return;
            }
         }
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -1,6 +1,6 @@
 /* statement.h - definitions for the statement type
  *
- * Copyright (C) 2005 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *
@@ -46,8 +46,8 @@ extern PyTypeObject pysqlite_StatementType;
 int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* connection, PyObject* sql);
 void pysqlite_statement_dealloc(pysqlite_Statement* self);
 
-int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter);
-void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters);
+int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter, int allow_8bit_chars);
+void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters, int allow_8bit_chars);
 
 int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* parameters);
 int pysqlite_statement_finalize(pysqlite_Statement* self);
diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
@@ -1,6 +1,6 @@
 /* util.h - various utility functions
  *
- * Copyright (C) 2005-2006 Gerhard H�ring <gh@ghaering.de>
+ * Copyright (C) 2005-2007 Gerhard H�ring <gh@ghaering.de>
  *
  * This file is part of pysqlite.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#-- coding: ISO-8859-1 --`
`2`	`2`	`# pysqlite2/test/factory.py: tests for the various factories in pysqlite`
`3`	`3`	`#`
`4`		`-# Copyright (C) 2005 Gerhard Häring <gh@ghaering.de>`
	`4`	`+# Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>`
`5`	`5`	`#`
`6`	`6`	`# This file is part of pysqlite.`
`7`	`7`	`#`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# pysqlite2/test/userfunctions.py: tests for user-defined functions and`
`3`	`3`	`# aggregates.`
`4`	`4`	`#`
`5`		`-# Copyright (C) 2005 Gerhard Häring <gh@ghaering.de>`
	`5`	`+# Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>`
`6`	`6`	`#`
`7`	`7`	`# This file is part of pysqlite.`
`8`	`8`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* cache .c - a LRU cache`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2004-2006 Gerhard Häring <gh@ghaering.de>`
	`3`	`+ * Copyright (C) 2004-2007 Gerhard Häring <gh@ghaering.de>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* cache.h - definitions for the LRU cache`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2004-2006 Gerhard Häring <gh@ghaering.de>`
	`3`	`+ * Copyright (C) 2004-2007 Gerhard Häring <gh@ghaering.de>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* prepare_protocol.h - the protocol for preparing values for SQLite`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2005 Gerhard Häring <gh@ghaering.de>`
	`3`	`+ * Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* row.h - an enhanced tuple for database rows`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2005 Gerhard Häring <gh@ghaering.de>`
	`3`	`+ * Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con`
`96`	`96`	`return rc;`
`97`	`97`	`}`
`98`	`98`
`99`		`-int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter)`
	`99`	`+int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter, int allow_8bit_chars)`
`100`	`100`	`{`
`101`	`101`	`int rc = SQLITE_OK;`
`102`	`102`	`long longval;`
`@@ -108,6 +108,7 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec`
`108`	`108`	`Py_ssize_t buflen;`
`109`	`109`	`PyObject* stringval;`
`110`	`110`	`parameter_type paramtype;`
	`111`	`+ char* c;`
`111`	`112`
`112`	`113`	`if (parameter == Py_None) {`
`113`	`114`	`rc = sqlite3_bind_null(self->st, pos);`
`@@ -140,6 +141,17 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec`
`140`	`141`	`paramtype = TYPE_UNKNOWN;`
`141`	`142`	`}`
`142`	`143`
	`144`	`+ if (paramtype == TYPE_STRING && !allow_8bit_chars) {`
	`145`	`+ string = PyString_AS_STRING(parameter);`
	`146`	`+ for (c = string; *c != 0; c++) {`
	`147`	`+ if (*c & 0x80) {`
	`148`	`+ PyErr_SetString(pysqlite_ProgrammingError, "You must not use 8-bit bytestrings unless you use a text_factory that can interpret 8-bit bytestrings (like text_factory = str). It is highly recommended that you instead just switch your application to Unicode strings.");`
	`149`	`+ rc = -1;`
	`150`	`+ goto final;`
	`151`	`+ }`
	`152`	`+ }`
	`153`	`+ }`
	`154`	`+`
`143`	`155`	`switch (paramtype) {`
`144`	`156`	`case TYPE_INT:`
`145`	`157`	`longval = PyInt_AsLong(parameter);`
`@@ -197,7 +209,7 @@ static int _need_adapt(PyObject* obj)`
`197`	`209`	`}`
`198`	`210`	`}`
`199`	`211`
`200`		`-void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters)`
	`212`	`+void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters, int allow_8bit_chars)`
`201`	`213`	`{`
`202`	`214`	`PyObject* current_param;`
`203`	`215`	`PyObject* adapted;`
`@@ -251,11 +263,13 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para`
`251`	`263`	`}`
`252`	`264`	`}`
`253`	`265`
`254`		`- rc = pysqlite_statement_bind_parameter(self, i + 1, adapted);`
	`266`	`+ rc = pysqlite_statement_bind_parameter(self, i + 1, adapted, allow_8bit_chars);`
`255`	`267`	`Py_DECREF(adapted);`
`256`	`268`
`257`	`269`	`if (rc != SQLITE_OK) {`
`258`		`- PyErr_Format(pysqlite_InterfaceError, "Error binding parameter %d - probably unsupported type.", i);`
	`270`	`+ if (!PyErr_Occurred()) {`
	`271`	`+ PyErr_Format(pysqlite_InterfaceError, "Error binding parameter %d - probably unsupported type.", i);`
	`272`	`+ }`
`259`	`273`	`return;`
`260`	`274`	`}`
`261`	`275`	`}`
`@@ -294,11 +308,13 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para`
`294`	`308`	`}`
`295`	`309`	`}`
`296`	`310`
`297`		`- rc = pysqlite_statement_bind_parameter(self, i, adapted);`
	`311`	`+ rc = pysqlite_statement_bind_parameter(self, i, adapted, allow_8bit_chars);`
`298`	`312`	`Py_DECREF(adapted);`
`299`	`313`
`300`	`314`	`if (rc != SQLITE_OK) {`
`301`		`- PyErr_Format(pysqlite_InterfaceError, "Error binding parameter :%s - probably unsupported type.", binding_name);`
	`315`	`+ if (!PyErr_Occurred()) {`
	`316`	`+ PyErr_Format(pysqlite_InterfaceError, "Error binding parameter :%s - probably unsupported type.", binding_name);`
	`317`	`+ }`
`302`	`318`	`return;`
`303`	`319`	`}`
`304`	`320`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* statement.h - definitions for the statement type`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2005 Gerhard Häring <gh@ghaering.de>`
	`3`	`+ * Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`
`@@ -46,8 +46,8 @@ extern PyTypeObject pysqlite_StatementType;`
`46`	`46`	`int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* connection, PyObject* sql);`
`47`	`47`	`void pysqlite_statement_dealloc(pysqlite_Statement* self);`
`48`	`48`
`49`		`-int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter);`
`50`		`-void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters);`
	`49`	`+int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter, int allow_8bit_chars);`
	`50`	`+void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* parameters, int allow_8bit_chars);`
`51`	`51`
`52`	`52`	`int pysqlite_statement_recompile(pysqlite_Statement* self, PyObject* parameters);`
`53`	`53`	`int pysqlite_statement_finalize(pysqlite_Statement* self);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* util.h - various utility functions`
`2`	`2`	`*`
`3`		`- * Copyright (C) 2005-2006 Gerhard Häring <gh@ghaering.de>`
	`3`	`+ * Copyright (C) 2005-2007 Gerhard Häring <gh@ghaering.de>`
`4`	`4`	`*`
`5`	`5`	`* This file is part of pysqlite.`
`6`	`6`	`*`