Propchange:
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/PropertyIds.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/StandardSQLState.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/StandardSQLState.java?rev=1805579&view=auto
==============================================================================
---
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/StandardSQLState.java
(added)
+++
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/StandardSQLState.java
Sun Aug 20 19:16:28 2017
@@ -0,0 +1,58 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+package com.sun.star.sdbcx.comp.postgresql.util;
+
+public enum StandardSQLState {
+ SQL_WRONG_PARAMETER_NUMBER("07001"),
+ SQL_INVALID_DESCRIPTOR_INDEX("07009"),
+ SQL_UNABLE_TO_CONNECT("08001"),
+ SQL_NUMERIC_OUT_OF_RANGE("22003"),
+ SQL_INVALID_DATE_TIME("22007"),
+ SQL_INVALID_CURSOR_STATE("24000"),
+ SQL_TABLE_OR_VIEW_EXISTS("42S01"),
+ SQL_TABLE_OR_VIEW_NOT_FOUND("42S02"),
+ SQL_INDEX_EXISTS("42S11"),
+ SQL_INDEX_NOT_FOUND("42S12"),
+ SQL_COLUMN_EXISTS("42S21"),
+ SQL_COLUMN_NOT_FOUND("42S22"),
+ SQL_GENERAL_ERROR("HY000"),
+ SQL_INVALID_SQL_DATA_TYPE("HY004"),
+ SQL_OPERATION_CANCELED("HY008"),
+ SQL_FUNCTION_SEQUENCE_ERROR("HY010"),
+ SQL_INVALID_CURSOR_POSITION("HY109"),
+ SQL_INVALID_BOOKMARK_VALUE("HY111"),
+ SQL_FEATURE_NOT_IMPLEMENTED("HYC00"),
+ SQL_FUNCTION_NOT_SUPPORTED("IM001"),
+ SQL_CONNECTION_DOES_NOT_EXIST("08003"),
+ SQL_ERROR_UNSPECIFIED("");
+
+
+ private String text;
+
+ private StandardSQLState(String text) {
+ this.text = text;
+ }
+
+ public String text() {
+ return text;
+ }
+}
Propchange:
openoffice/trunk/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/StandardSQLState.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/main/connectivity/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/build.lst?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/prj/build.lst (original)
+++ openoffice/trunk/main/connectivity/prj/build.lst Sun Aug 20 19:16:28 2017
@@ -1,7 +1,8 @@
-cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl
UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg
LIBXSLT:libxslt NULL
+cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl
UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg
LIBXSLT:libxslt apache-commons NULL
cn connectivity usr1 - all cn_mkout
NULL
cn connectivity\inc nmake - all cn_inc NULL
cn connectivity\java\sdbc_hsqldb nmake - all
cn_jhsqldbdb cn_hsqldb cn_inc NULL
+cn connectivity\java\sdbc_postgresql nmake - all
cn_postgresqldb cn_dbtools cn_inc NULL
cn connectivity\source\commontools nmake - all cn_cmtools
cn_parse cn_inc NULL
cn connectivity\source\manager nmake - all cn_manager
cn_dbtools cn_inc NULL
cn connectivity\source\cpool nmake - all cn_cpool
cn_dbtools cn_inc NULL
Modified: openoffice/trunk/main/connectivity/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/prj/d.lst?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/prj/d.lst (original)
+++ openoffice/trunk/main/connectivity/prj/d.lst Sun Aug 20 19:16:28 2017
@@ -21,6 +21,7 @@
..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
..\%__SRC%\class\sdbc_hsqldb\*.jar %_DEST%\bin%_EXT%\*.jar
+..\%__SRC%\class\sdbc_postgresql\*.jar %_DEST%\bin%_EXT%\*.jar
mkdir: %_DEST%\inc%_EXT%\connectivity
mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx
@@ -46,4 +47,5 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
+..\%__SRC%\misc\postgresql.component %_DEST%\xml%_EXT%\postgresql.component
..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
Modified: openoffice/trunk/main/connectivity/target.pmk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/target.pmk?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/target.pmk (original)
+++ openoffice/trunk/main/connectivity/target.pmk Sun Aug 20 19:16:28 2017
@@ -21,7 +21,8 @@
-.INCLUDE : target.mk
+#.INCLUDE : target.mk
+.INCLUDE : ant.mk
COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
Modified: openoffice/trunk/main/dbaccess/source/core/misc/dsntypes.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/core/misc/dsntypes.cxx?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/core/misc/dsntypes.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/core/misc/dsntypes.cxx Sun Aug 20
19:16:28 2017
@@ -414,15 +414,16 @@ DATASOURCE_TYPE ODsnTypeCollection::dete
};
KnownPrefix aKnowPrefixes[] =
{
- KnownPrefix( "sdbc:calc:", DST_CALC, false ),
- KnownPrefix( "sdbc:flat:", DST_FLAT, false ),
- KnownPrefix( "sdbc:adabas:", DST_ADABAS, false ),
- KnownPrefix( "sdbc:odbc:", DST_ODBC, false ),
- KnownPrefix( "sdbc:dbase:", DST_DBASE, false ),
- KnownPrefix( "sdbc:mysql:odbc:", DST_MYSQL_ODBC, false ),
- KnownPrefix( "sdbc:mysql:jdbc:", DST_MYSQL_JDBC, false ),
- KnownPrefix( "sdbc:mysql:mysqlc:", DST_MYSQL_NATIVE, false ),
- KnownPrefix( "sdbc:mysqlc:", DST_MYSQL_NATIVE_DIRECT,false ),
+ KnownPrefix( "sdbc:calc:", DST_CALC, false ),
+ KnownPrefix( "sdbc:flat:", DST_FLAT, false ),
+ KnownPrefix( "sdbc:adabas:", DST_ADABAS, false ),
+ KnownPrefix( "sdbc:odbc:", DST_ODBC, false ),
+ KnownPrefix( "sdbc:dbase:", DST_DBASE, false ),
+ KnownPrefix( "sdbc:mysql:odbc:", DST_MYSQL_ODBC, false ),
+ KnownPrefix( "sdbc:mysql:jdbc:", DST_MYSQL_JDBC, false ),
+ KnownPrefix( "sdbc:mysql:mysqlc:", DST_MYSQL_NATIVE, false ),
+ KnownPrefix( "sdbc:mysqlc:", DST_MYSQL_NATIVE_DIRECT,false ),
+ KnownPrefix( "sdbc:postgresql:jdbc:",DST_POSTGRESQL_JDBC, false ),
KnownPrefix( "sdbc:address:mozilla:", DST_MOZILLA,
true ),
KnownPrefix( "sdbc:address:thunderbird:", DST_THUNDERBIRD,
true ),
Modified: openoffice/trunk/main/dbaccess/source/inc/dsntypes.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/inc/dsntypes.hxx?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/inc/dsntypes.hxx (original)
+++ openoffice/trunk/main/dbaccess/source/inc/dsntypes.hxx Sun Aug 20 19:16:28
2017
@@ -67,6 +67,7 @@ enum DATASOURCE_TYPE
DST_EMBEDDED_HSQLDB = 23,
DST_MYSQL_NATIVE = 24,
DST_MYSQL_NATIVE_DIRECT = 25,
+ DST_POSTGRESQL_JDBC = 26,
DST_USERDEFINE1, /// first user defined driver
DST_USERDEFINE2,
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sun Aug 20
19:16:28 2017
@@ -285,6 +285,7 @@ my_components += \
component/wizards/com/sun/star/wizards/form/form \
hsqldb \
jdbc \
+ postgresql \
component/wizards/com/sun/star/wizards/letter/letter \
component/wizards/com/sun/star/wizards/query/query \
component/wizards/com/sun/star/wizards/report/report \
Modified: openoffice/trunk/main/postprocess/packregistry/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packregistry/makefile.mk?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packregistry/makefile.mk Sun Aug 20
19:16:28 2017
@@ -352,7 +352,8 @@ MY_FILES_main += $(MY_MOD)/DataAccess/ev
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
$(MY_MOD)/DataAccess/hsqldb.xcu \
- $(MY_MOD)/DataAccess/jdbc.xcu
+ $(MY_MOD)/DataAccess/jdbc.xcu \
+ $(MY_MOD)/DataAccess/sdbc_postgresql.xcu
.END
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
Modified: openoffice/trunk/main/scp2/source/ooo/file_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_ooo.scp Sun Aug 20 19:16:28 2017
@@ -429,6 +429,13 @@ STD_JAR_FILE( gid_File_Jar_Hsqldb_Sdbc,
#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_PostgreSQL_Sdbc, sdbc_postgresql )
+#endif
+
+#ifdef SOLAR_JAVA
File gid_File_Jar_Commonwizards
TXT_FILE_BODY;
Name = JARFILENAME(commonwizards);
Modified: openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1805579&r1=1805578&r2=1805579&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_hidden_ooo.scp Sun Aug 20
19:16:28 2017
@@ -86,6 +86,8 @@ Module gid_Module_Root_Files_3
gid_File_Jar_Unoil,
gid_File_Jar_Hsqldb,
gid_File_Jar_Hsqldb_Sdbc,
+ gid_File_Jar_Apache_Commons_Lang,
+ gid_File_Jar_PostgreSQL_Sdbc,
gid_File_Jar_Accessbridge,
gid_File_Jar_Js,
gid_File_Jar_Officebean,
