From 9f479d9334262f65ea844281ef0281ed736d59fe Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Fri, 12 Aug 2011 16:56:43 +0200 Subject: pgsql-sdbc: properly delegate escaping to libpq In particular, this makes it work whether server parameter standards_conforming_strings is off or on --- connectivity/source/drivers/postgresql/pq_tools.hxx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'connectivity/source/drivers/postgresql/pq_tools.hxx') diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index fac4b88631d4..71de5ee44164 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * $RCSfile: pq_tools.hxx,v $ @@ -90,27 +91,32 @@ com::sun::star::util::DateTime string2DateTime( const rtl::OUString & dateTime ) rtl::OUString concatQualified( const rtl::OUString & a, const rtl::OUString &b); -void bufferQuoteConstant( rtl::OUStringBuffer & buf, const rtl::OUString & str, sal_Int32 encoding ); +rtl::OString OUStringToOString( rtl::OUString str, ConnectionSettings *settings); -void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & str, sal_Int32 encoding ); +void bufferQuoteConstant( rtl::OUStringBuffer & buf, const rtl::OUString & str, ConnectionSettings *settings ); + void bufferQuoteAnyConstant( rtl::OUStringBuffer & buf, const com::sun::star::uno::Any &val, ConnectionSettings *settings ); + +void bufferEscapeConstant( rtl::OUStringBuffer & buf, const rtl::OUString & str, ConnectionSettings *settings ); ::rtl::OUString sqltype2string( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & column ); void bufferQuoteQualifiedIdentifier( - rtl::OUStringBuffer & buf, const rtl::OUString &schema, const rtl::OUString &name); + rtl::OUStringBuffer & buf, const rtl::OUString &schema, const rtl::OUString &name, ConnectionSettings *settings ); void bufferQuoteQualifiedIdentifier( rtl::OUStringBuffer & buf, const rtl::OUString &schema, const rtl::OUString &name, - const rtl::OUString &col); + const rtl::OUString &col, + ConnectionSettings *settings ); -void bufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl::OUString &toQuote ); +void bufferQuoteIdentifier( rtl::OUStringBuffer & buf, const rtl::OUString &toQuote, ConnectionSettings *settings ); void bufferKey2TableConstraint( rtl::OUStringBuffer &buf, - const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > &key ); + const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > &key, + ConnectionSettings *settings ); rtl::OUString extractStringProperty( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & descriptor, -- cgit