diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2017-11-08 04:17:25 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2017-11-08 04:17:25 +0000 |
| commit | b487eaa65e2e67bc68d8b88d1fe6048f0189f22d (patch) | |
| tree | a28c5f974123eb6ac2e6888008b1fdb83292e7fe /scp2 | |
| parent | dcb9d5aba4c6714e7f6faf7b95eae4343af54969 (diff) | |
Port our SDBC-JDBC bridge driver to Java. Supported interfaces,
service names, implementation names, logging channels and messages,
initialization arguments, and general behaviour is all preserved, so it
should be completely transparent to client code.
Allow PropertySetAdapter.getPropertyValue() to throw WrappedTargetException,
and PropertySetAdapter.setPropertyValue() to throw PropertyVetoException,
IllegalArgumentException, and WrappedTargetException, as these are
sometimes used to change values in a database driver, which can fail.
Port helper classes from main/comphelper for logging.
Port AutoRetrievingBase.
Add in-memory Column, ResultSet and metadata classes.
Improve handling of Any in ORowSetValue.
Move PostgreSQL's database metadata result set class to dbtools, and
have it only override the method it needs.
It's "information_schema" in PostgreSQL - "INFORMATION_SCHEMA"
doesn't exist and gives an error.
Add a new UNO service com.sun.star.sdb.ParameterSubstitution as was
intended by main/connectivity/source/dbtools/dbtools.component
that allow substituting parameters, so it can be used from Java.
Keep the database drivers in a common install package.
Patch by: me
Notes
Notes:
ignore: aoo
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 6080c11af6a9..e318922809c7 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -796,7 +796,12 @@ End #ifdef SOLAR_JAVA -STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc) +#ifndef SYSTEM_APACHE_COMMONS +STD_JAR_FILE( gid_File_Jar_Apache_Commons_Lang, commons-lang3-3.3 ) +#endif +STD_JAR_FILE( gid_File_Jar_DbTools_Sdbc, dbtools ) +STD_JAR_FILE( gid_File_Jar_Jdbc_Sdbc, sdbc_jdbc ) +STD_JAR_FILE( gid_File_Jar_PostgreSQL_Sdbc, sdbc_postgresql ) #endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 61d491a5f1a7..a8a7cbc50421 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -429,14 +429,6 @@ STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc, sdbc_hsqldb ) #endif #ifdef SOLAR_JAVA -#ifndef SYSTEM_APACHE_COMMONS -STD_JAR_FILE( gid_File_Jar_Apache_Commons_Lang, commons-lang3-3.3 ) -#endif -STD_JAR_FILE( gid_File_Jar_DbTools_Sdbc, dbtools ) -STD_JAR_FILE( gid_File_Jar_PostgreSQL_Sdbc, sdbc_postgresql ) -#endif - -#ifdef SOLAR_JAVA File gid_File_Jar_Commonwizards TXT_FILE_BODY; Name = JARFILENAME(commonwizards); diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 5a3ec550c407..2533af11cf74 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -88,6 +88,7 @@ Module gid_Module_Root_Files_3 gid_File_Jar_Hsqldb_Sdbc, gid_File_Jar_Apache_Commons_Lang, gid_File_Jar_DbTools_Sdbc, + gid_File_Jar_Jdbc_Sdbc, gid_File_Jar_PostgreSQL_Sdbc, gid_File_Jar_Accessbridge, gid_File_Jar_Js, @@ -326,7 +327,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Localedata_Euro, gid_File_Lib_Localedata_Others, gid_File_Lib_Hsqldb_2, - gid_File_Lib_Jdbc, gid_File_Lib_Mcnttype, gid_File_Lib_Mysql, gid_File_Lib_Odbc, |