[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk

[Libreoffice Gerrit user]

 mysqlc/Library_mysqlc.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit a191075ee1bd103a57c935e47026337a5e2340e9
Author: Stephan Bergmann 
AuthorDate: Mon Aug 20 18:29:41 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Aug 20 21:15:40 2018 +0200

On macOS Library_mysqlc needs _iconv{,_close,_open}

...presumably since 3478d7453a3d65b3d8d164e8f898a0b79f005c58 "Switch from 
mysql
to MariaDB C API". (And see 
external/mysql-connector-cpp/Library_mysqlcppconn.mk
for a similar case.)

Change-Id: I146bf83a71c59a59f7694552a31923eb1e7fe664
Reviewed-on: https://gerrit.libreoffice.org/59336
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 39c6230d2f05..8e1205c2fdb8 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
mariadb-connector-c \
 ))
 
+ifeq ($(OS)-$(SYSTEM_MARIADB_CONNECTOR_C),MACOSX-)
+$(eval $(call gb_Library_use_external,mysqlc,iconv))
+endif
+
 ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz 
-lm,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk mysqlc/source

[Libreoffice Gerrit user]

 mysqlc/Library_mysqlc.mk|3 
 mysqlc/source/mysqlc_connection.cxx |  140 +--
 mysqlc/source/mysqlc_connection.hxx |   19 
 mysqlc/source/mysqlc_databasemetadata.cxx   | 1127 ++--
 mysqlc/source/mysqlc_databasemetadata.hxx   |4 
 mysqlc/source/mysqlc_driver.cxx |2 
 mysqlc/source/mysqlc_general.cxx|  266 +-
 mysqlc/source/mysqlc_general.hxx|   65 +
 mysqlc/source/mysqlc_prepared_resultset.cxx | 1097 +++
 mysqlc/source/mysqlc_prepared_resultset.hxx |  248 ++
 mysqlc/source/mysqlc_preparedstatement.cxx  |  510 
 mysqlc/source/mysqlc_preparedstatement.hxx  |   24 
 mysqlc/source/mysqlc_resultset.cxx  |  497 ++--
 mysqlc/source/mysqlc_resultset.hxx  |   20 
 mysqlc/source/mysqlc_resultsetmetadata.cxx  |  247 +-
 mysqlc/source/mysqlc_resultsetmetadata.hxx  |   17 
 mysqlc/source/mysqlc_statement.cxx  |  103 +-
 mysqlc/source/mysqlc_statement.hxx  |   12 
 18 files changed, 2724 insertions(+), 1677 deletions(-)

New commits:
commit 3478d7453a3d65b3d8d164e8f898a0b79f005c58
Author: Tamas Bunth 
AuthorDate: Sun Jun 17 18:09:43 2018 +0200
Commit: Tamás Bunth 
CommitDate: Sun Aug 12 23:15:21 2018 +0200

Switch from mysql to MariaDB C API

In order to get rid of the MySQL C++ Connector, the sdbc driver should
be implemented using the MariaDB C connector instead. MariaDB
Connector/C is LGPL licensed, so later it can be used in the
connectivity module. This way mysqlc won't be an extension, so it could
be maintained easier.

Change-Id: I99c13ccf154b33b145d34b1e06eec85946dc82a0
Reviewed-on: https://gerrit.libreoffice.org/55960
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 97f2b63500a2..39c6230d2f05 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -12,12 +12,14 @@ $(eval $(call gb_Library_Library,mysqlc))
 $(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
mysql-connector-cpp \
+   mariadb-connector-c \
 ))
 
 ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz 
-lm,\
-rdynamic -lz -lcrypt -lm)) \
+   $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
 ))
 endif
 
@@ -46,6 +48,7 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
mysqlc/source/mysqlc_services \
mysqlc/source/mysqlc_connection \
mysqlc/source/mysqlc_resultset \
+   mysqlc/source/mysqlc_prepared_resultset \
mysqlc/source/mysqlc_resultsetmetadata \
mysqlc/source/mysqlc_statement \
mysqlc/source/mysqlc_preparedstatement \
diff --git a/mysqlc/source/mysqlc_connection.cxx 
b/mysqlc/source/mysqlc_connection.cxx
index c9b4c6d2e471..73581734a293 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -61,12 +61,25 @@ using ::osl::MutexGuard;
 #define MYSQLC_URI_PREFIX "sdbc:mysqlc:"
 
 
-OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
+namespace
+{
+void lcl_executeUpdate(MYSQL* pMySql, const rtl::OString& sql)
+{
+mysql_real_query(pMySql, sql.getStr(), sql.getLength());
+// TODO handle error
+}
+}
+
+OConnection::OConnection(MysqlCDriver& _rDriver)
 :OMetaConnection_BASE(m_aMutex)
 ,m_xMetaData(nullptr)
 ,m_xDriver(&_rDriver)
-,cppDriver(_cppDriver)
 {
+mysql_init(_mysql);
+
+// use TCP as connection
+mysql_protocol_type protocol = MYSQL_PROTOCOL_TCP;
+mysql_options(_mysql, MYSQL_OPT_PROTOCOL, 
reinterpret_cast());
 }
 
 OConnection::~OConnection()
@@ -144,29 +157,22 @@ void OConnection::construct(const rtl::OUString& url, 
const Sequence< PropertyVa
 }
 
 if (!bEmbedded) {
-try {
-sql::ConnectOptionsMap connProps;
-std::string host_str = rtl::OUStringToOString(aHostName, 
m_settings.encoding).getStr();
-std::string user_str = rtl::OUStringToOString(aUser, 
m_settings.encoding).getStr();
-std::string pass_str = rtl::OUStringToOString(aPass, 
m_settings.encoding).getStr();
-std::string schema_str = rtl::OUStringToOString(aDbName, 
m_settings.encoding).getStr();
-connProps["hostName"] = sql::ConnectPropertyVal(host_str);
-connProps["userName"] = sql::ConnectPropertyVal(user_str);
-connProps["password"] = sql::ConnectPropertyVal(pass_str);
-connProps["schema"] = sql::ConnectPropertyVal(schema_str);
-connProps["port"] = 
sql::ConnectPropertyVal(static_cast(nPort));
-if (unixSocketPassed) {
-sql::SQLString socket_str = 
rtl::OUStringToOString(sUnixSocket, m_settings.encoding).getStr();
-connProps["socket"] = socket_str;
-  

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk

[Stephan Bergmann]

 mysqlc/Library_mysqlc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61d57bcebd1a246603cbcd9ad5e0a7df1a8d66cd
Author: Stephan Bergmann 
Date:   Sat Apr 7 12:46:22 2018 +0200

Don't link Library_mysqlc against -lnsl

At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development
headers and libraries. (It only still contains some binaries for backwards
compatibility, in the libnsl sub-package: "This package provides the legacy
version of libnsl library, for accessing NIS services.")

The -lnsl was present ever since 4946c62f2943dfb3466cc4214a9c8ccd922669b5
"mysqlconnector: initial import from CWS mysqlnative", but appears to not be
necessary (at least any more).

Change-Id: I10b56cdc1a438fb2978125ae0acde0dbec747e78
Reviewed-on: https://gerrit.libreoffice.org/52536
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 8eb207d4bd9e..97f2b63500a2 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
 ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz 
-lm,\
-   -rdynamic -lz -lcrypt -lnsl -lm)) \
+   -rdynamic -lz -lcrypt -lm)) \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk mysqlc/source

[Stephan Bergmann]

 mysqlc/Library_mysqlc.mk |1 
 mysqlc/source/mysqlc_connection.cxx  |2 
 mysqlc/source/mysqlc_driver.hxx  |2 
 mysqlc/source/mysqlc_propertyids.cxx |  191 ---
 mysqlc/source/mysqlc_propertyids.hxx |   35 --
 mysqlc/source/mysqlc_resultset.cxx   |   10 -
 mysqlc/source/mysqlc_statement.cxx   |   20 +--
 7 files changed, 17 insertions(+), 244 deletions(-)

New commits:
commit d081dda43f393ad8a47bdc4b831bcf59b1d670d0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Mar 25 12:46:55 2015 +0100

loplugin:constantfunction

Change-Id: I368de78b99369982cd17a8e7ac8c36b4e7e60b41

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index bc26eaf..adb2111 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\
mysqlc/source/mysqlc_databasemetadata \
mysqlc/source/mysqlc_types \
mysqlc/source/mysqlc_general \
-   mysqlc/source/mysqlc_propertyids \
 ))
 
 $(eval $(call gb_Library_set_componentfile,mysqlc,mysqlc/source/mysqlc))
diff --git a/mysqlc/source/mysqlc_connection.cxx 
b/mysqlc/source/mysqlc_connection.cxx
index a47ad72..42df27d 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -103,7 +103,7 @@ void OConnection::construct(const rtl::OUString url, const 
Sequence PropertyVa
 sal_Int32 nPort = 3306;
 rtl::OUString aDbName;
 
-m_settings.encoding = m_rDriver.getDefaultEncoding();
+m_settings.encoding = MysqlCDriver::getDefaultEncoding();
 m_settings.quoteIdentifier.clear();
 
 // parse url. Url has the following format:
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index 60bafc2..21b2998 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -102,7 +102,7 @@ namespace connectivity
 
 inline Reference ::com::sun::star::lang::XMultiServiceFactory  
getFactory() const { return m_xFactory; }
 
-rtl_TextEncoding getDefaultEncoding() { return 
RTL_TEXTENCODING_UTF8; }
+static rtl_TextEncoding getDefaultEncoding() { return 
RTL_TEXTENCODING_UTF8; }
 
 private:
 voidimpl_initCppConn_lck_throw();
diff --git a/mysqlc/source/mysqlc_propertyids.cxx 
b/mysqlc/source/mysqlc_propertyids.cxx
deleted file mode 100644
index 0e88419..000
--- a/mysqlc/source/mysqlc_propertyids.cxx
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include osl/diagnose.h
-#include mysqlc_propertyids.hxx
-
-
-namespace connectivity
-{
-namespace mysqlc
-{
-const sal_Char* getPROPERTY_QUERYTIMEOUT()  { return QueryTimeOut; }
-const sal_Char* getPROPERTY_MAXFIELDSIZE()  { return MaxFieldSize; }
-const sal_Char* getPROPERTY_MAXROWS()   { return MaxRows; }
-const sal_Char* getPROPERTY_CURSORNAME(){ return CursorName; }
-const sal_Char* getPROPERTY_RESULTSETCONCURRENCY()  { return 
ResultSetConcurrency; }
-const sal_Char* getPROPERTY_RESULTSETTYPE() { return ResultSetType; }
-const sal_Char* getPROPERTY_FETCHDIRECTION(){ return FetchDirection; 
}
-const sal_Char* getPROPERTY_FETCHSIZE() { return FetchSize; }
-const sal_Char* getPROPERTY_ESCAPEPROCESSING()  { return 
EscapeProcessing; }
-const sal_Char* getPROPERTY_USEBOOKMARKS()  { return UseBookmarks; }
-
-const sal_Char* getPROPERTY_NAME()  { return Name; }
-const sal_Char* getPROPERTY_TYPE()  { return Type; }
-const sal_Char* getPROPERTY_TYPENAME()  { return TypeName; }
-const sal_Char* getPROPERTY_PRECISION() { return Precision; }
-const sal_Char* getPROPERTY_SCALE() { return Scale; }
-const sal_Char* getPROPERTY_ISNULLABLE(){ return IsNullable; }
-const sal_Char* getPROPERTY_ISAUTOINCREMENT()   { return 
IsAutoIncrement; }
-const sal_Char* getPROPERTY_ISROWVERSION()  { return IsRowVersion; }
-const sal_Char* getPROPERTY_DESCRIPTION()   { 

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk

[Fridrich Štrba]

 mysqlc/Library_mysqlc.mk |8 
 1 file changed, 8 deletions(-)

New commits:
commit eaa76b5b0a60548951d2e8428a5e1d18c17720a7
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 14 13:59:18 2013 +0100

Link only what one needs

Change-Id: I953ee0e96f704e3900238751b29fa2ed6f4482e9

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index fd09ba1..72787fc 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -15,9 +15,7 @@ $(eval $(call 
gb_Library_add_cxxflags,mysqlc,-DRTL_DISABLE_FAST_STRING))
 
 $(eval $(call gb_Library_use_externals,mysqlc,\
boost_headers \
-   mysql \
mysqlcppconn \
-   mariadb \
 ))
 
 ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
@@ -36,12 +34,6 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
cppuhelper \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,mysqlc,\
-   -lpthread \
-))
-endif
-
 $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \
-DCPPCONN_LIB_BUILD \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk mysqlc/source

[Fridrich Štrba]

 mysqlc/Library_mysqlc.mk|2 +-
 mysqlc/source/mysqlc_connection.cxx |   35 +--
 2 files changed, 2 insertions(+), 35 deletions(-)

New commits:
commit 730df392f5c5424a46fcb360c21d34a04622eb9f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Mar 11 10:09:39 2013 +0100

Do not try to dlopen a static internal libmariadb

Change-Id: Ib624089418e22c050e951acc4c487572c7e0ea25

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index ad8bc8d..d67d314 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
 
 $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \
-   -DCPPCON_LIB_BUILD \
+   -DCPPCONN_LIB_BUILD \
-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
diff --git a/mysqlc/source/mysqlc_connection.cxx 
b/mysqlc/source/mysqlc_connection.cxx
index fe93623..b4ebe77 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -99,10 +99,6 @@ void SAL_CALL OConnection::release()
 }
 /* }}} */
 
-#ifndef SYSTEM_MARIADB
-extern C { void SAL_CALL thisModule() {} }
-#endif
-
 /* {{{ OConnection::construct() -I- */
 void OConnection::construct(const OUString url, const Sequence PropertyValue 
 info)
 throw(SQLException)
@@ -194,35 +190,6 @@ void OConnection::construct(const OUString url, const 
Sequence PropertyValue 
 connProps[socket] = pipe_str;
 }
 
-#ifndef SYSTEM_MARIADB
-::rtl::OUString sMySQLClientLib( libmariadb SAL_DLLEXTENSION );
-
-::rtl::OUString moduleBase;
-OSL_VERIFY( ::osl::Module::getUrlFromAddress( thisModule, 
moduleBase ) );
-::rtl::OUString sMySQLClientLibURL;
-try
-{
-sMySQLClientLibURL = ::rtl::Uri::convertRelToAbs( moduleBase, 
sMySQLClientLib.pData );
-}
-catch ( const ::rtl::MalformedUriException e )
-{
-(void)e; // silence compiler
-#if OSL_DEBUG_LEVEL  0
-::rtl::OString sMessage( OConnection::construct: malformed 
URI:  );
-sMessage += ::rtl::OUStringToOString( e.getMessage(), 
osl_getThreadTextEncoding() );
-OSL_FAIL( sMessage.getStr() );
-#endif
-}
-
-::rtl::OUString sMySQLClientLibPath;
-osl_getSystemPathFromFileURL( sMySQLClientLibURL.pData, 
sMySQLClientLibPath.pData );
-
-sql::SQLString mysqlLib = ::rtl::OUStringToOString( 
sMySQLClientLibPath, osl_getThreadTextEncoding() ).getStr();
-connProps[clientlib] = mysqlLib;
-
-OSL_TRACE(clientlib=%s, mysqlLib.c_str());
-#endif
-
 OSL_TRACE(hostName=%s, host_str.c_str());
 OSL_TRACE(port=%i, int(nPort));
 OSL_TRACE(userName=%s, user_str.c_str());
@@ -243,7 +210,7 @@ void OConnection::construct(const OUString url, const 
Sequence PropertyValue 
 // Check if the server is 4.1 or above
 if (this-getMysqlVersion()  40100) {
 throw SQLException(
-::rtl::OUString( MySQL Connector/OO.org requires MySQL Server 4.1 
or above  ),
+::rtl::OUString( MariaDB LibreOffice Connector requires MySQL 
Server 4.1 or above  ),
 *this,
 ::rtl::OUString(),
 0,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: mysqlc/Library_mysqlc.mk

[Lionel Elie Mamane]

 mysqlc/Library_mysqlc.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e5444ae3e099e1279b9b685b623c6e50bb8efd3b
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Feb 24 18:29:01 2013 +0100

fdo#60907 no space in front of MYSQL_LIB

Change-Id: If477ae65eb93d8eb944c345853c13ca0d1826762

diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 246e4ec..ffa194f 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -33,8 +33,7 @@ $(eval $(call gb_Library_use_libraries,mysqlc,\
cppuhelper \
 ))
 
-MYSQL_LIBFILE :=$(if $(filter WNT,$(OS)),libmysql.dll,\
-   $(if $(filter MACOSX,$(OS)),libmysql.16.dylib,libmysql.so.16))
+MYSQL_LIBFILE :=$(if $(filter WNT,$(OS)),libmysql.dll,$(if $(filter 
MACOSX,$(OS)),libmysql.16.dylib,libmysql.so.16))
 
 $(eval $(call gb_Library_add_defs,mysqlc,\
-DCPPDBC_EXPORTS \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits