diff --git a/3rd_src/pom.xml b/3rd_src/pom.xml index e7ffc0036723fec2cd2d1d528b5c0ea552d1500d..915c853aace2997bfee5e5d9b1dccb7732c4f143 100644 --- a/3rd_src/pom.xml +++ b/3rd_src/pom.xml @@ -18,6 +18,11 @@ win + + org.opengauss + opengauss-jdbc + 3.1.0 + org.jsoup jsoup diff --git a/code/datastudio/src/Common-collection/.classpath b/code/datastudio/src/Common-collection/.classpath index 81cf73a05f3b1b8734939f3e8ef3c2357e1fa8ae..9c8eaefb7e476a81c16481462338a51726ae155c 100644 --- a/code/datastudio/src/Common-collection/.classpath +++ b/code/datastudio/src/Common-collection/.classpath @@ -1,17 +1,17 @@ - + - - - - - - - - + + + + + + + + diff --git a/code/datastudio/src/JSQLParser/.classpath b/code/datastudio/src/JSQLParser/.classpath index 1d3bd4a03cfcab125cdea43bb9ab75af64785586..72bb0059e44400de36f689581d3dcf66dcb407d7 100644 --- a/code/datastudio/src/JSQLParser/.classpath +++ b/code/datastudio/src/JSQLParser/.classpath @@ -1,5 +1,8 @@ + + - + + diff --git a/code/datastudio/src/commons-csv/.classpath b/code/datastudio/src/commons-csv/.classpath index 8b86a462099b2299803ea807ad95ca1a35f52c7c..1f8a5dc84873395f1b23830e2a8b4b3b661e37a1 100644 --- a/code/datastudio/src/commons-csv/.classpath +++ b/code/datastudio/src/commons-csv/.classpath @@ -1,5 +1,8 @@ - - + + + + + diff --git a/code/datastudio/src/copyExternalsToBuild.sh b/code/datastudio/src/copyExternalsToBuild.sh index b806689b4e592abceb84a0e7a7be322c179ab650..1f0cb611651cce923da70966406dd76726ceb81a 100644 --- a/code/datastudio/src/copyExternalsToBuild.sh +++ b/code/datastudio/src/copyExternalsToBuild.sh @@ -13,7 +13,7 @@ rm -rf ../docs rm -rf $DEST/../build rm -rf $DEST/db_assistant -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. @@ -53,7 +53,7 @@ cp $SOURCE/3rd_src/target/dependency/javafx-base-18-ea+2-win.jar $DEST/org.openg cp $SOURCE/3rd_src/target/dependency/javafx-controls-18-ea+2-win.jar $DEST/org.opengauss.mppdbide.view/. cp $SOURCE/3rd_src/target/dependency/javafx-graphics-18-ea+2-win.jar $DEST/org.opengauss.mppdbide.view/. cp $SOURCE/3rd_src/target/dependency/jsoup-1.14.3.jar $DEST/org.opengauss.mppdbide.view/. -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $DEST/org.opengauss.dbdriver.jdbc.gauss/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $DEST/org.opengauss.dbdriver.jdbc.gauss/. rm -rf $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib mkdir $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib @@ -70,7 +70,7 @@ cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.openga cp $SOURCE/3rd_src/target/dependency/commons-codec-1.15.jar $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/org.eclipse.osgi-3.9.1.v20130814-1242.jar $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib/. -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib/. rm -rf $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib mkdir $TEST/org.opengauss.mppdbide.bl.debug.test.fragment/lib @@ -123,7 +123,7 @@ cp $SOURCE/3rd_src/target/dependency/javassist-3.20.0-GA.jar $TEST/org.opengauss cp $SOURCE/3rd_src/target/dependency/jcommander-1.27.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/mockito-all-1.10.19.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/objenesis-3.2.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. cp $SOURCE/platform/Gauss200/gs_jdbc/mockrunner-jdbc.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. rm -rf $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib @@ -134,7 +134,7 @@ cp $SOURCE/3rd_src/target/dependency/mockrunner-jdbc-2.0.6.jar $TEST/org.openga cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/xml-apis-1.0.b2.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.bl.windows.test.fragment/lib/. @@ -206,7 +206,7 @@ cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.opengau cp $SOURCE/3rd_src/target/dependency/xml-apis-1.0.b2.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/commons-collections4-4.4.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/log4j-1.2.15.jar $TEST/org.opengauss.mppdbide.presentation.windows.test.fragment/lib/. @@ -227,7 +227,7 @@ cp $SOURCE/3rd_src/target/dependency/mockrunner-jdbc-2.0.6.jar $TEST/org.opengau cp $SOURCE/3rd_src/target/dependency/mockrunner-core-2.0.6.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/xml-apis-1.0.b2.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/gson-2.8.6.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. -cp $SOURCE/platform/Gauss200/gs_jdbc/gsjdbc4.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/hamcrest-api-1.0.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/jsqlparser-3.2.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. cp $SOURCE/3rd_src/target/dependency/junit-4.13.2.jar $TEST/org.opengauss.mppdbide.util.windows.test.fragment/lib/. diff --git a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/.classpath b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/.classpath index bf1c51a19d078f173b582f1564b5dc6d17e12f61..208f2462756e1217653df8407251860af9444cdd 100644 --- a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/.classpath +++ b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/.classpath @@ -1,8 +1,7 @@ - + - - - + + diff --git a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/MANIFEST.MF b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/MANIFEST.MF index 99c1e80992f2d3a8de6ee4bef69ddaf8b52cd152..5fb0909f5e879c79302278d1306f13c0d9bb36be 100644 --- a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/MANIFEST.MF +++ b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/MANIFEST.MF @@ -25,4 +25,4 @@ Export-Package: org.postgresql, org.postgresql.util, org.postgresql.xa Bundle-ClassPath: ., - gsjdbc4.jar + opengauss-jdbc-3.1.0.jar diff --git a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/build.properties b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/build.properties index c7f7579805b248a583f6389b86ecca691f2a944e..a38c0ca00e0aeb604007e95fe3d7086ea16f88fc 100644 --- a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/build.properties +++ b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/build.properties @@ -1,3 +1,3 @@ output.. = . bin.includes = META-INF/,\ - gsjdbc4.jar + opengauss-jdbc-3.1.0.jar diff --git a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/gsjdbc4.jar b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/gsjdbc4.jar deleted file mode 100644 index e81422018a4a619d5719aa12a77633d5ff2182e4..0000000000000000000000000000000000000000 Binary files a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/gsjdbc4.jar and /dev/null differ diff --git a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/.classpath b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/.classpath index 6ae8eb6f0a8021436940397b1574147090eb7259..96d268005a77f10fcfac50377d478a087d708f0d 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/.classpath @@ -1,11 +1,11 @@ - - - + - + + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/.classpath b/code/datastudio/src/org.opengauss.mppdbide.bl/.classpath index 682e4d0ba30be0b8c0d1f79fe9a0864fc9123e86..6d82f8d10a5f81edab9c2d59fe03e42eb2edbdeb 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/.classpath @@ -1,14 +1,14 @@ - + - - - - - + + + + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/.classpath b/code/datastudio/src/org.opengauss.mppdbide.debuger/.classpath index 751c8f2e504c40d1c41ebbd87d8f8968529e9c30..bc57d2383d545884b89334a8dd1293afd4316f5d 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/.classpath @@ -1,7 +1,7 @@ - - + - + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.editor.extension/.classpath b/code/datastudio/src/org.opengauss.mppdbide.editor.extension/.classpath index 065ac06e197692d54ca4890fd3674df11d41c8c0..bc57d2383d545884b89334a8dd1293afd4316f5d 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.editor.extension/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.editor.extension/.classpath @@ -1,7 +1,7 @@ - + - - + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.explainplan/.classpath b/code/datastudio/src/org.opengauss.mppdbide.explainplan/.classpath index 936cda9e9fd714f6e0445428b3dfbdba65649eb6..7102eed950d7b827676eac05cbf9927e281c3cb3 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.explainplan/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.explainplan/.classpath @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.parser/.classpath b/code/datastudio/src/org.opengauss.mppdbide.parser/.classpath index 1722178cdfc5f1a0e96de49f82ee116d38dd6e7e..ce7eb8bb0de14f9fc5bb3f815ee53d1eae18b6b0 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.parser/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.parser/.classpath @@ -1,12 +1,12 @@ - - - - + - + + + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/.classpath b/code/datastudio/src/org.opengauss.mppdbide.presentation/.classpath index e31912d3b25059455c950ac11dd9c8897d859a70..1d45a8a9f264a90672531f1edfd0a6933a663e33 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/.classpath @@ -1,38 +1,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseConnectionHelper.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseConnectionHelper.java index 56ccecca18d046d6091f8e6025887ebc7d36c1be..2730bf8c9da53079c757a639c784ac5d8b47f480 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseConnectionHelper.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseConnectionHelper.java @@ -22,6 +22,7 @@ import org.postgresql.core.Version; import org.postgresql.log.Log; import org.postgresql.fastpath.Fastpath; import org.postgresql.jdbc.AutoSave; +import org.postgresql.jdbc.ClientLogic; import org.postgresql.jdbc.FieldMetadata; import org.postgresql.jdbc.FieldMetadata.Key; import org.postgresql.jdbc.PreferQueryMode; @@ -405,5 +406,16 @@ private boolean throwSQLException; public String getSocketAddress() { return ""; } + + @Override + public boolean getBitToString() { + // TODO Auto-generated method stub + return false; + } + @Override + public ClientLogic getClientLogic() { + // TODO Auto-generated method stub + return null; + } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/Connfactory.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/Connfactory.java index 49d7cf264f060b9a141d135d87f0fd0fb763cfdd..ad7319da95a4c53726b3595227a7562035b3ad29 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/Connfactory.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/Connfactory.java @@ -392,4 +392,32 @@ public class Connfactory implements QueryExecutor public String getGaussdbVersion() { return ""; } + + @Override + public String getCompatibilityMode() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean getEnableOutparamOveride() { + // TODO Auto-generated method stub + return false; + } + @Override + public void setAvailability(boolean arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setCompatibilityMode(String arg0) { + // TODO Auto-generated method stub + + } + @Override + public void setEnableOutparamOveride(boolean arg0) { + // TODO Auto-generated method stub + + } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/properties/ExportExcelApachePOITest.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/properties/ExportExcelApachePOITest.java index 2bd24e7988ddac6d59b96e3eda42696f0235b64e..3ecc887592771b1cec955874afe1f06048978d7a 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/properties/ExportExcelApachePOITest.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/properties/ExportExcelApachePOITest.java @@ -1676,12 +1676,6 @@ public class ExportExcelApachePOITest extends BasicJDBCTestCaseAdapter String progressLabelName = core.getProgressLabelName(); assertEquals("MyTable.pg_catalog.Gauss@TestConnectionName", progressLabelName); } - - catch (DatabaseOperationException e) - { - fail(e.getMessage()); - - } catch (MPPDBIDEException e) { fail(e.getMessage()); diff --git a/code/datastudio/src/org.opengauss.mppdbide.utils/.classpath b/code/datastudio/src/org.opengauss.mppdbide.utils/.classpath index 14280364947f4424381b6013c9c3f366ebb07b73..7c53064d98b038ffa58f4c6f5625ba486f6f1c38 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.utils/.classpath +++ b/code/datastudio/src/org.opengauss.mppdbide.utils/.classpath @@ -1,9 +1,9 @@ - + - - - - + + + + diff --git a/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/logger/ISensitiveExceptionsFilter.java b/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/logger/ISensitiveExceptionsFilter.java index f437f170f353cf130090dca9b7f6a41dc7f0059f..337f197e44ead1f66a34d72213b49160281ee1df 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/logger/ISensitiveExceptionsFilter.java +++ b/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/logger/ISensitiveExceptionsFilter.java @@ -17,7 +17,6 @@ package org.opengauss.mppdbide.utils.logger; import java.io.FileNotFoundException; import java.net.BindException; -import java.security.acl.NotOwnerException; import java.util.ConcurrentModificationException; import java.util.MissingResourceException; import java.util.jar.JarException; @@ -46,7 +45,7 @@ public interface ISensitiveExceptionsFilter { */ static boolean isSensitiveException(Throwable throwable) { if (throwable instanceof FileNotFoundException || throwable instanceof JarException - || throwable instanceof MissingResourceException || throwable instanceof NotOwnerException + || throwable instanceof MissingResourceException || throwable instanceof ConcurrentModificationException || throwable instanceof InsufficientResourcesException || throwable instanceof BindException || throwable instanceof OutOfMemoryError || throwable instanceof StackOverflowError) { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/.classpath index 9d0792bebfffc77e7ca64a1ea05e2d3790d45317..bdabe24a8aae67b8886810c5d7112fd08049364c 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/.classpath @@ -1,20 +1,23 @@ - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/META-INF/MANIFEST.MF index 3ef6a791607412d798451fd805d9f2dc426438ee..44df43f8f10d94a355013ce9fd32e3c08d5f0b75 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Bundle-ClassPath: lib/mockrunner-jdbc-2.0.6.jar, ., lib/commons-codec-1.15.jar, lib/org.eclipse.osgi-3.9.1.v20130814-1242.jar, - lib/gsjdbc4.jar + lib/opengauss-jdbc-3.1.0.jar Import-Package: org.opengauss.mppdbide.bl.serverdatacache, org.opengauss.mppdbide.bl.util, org.opengauss.mppdbide.bl.serverdatacache.connectioninfo diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/build.properties index 3fd9b60f8fb2a5708b25bbe5aa895db92efc7504..7dfa45b380cbc4bf66e29cfb18d1f509b4e6f7f1 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/build.properties @@ -13,5 +13,5 @@ bin.includes = META-INF/,\ lib/org.eclipse.osgi-3.9.1.v20130814-1242.jar,\ lib/mockrunner-jdbc-2.0.6.jar,\ lib/mockrunner-core-2.0.6.jar,\ - lib/gsjdbc4.jar + lib/opengauss-jdbc-3.1.0.jar diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseConnectionHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseConnectionHelper.java index 03aded59e4366bd110b2ce9e336a521aa6f05b6b..ad7f6d2bb495f8198ee7e397b6b33e3f43031822 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseConnectionHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseConnectionHelper.java @@ -23,6 +23,7 @@ import org.postgresql.core.Version; import org.postgresql.fastpath.Fastpath; import org.postgresql.log.Log; import org.postgresql.jdbc.AutoSave; +import org.postgresql.jdbc.ClientLogic; import org.postgresql.jdbc.FieldMetadata; import org.postgresql.jdbc.FieldMetadata.Key; import org.postgresql.jdbc.PreferQueryMode; @@ -420,4 +421,16 @@ private boolean throwSQLException; public String getSocketAddress() { return ""; } + + @Override + public boolean getBitToString() { + // TODO Auto-generated method stub + return false; + } + + @Override + public ClientLogic getClientLogic() { + // TODO Auto-generated method stub + return null; + } } diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/Connfactory.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/Connfactory.java index 83dcf5bc7134a6098f75cb8f8a14c8309a7e7044..49c2e11af927386b8268f1bf9ce31480d60be3a0 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/Connfactory.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/Connfactory.java @@ -393,4 +393,34 @@ public class Connfactory implements QueryExecutor public String getGaussdbVersion() { return ""; } + + @Override + public String getCompatibilityMode() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean getEnableOutparamOveride() { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setAvailability(boolean arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setCompatibilityMode(String arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setEnableOutparamOveride(boolean arg0) { + // TODO Auto-generated method stub + + } } diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/.classpath index dd5ef3c3c38ee8639fb0e6c5b4d2298f1cb0dd9f..77c6462ef15ff5a318a0e979a327875cf581f163 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/.classpath @@ -1,19 +1,22 @@ - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/META-INF/MANIFEST.MF index f305ab141216d099f73f37969d788ea3c1a83c14..31d7341410acc5fcb7e1246599e618bbe42acf92 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/META-INF/MANIFEST.MF @@ -14,10 +14,10 @@ Bundle-ClassPath: lib/commons-logging-1.0.4.jar, lib/easymock-4.3.jar, lib/log4j-1.2.15.jar, ., - lib/junit-4.11.jar, lib/commons-io-2.11.0.jar, lib/mockrunner-jdbc-2.0.6.jar, - lib/mockrunner-core-2.0.6.jar + lib/mockrunner-core-2.0.6.jar, + lib/junit-4.13.2.jar Require-Bundle: org.junit;bundle-version="4.12.0", org.apache.log4j;bundle-version="1.2.15", org.opengauss.mppdbide.util, diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/.classpath index 2ada6a3821686916cb0c80de6db09479f48e892c..09ac57cd64ed983628d344cf9a90ea63560f33cb 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/.classpath @@ -1,44 +1,45 @@ - + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF index f01a252965412070b9339b5f2c8260fab7d59836..ccf5fe25846a56bc247e24466d9297d6a5915256 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Bundle-ClassPath: lib/mockrunner-jdbc.jar, lib/hamcrest-api-1.0.jar, lib/easymock-4.3.jar, lib/log4j-1.2.15.jar, - lib/junit-4.11.jar, lib/jsqlparser-3.2.jar, lib/org.eclipse.osgi-3.9.1.v20130814-1242.jar, lib/commons-io-2.11.0.jar, @@ -39,7 +38,8 @@ Bundle-ClassPath: lib/mockrunner-jdbc.jar, lib/jcommander-1.27.jar, lib/mockito-all-1.10.19.jar, lib/objenesis-3.2.jar, - lib/gsjdbc4.jar + lib/junit-4.13.2.jar, + lib/opengauss-jdbc-3.1.0.jar Eclipse-ExtensibleAPI: true Require-Bundle: org.opengauss.dbdriver.jdbc.gauss;bundle-version="1.0.0", org.junit;bundle-version="4.12.0", diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties index b98c05ccd329e323ad2b759f1a9d9c9fef741182..7224ccc32ede415ba4b06ffb76602a4b1e499487 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/build.properties @@ -7,7 +7,6 @@ bin.includes = META-INF/,\ lib/xml-apis-1.0.b2.jar,\ lib/hamcrest-api-1.0.jar,\ lib/easymock-4.3.jar,\ - lib/gson-2.8.6.jar,\ lib/log4j-1.2.15.jar,\ lib/junit-4.13.2.jar,\ lib/org.eclipse.osgi-3.9.1.v20130814-1242.jar,\ @@ -17,10 +16,10 @@ bin.includes = META-INF/,\ lib/powermock-api-support-1.6.6.jar,\ lib/powermock-core-1.6.6.jar,\ lib/powermock-api-easymock-1.6.6.jar,\ - lib/powermock-module-junit4-legacy-1.6.6.jar,\ - lib/powermock-module-testng-1.6.6.jar,\ - lib/powermock-module-testng-common-1.6.6.jar,\ - lib/powermock-classloading-base-1.6.6.jar,\ + lib/powermock-module-junit4-legacy-1.6.6.jar,\ + lib/powermock-module-testng-1.6.6.jar,\ + lib/powermock-module-testng-common-1.6.6.jar,\ + lib/powermock-classloading-base-1.6.6.jar,\ lib/powermock-module-javaagent-1.6.6.jar,\ lib/powermock-module-junit4-1.6.6.jar,\ lib/powermock-module-junit4-common-1.6.6.jar,\ @@ -33,5 +32,5 @@ bin.includes = META-INF/,\ lib/jcommander-1.27.jar,\ lib/mockito-all-1.10.19.jar,\ lib/objenesis-3.2.jar,\ - lib/gsjdbc4.jar,\ - lib/mockrunner-jdbc.jar + lib/mockrunner-jdbc.jar,\ + lib/opengauss-jdbc-3.1.0.jar diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseConnectionHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseConnectionHelper.java index f3280fb0ce0ac9fce8bf2118f619cfd5ae7ef92a..e671e06492aadf8bd25cb0d1b36b4749feb5210f 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseConnectionHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseConnectionHelper.java @@ -22,6 +22,7 @@ import org.postgresql.core.Version; import org.postgresql.fastpath.Fastpath; import org.postgresql.log.Log; import org.postgresql.jdbc.AutoSave; +import org.postgresql.jdbc.ClientLogic; import org.postgresql.jdbc.FieldMetadata; import org.postgresql.jdbc.FieldMetadata.Key; import org.postgresql.jdbc.PreferQueryMode; @@ -421,4 +422,16 @@ private boolean throwSQLException; return ""; } + @Override + public boolean getBitToString() { + // TODO Auto-generated method stub + return false; + } + + @Override + public ClientLogic getClientLogic() { + // TODO Auto-generated method stub + return null; + } + } diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/Connfactory.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/Connfactory.java index 9b628bf56c634c9a1f2b207e1c25e645cd2e3549..3e2782841fa3b1525a0ef5aee2b878cde53af2e3 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/Connfactory.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/Connfactory.java @@ -396,4 +396,34 @@ public class Connfactory implements QueryExecutor return ""; } + @Override + public String getCompatibilityMode() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean getEnableOutparamOveride() { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setAvailability(boolean arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setCompatibilityMode(String arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void setEnableOutparamOveride(boolean arg0) { + // TODO Auto-generated method stub + + } + } diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/.classpath index 5dcbf396a139cf984a9cbdb9f35e527e21d8811f..12acc59ec20519ccf059587de3f9a0676cd9c06c 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/.classpath @@ -1,13 +1,16 @@ - + + + + + - + + + + + - - - - - - + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/META-INF/MANIFEST.MF index a568c88ee1436db8f2ada76d20b9f28e2292ac54..19f167d8daa693d871d26c48b24f0e49782e8d95 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.editor.extension.test.fragment/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Require-Bundle: org.junit;bundle-version="4.12.0" Bundle-ClassPath: lib/antlr4-runtime-4.9.2.jar, lib/log4j-1.2.15.jar, lib/commons-codec-1.15.jar, - lib/junit-4.11.jar, lib/hamcrest-api-1.0.jar, + lib/junit-4.13.2.jar, . diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/.classpath index 18f5a8a875c2be49003b83a34fb00245e22a7029..476e78dc0d29c2c2a79992ff8c1ef947be9669c5 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/.classpath @@ -1,19 +1,22 @@ - + + + + + - + + + + + + + - - - - - - - - - - - - + + + + + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/META-INF/MANIFEST.MF index 39e3a2036d5f87012f4e2161a9bbf560741cc41b..dd0f519e5fc7ae01d7d02636a7cf94878f01510d 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.explainplan.test.fragment/META-INF/MANIFEST.MF @@ -15,9 +15,9 @@ Bundle-ClassPath: lib/commons-logging-1.0.4.jar, lib/log4j-1.2.15.jar, ., lib/commons-codec-1.15.jar, - lib/junit-4.11.jar, lib/mockrunner-jdbc-2.0.6.jar, - lib/mockrunner-core-2.0.6.jar + lib/mockrunner-core-2.0.6.jar, + lib/junit-4.13.2.jar Require-Bundle: org.eclipse.e4.core.services;bundle-version="2.0.0", org.junit;bundle-version="4.12.0", org.apache.log4j;bundle-version="1.2.15", diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/.classpath index ee644aa7704599b46c1627e34b90839e6c0aac1a..5b223c613f93b5b905975cef230fdfacc1852739 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/.classpath @@ -1,20 +1,22 @@ - + + + + + - + + + + + + + - - - - - - - - - - - - - + + + + + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/META-INF/MANIFEST.MF index 7accf63834ed9bae59c41d5461dabd9fa107060f..fac3dbcec7720f02efa8b67ba353394c73e13268 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.parser.test.fragment/META-INF/MANIFEST.MF @@ -15,9 +15,9 @@ Bundle-ClassPath: lib/commons-logging-1.0.4.jar, lib/log4j-1.2.15.jar, ., lib/commons-codec-1.15.jar, - lib/junit-4.11.jar, lib/antlr4-runtime-4.9.2.jar, - lib/mockrunner-jdbc-2.0.6.jar + lib/mockrunner-jdbc-2.0.6.jar, + lib/junit-4.13.2.jar Require-Bundle: org.eclipse.e4.core.services;bundle-version="2.0.0", org.junit;bundle-version="4.12.0", org.apache.log4j;bundle-version="1.2.15" diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/.classpath b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/.classpath index cead07f801543d28ebb1370e5e8827926df21fb1..588c3b74e098ab6af6bffbf2407ff2b9ab1a2f4e 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/.classpath +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/.classpath @@ -1,21 +1,24 @@ - + + + + + - + + + + + + + - - - - - - - - - - - - - - + + + + + + + diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/META-INF/MANIFEST.MF b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/META-INF/MANIFEST.MF index 32d59aadf4eb65ada031fe1948d0937c0f3f2ebd..53ca38014566831277a346d0f3518dc0a7a18621 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/META-INF/MANIFEST.MF +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.utils.test.fragment/META-INF/MANIFEST.MF @@ -15,11 +15,11 @@ Bundle-ClassPath: lib/commons-logging-1.0.4.jar, lib/log4j-1.2.15.jar, ., lib/commons-codec-1.15.jar, - lib/junit-4.11.jar, lib/jsqlparser-3.2.jar, lib/commons-io-2.11.0.jar, lib/mockrunner-jdbc-2.0.6.jar, - lib/mockrunner-core-2.0.6.jar + lib/mockrunner-core-2.0.6.jar, + lib/junit-4.13.2.jar Require-Bundle: org.eclipse.e4.core.services;bundle-version="2.0.0", org.junit;bundle-version="4.12.0", org.apache.log4j;bundle-version="1.2.15" diff --git a/platform/Gauss200/gs_jdbc/gsjdbc4.jar b/platform/Gauss200/gs_jdbc/gsjdbc4.jar deleted file mode 100644 index e81422018a4a619d5719aa12a77633d5ff2182e4..0000000000000000000000000000000000000000 Binary files a/platform/Gauss200/gs_jdbc/gsjdbc4.jar and /dev/null differ