connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
| 5 +++++
connectivity/source/drivers/postgresql/pq_statics.cxx
| 10 +++++-----
connectivity/source/drivers/postgresql/pq_tools.cxx
| 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 1000d7499b1fbaa05e2aeca02c24fc3dfbfd2ddc
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Wed Jan 7 16:00:13 2015 +0100
PostgreSQL boolean more accurately described as boolean
Let's see if this breaks anything...
Change-Id: Id7503f8059ca99ec155d72c275a7657280ee2bc6
diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx
b/connectivity/source/drivers/postgresql/pq_statics.cxx
index 0d349a8..3349bb1 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -605,7 +605,7 @@ Statics & getStatics()
// LEM TODO see if a refresh is needed; obtain automatically from
pg_catalog.pg_type?
BaseTypeDef baseTypeDefs[] =
{
- { "bool" , com::sun::star::sdbc::DataType::BIT },
+ { "bool" , com::sun::star::sdbc::DataType::BOOLEAN },
{ "bytea", com::sun::star::sdbc::DataType::VARBINARY },
{ "char" , com::sun::star::sdbc::DataType::CHAR },
@@ -688,11 +688,11 @@ Statics & getStatics()
{ "LITERAL_SUFFIX", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false },
// 4
{ "CREATE_PARAMS", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false },
// 5
{ "NULLABLE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::INTEGER, 0,50,false,false,false,false, true },
// 6
- { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, //
7
+ { "CASE_SENSITIVE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false },
// 7
{ "SEARCHABLE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true },
// 8
- { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, //
9
- { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, //
10
- { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BIT, 0,50,false,false,false,false, false }, //
11
+ { "UNSIGNED_ATTRIBUTE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false },
// 9
+ { "FIXED_PREC_SCALE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false },
// 10
+ { "AUTO_INCREMENT", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::BOOLEAN, 0,50,false,false,false,false, false },
// 11
{ "LOCAL_TYPE_NAME", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::VARCHAR, 0,50,false,false,false,false, false },
// 12
{ "MINIMUM_SCALE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true},
// 13
{ "MAXIMUM_SCALE", "TYPEINFO", "pg_catalog", "",
com::sun::star::sdbc::DataType::SMALLINT, 0,50,false,false,false,false, true },
// 14
commit 3b025a7c4c996f923a468a189f389977fbacb775
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Wed Jan 7 15:57:11 2015 +0100
fdo#88099 PostgreSQL-SDBC: use correct syntax for boolean comparisons
Change-Id: Iddb551b62b1ff3fc9ce977483e41faa9ad8aef13
diff --git
a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
index 51f8148..63757e3 100644
---
a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
+++
b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -55,6 +55,11 @@
<value>false</value>
</prop>
</node>
+ <node oor:name="BooleanComparisonMode" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:int">
+ <value>2</value>
+ </prop>
+ </node>
</node>
<node oor:name="Features">
<!-- These entries enable the "Advanced Settings" UI to change the
settings
commit b39f07f1a0066c8cd3072746f6c47718ad65fabe
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Wed Jan 7 15:56:12 2015 +0100
protect agains past-the-end string access
Change-Id: I651c7b062b454fad85eff8852f7e62804a0d0058
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 3f8e85f..442a2a5 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -423,7 +423,7 @@ void splitSQL( const OString & sql, OStringVector &vec )
}
else if( singleQuote )
{
- if( '\'' == c && '\'' == sql[i+1] )
+ if( '\'' == c && (i+1) < length && '\'' == sql[i+1] )
{
// two subsequent single quotes within a quoted string
// mean a single quote within the string
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
