Kaydet (Commit) 7309fda7 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Don't use firebird internal headers.

Change-Id: Ida2f3599c2904c1c9a01a46656b8e8cd308a6f52
üst 0b68d703
...@@ -2118,9 +2118,7 @@ define gb_LinkTarget__use_libfbembed ...@@ -2118,9 +2118,7 @@ define gb_LinkTarget__use_libfbembed
$(call gb_LinkTarget_use_package,$(1),firebird) $(call gb_LinkTarget_use_package,$(1),firebird)
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,firebird)/src/include \ -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \
-I$(call gb_UnpackedTarball_get_dir,firebird)/src/include/gen \
-I$(call gb_UnpackedTarball_get_dir,firebird)/src/jrd \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_use_libraries,$(1),\
fbembed \ fbembed \
......
...@@ -42,9 +42,7 @@ ...@@ -42,9 +42,7 @@
#include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XRow.hpp>
#include <gen/autoconfig.h> #include <ibase.h>
#include <fb_types.h>
#include <constants.h>
using namespace connectivity::firebird; using namespace connectivity::firebird;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
...@@ -127,34 +125,34 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() th ...@@ -127,34 +125,34 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() th
//----- Max Sizes/Lengths ----------------------------------------------------- //----- Max Sizes/Lengths -----------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException)
{ {
return MAX_COLUMN_SIZE; return 32767;
} }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException)
{ {
return MAX_COLUMN_SIZE; return 32767;
} }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException)
{ {
return MAX_COLUMN_SIZE; return 32767;
} }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException) 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) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException)
{ {
// No idea. // No idea.
// See: http://www.firebirdsql.org/en/firebird-technical-specifications/ // See: http://www.firebirdsql.org/en/firebird-technical-specifications/
return MAX_INDEX_SEGMENTS; return 16;
} }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException) 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) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException)
...@@ -166,17 +164,17 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException, ...@@ -166,17 +164,17 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException,
{ {
// May however be smaller. // May however be smaller.
// See: http://www.firebirdsql.org/en/firebird-technical-specifications/ // See: http://www.firebirdsql.org/en/firebird-technical-specifications/
return MAX_COLUMN_SIZE; return 32767;
} }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException)
{ {
return MAX_COLUMN_SIZE; return 32767;
} }
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException) 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) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException)
...@@ -697,7 +695,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLExcepti ...@@ -697,7 +695,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLExcepti
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) 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) sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment