[Libreoffice-commits] core.git: connectivity/source RepositoryExternal.mk

[Andrzej J.R. Hunt]

 RepositoryExternal.mk                                      |    4 --
 connectivity/source/drivers/firebird/FDatabaseMetaData.cxx |   24 +++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 7309fda7fa9d072f043782af78c13f9c79c93455
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Tue Jul 16 22:40:47 2013 +0200

    Don't use firebird internal headers.
    
    Change-Id: Ida2f3599c2904c1c9a01a46656b8e8cd308a6f52

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index df57e1a..8bfe445 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2118,9 +2118,7 @@ define gb_LinkTarget__use_libfbembed
 $(call gb_LinkTarget_use_package,$(1),firebird)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,firebird)/src/include \
-	-I$(call gb_UnpackedTarball_get_dir,firebird)/src/include/gen \
-	-I$(call gb_UnpackedTarball_get_dir,firebird)/src/jrd \
+	-I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \
 )
 $(call gb_LinkTarget_use_libraries,$(1),\
     fbembed \
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
index 6852c5e..ad453d7 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
@@ -42,9 +42,7 @@
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 
-#include <gen/autoconfig.h>
-#include <fb_types.h>
-#include <constants.h>
+#include <ibase.h>
 
 using namespace connectivity::firebird;
 using namespace com::sun::star::uno;
@@ -127,34 +125,34 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() th
 //----- Max Sizes/Lengths -----------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException)
 {
-    return MAX_COLUMN_SIZE;
+    return 32767;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException)
 {
-    return MAX_COLUMN_SIZE;
+    return 32767;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException)
 {
-    return MAX_COLUMN_SIZE;
+    return 32767;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException)
 {
-    return MAX_SQL_IDENTIFIER_SIZE;
+    return 32;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException)
 {
     // No idea.
     // See: http://www.firebirdsql.org/en/firebird-technical-specifications/
-    return MAX_INDEX_SEGMENTS;
+    return 16;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException)
 {
-    return MAX_SQL_IDENTIFIER_SIZE;
+    return 32;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException)
@@ -166,17 +164,17 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException,
 {
     // May however be smaller.
     // See: http://www.firebirdsql.org/en/firebird-technical-specifications/
-    return MAX_COLUMN_SIZE;
+    return 32767;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException)
 {
-    return MAX_COLUMN_SIZE;
+    return 32767;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException)
 {
-    return MAX_SQL_IDENTIFIER_SIZE;
+    return 32;
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
@@ -697,7 +695,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
-    return USERNAME_LENGTH;
+    return 31;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)