From 95c4515bf3ba32b24f9813b9b72d31098b7ce830 Mon Sep 17 00:00:00 2001 From: jurgen Date: Wed, 19 Aug 2015 09:49:51 +0000 Subject: [PATCH] Derby extension Former-commit-id: 4f522a2d6057c5115115f4a9ac31423a9f1af75e --- docs/todo.txt | 3 +- .../org.jkiss.dbeaver.ext.derby/.classpath | 7 + plugins/org.jkiss.dbeaver.ext.derby/.project | 28 +++ .../.settings/org.eclipse.jdt.core.prefs | 12 ++ .../org.jkiss.dbeaver.ext.derby/LICENSE.txt | 202 ++++++++++++++++++ .../META-INF/MANIFEST.MF | 18 ++ .../build.properties | 7 + .../plugin.properties | 0 .../org.jkiss.dbeaver.ext.derby/plugin.xml | 10 + .../jkiss/dbeaver/ext/derby/DerbyUtils.java | 31 +++ .../ext/derby/model/DerbyMetaModel.java | 143 +++++++++++++ .../build.properties | 5 +- 12 files changed, 461 insertions(+), 5 deletions(-) create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/.classpath create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/.project create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/.settings/org.eclipse.jdt.core.prefs create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/LICENSE.txt create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/build.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/plugin.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/plugin.xml create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/DerbyUtils.java create mode 100644 plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/model/DerbyMetaModel.java diff --git a/docs/todo.txt b/docs/todo.txt index dc9ae5e1ad..2a4ed30960 100644 --- a/docs/todo.txt +++ b/docs/todo.txt @@ -1,3 +1,5 @@ +Analyse exception for error line/offset and position cursor in SQL editor + Connections keep-alive Default socket timeouts for drivers @@ -15,7 +17,6 @@ Split core and ui on different plugins DBeaver features usage model Vertica keywords -Analyse exception for error line/offset and position cursor in SQL editor ERD export in XMI/GraphML formats Data transfer DB->DB. Set default export mapping initially diff --git a/plugins/org.jkiss.dbeaver.ext.derby/.classpath b/plugins/org.jkiss.dbeaver.ext.derby/.classpath new file mode 100644 index 0000000000..8a8f1668cd --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/org.jkiss.dbeaver.ext.derby/.project b/plugins/org.jkiss.dbeaver.ext.derby/.project new file mode 100644 index 0000000000..bb5ac500f1 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/.project @@ -0,0 +1,28 @@ + + + org.jkiss.dbeaver.ext.derby + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/plugins/org.jkiss.dbeaver.ext.derby/.settings/org.eclipse.jdt.core.prefs b/plugins/org.jkiss.dbeaver.ext.derby/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..aedb1c2232 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +#Thu Dec 30 16:00:50 MSK 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/org.jkiss.dbeaver.ext.derby/LICENSE.txt b/plugins/org.jkiss.dbeaver.ext.derby/LICENSE.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..3f59307435 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF @@ -0,0 +1,18 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Apache Derby Plug-in +Bundle-SymbolicName: org.jkiss.dbeaver.ext.derby;singleton:=true +Bundle-Version: 1.0.0 +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.ui.views, + org.eclipse.jface, + org.eclipse.jface.text, + org.jkiss.dbeaver.core, + org.eclipse.ui.workbench.texteditor, + org.jkiss.dbeaver.ext.generic +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-Vendor: JKISS +Bundle-ClassPath: . +Bundle-Localization: plugin diff --git a/plugins/org.jkiss.dbeaver.ext.derby/build.properties b/plugins/org.jkiss.dbeaver.ext.derby/build.properties new file mode 100644 index 0000000000..5185705c88 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + icons/,\ + plugin.properties diff --git a/plugins/org.jkiss.dbeaver.ext.derby/plugin.properties b/plugins/org.jkiss.dbeaver.ext.derby/plugin.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/plugins/org.jkiss.dbeaver.ext.derby/plugin.xml b/plugins/org.jkiss.dbeaver.ext.derby/plugin.xml new file mode 100644 index 0000000000..ed444cc483 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/plugin.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/DerbyUtils.java b/plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/DerbyUtils.java new file mode 100644 index 0000000000..8c6b0467dd --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/DerbyUtils.java @@ -0,0 +1,31 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License (version 2) + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +package org.jkiss.dbeaver.ext.derby; + +import org.jkiss.dbeaver.Log; + +/** + * Derby utils + */ +public class DerbyUtils { + + static final Log log = Log.getLog(DerbyUtils.class); + + +} diff --git a/plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/model/DerbyMetaModel.java b/plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/model/DerbyMetaModel.java new file mode 100644 index 0000000000..5a86bc60c2 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.derby/src/org/jkiss/dbeaver/ext/derby/model/DerbyMetaModel.java @@ -0,0 +1,143 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License (version 2) + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +package org.jkiss.dbeaver.ext.derby.model; + +import org.eclipse.core.runtime.IConfigurationElement; +import org.jkiss.dbeaver.DBException; +import org.jkiss.dbeaver.ext.generic.model.*; +import org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel; +import org.jkiss.dbeaver.ext.postgresql.PostgreUtils; +import org.jkiss.dbeaver.model.DBPErrorAssistant; +import org.jkiss.dbeaver.model.exec.DBCExecutionPurpose; +import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement; +import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; +import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession; +import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; +import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; +import org.jkiss.utils.CommonUtils; +import org.osgi.framework.Version; + +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * DerbyMetaModel + */ +public class DerbyMetaModel extends GenericMetaModel +{ + private Pattern ERROR_POSITION_PATTERN = Pattern.compile("\\n\\s*Position: ([0-9]+)"); + + public DerbyMetaModel(IConfigurationElement cfg) { + super(cfg); + } + + public String getViewDDL(DBRProgressMonitor monitor, GenericTable sourceObject) throws DBException { + JDBCSession session = sourceObject.getDataSource().getDefaultContext(true).openSession(monitor, DBCExecutionPurpose.META, "Read view definition"); + try { + return JDBCUtils.queryString(session, "SELECT definition FROM PG_CATALOG.PG_VIEWS WHERE SchemaName=? and ViewName=?", sourceObject.getContainer().getName(), sourceObject.getName()); + } catch (SQLException e) { + throw new DBException(e, sourceObject.getDataSource()); + } finally { + session.close(); + } + } + + @Override + public String getProcedureDDL(DBRProgressMonitor monitor, GenericProcedure sourceObject) throws DBException { + JDBCSession session = sourceObject.getDataSource().getDefaultContext(true).openSession(monitor, DBCExecutionPurpose.META, "Read procedure definition"); + try { + return JDBCUtils.queryString(session, "SELECT pg_get_functiondef(p.oid) FROM PG_CATALOG.PG_PROC P, PG_CATALOG.PG_NAMESPACE NS\n" + + "WHERE ns.oid=p.pronamespace and ns.nspname=? AND p.proname=?", sourceObject.getContainer().getName(), sourceObject.getName()); + } catch (SQLException e) { + throw new DBException(e, sourceObject.getDataSource()); + } finally { + session.close(); + } + } + + @Override + public boolean supportsSequences(GenericDataSource dataSource) { + Version databaseVersion = dataSource.getInfo().getDatabaseVersion(); + return databaseVersion.getMajor() >= 9 || databaseVersion.getMajor() == 8 && databaseVersion.getMinor() >= 4; + } + + @Override + public List loadSequences(DBRProgressMonitor monitor, GenericObjectContainer container) throws DBException { + JDBCSession session = container.getDataSource().getDefaultContext(true).openSession(monitor, DBCExecutionPurpose.META, "Read procedure definition"); + try { + JDBCPreparedStatement dbStat = session.prepareStatement("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema=?"); + try { + dbStat.setString(1, container.getName()); + JDBCResultSet dbResult = dbStat.executeQuery(); + try { + List result = new ArrayList(); + while (dbResult.next()) { + String name = JDBCUtils.safeGetString(dbResult, 1); + JDBCPreparedStatement dbSeqStat = session.prepareStatement("SELECT last_value,min_value,max_value,increment_by from " + container.getName() + "." + name); + try { + JDBCResultSet seqResults = dbSeqStat.executeQuery(); + try { + seqResults.next(); + GenericSequence sequence = new GenericSequence( + container, + name, + PostgreUtils.getObjectComment(monitor, container.getDataSource(), container.getName(), name), + JDBCUtils.safeGetLong(seqResults, 1), + JDBCUtils.safeGetLong(seqResults, 2), + JDBCUtils.safeGetLong(seqResults, 3), + JDBCUtils.safeGetLong(seqResults, 4)); + result.add(sequence); + } finally { + seqResults.close(); + } + } finally { + dbSeqStat.close(); + } + } + return result; + } finally { + dbResult.close(); + } + } finally { + dbStat.close(); + } + } catch (SQLException e) { + throw new DBException(e, container.getDataSource()); + } finally { + session.close(); + } + } + + @Override + public DBPErrorAssistant.ErrorPosition getErrorPosition(Throwable error) { + String message = error.getMessage(); + if (!CommonUtils.isEmpty(message)) { + Matcher matcher = ERROR_POSITION_PATTERN.matcher(message); + if (matcher.find()) { + DBPErrorAssistant.ErrorPosition pos = new DBPErrorAssistant.ErrorPosition(); + pos.position = Integer.parseInt(matcher.group(1)) - 1; + return pos; + } + } + return null; + } + +} diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/build.properties b/plugins/org.jkiss.dbeaver.ext.postgresql/build.properties index 47642d7967..5185705c88 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/build.properties +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/build.properties @@ -4,7 +4,4 @@ bin.includes = plugin.xml,\ META-INF/,\ .,\ icons/,\ - plugin.properties,\ - plugin_ru.properties, \ - plugin_zh.properties, \ - plugin_it.properties + plugin.properties -- GitLab