diff --git a/3rd_src/pom.xml b/3rd_src/pom.xml index 915c853aace2997bfee5e5d9b1dccb7732c4f143..a5095ba8f45b3ff017269b0db37ad7323dc01e80 100644 --- a/3rd_src/pom.xml +++ b/3rd_src/pom.xml @@ -21,7 +21,7 @@ org.opengauss opengauss-jdbc - 3.1.0 + 3.1.1-og org.jsoup diff --git a/code/datastudio/src/copyExternalsToBuild.sh b/code/datastudio/src/copyExternalsToBuild.sh index 1f0cb611651cce923da70966406dd76726ceb81a..13050bb9b55743295ca7c5bc3a7f955eec8a1d33 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/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $DEST/org.opengauss.mppdbide.presentation/src-test/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.1-og.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/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $DEST/org.opengauss.dbdriver.jdbc.gauss/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.1-og.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/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.adapter.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.1-og.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/3rd_src/target/dependency/opengauss-jdbc-3.1.0.jar $TEST/org.opengauss.mppdbide.bl.test.fragment/lib/. +cp $SOURCE/3rd_src/target/dependency/opengauss-jdbc-3.1.1-og.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/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/opengauss-jdbc-3.1.1-og.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/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/opengauss-jdbc-3.1.1-og.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/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/opengauss-jdbc-3.1.1-og.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 208f2462756e1217653df8407251860af9444cdd..f70f3503a2d495b45bbd26a31cf454683e7eade9 100644 --- a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/.classpath +++ b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/.classpath @@ -2,6 +2,6 @@ - + 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 5fb0909f5e879c79302278d1306f13c0d9bb36be..b4afe2b549c6fe155a63830a4fa066ece69eb2db 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 @@ -4,25 +4,25 @@ Bundle-Name: Gauss Bundle-SymbolicName: org.opengauss.dbdriver.jdbc.gauss Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.postgresql, - org.postgresql.copy, - org.postgresql.core, - org.postgresql.core.types, - org.postgresql.core.v3, - org.postgresql.ds, - org.postgresql.ds.common, - org.postgresql.fastpath, - org.postgresql.geometric, - org.postgresql.gss, - org.postgresql.jdbc, - org.postgresql.jdbc2, - org.postgresql.jdbc2.optional, - org.postgresql.largeobject, - org.postgresql.log, - org.postgresql.replication, - org.postgresql.ssl, - org.postgresql.ssl.jdbc4, - org.postgresql.util, - org.postgresql.xa +Export-Package: org.opengauss, + org.opengauss.copy, + org.opengauss.core, + org.opengauss.core.types, + org.opengauss.core.v3, + org.opengauss.ds, + org.opengauss.ds.common, + org.opengauss.fastpath, + org.opengauss.geometric, + org.opengauss.gss, + org.opengauss.jdbc, + org.opengauss.jdbc2, + org.opengauss.jdbc2.optional, + org.opengauss.largeobject, + org.opengauss.log, + org.opengauss.replication, + org.opengauss.ssl, + org.opengauss.ssl.jdbc4, + org.opengauss.util, + org.opengauss.xa Bundle-ClassPath: ., - opengauss-jdbc-3.1.0.jar + opengauss-jdbc-3.1.1-og.jar diff --git a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/services/java.sql.Driver b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/services/java.sql.Driver index 6f036886fb526215ce64592816ff3dbb3a740e58..ff7b0b5fbc6f83f5489180b47e6b5d9cdf131ac2 100644 --- a/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/services/java.sql.Driver +++ b/code/datastudio/src/org.opengauss.dbdriver.jdbc.gauss/META-INF/services/java.sql.Driver @@ -1 +1 @@ -org.postgresql.Driver +org.opengauss.Driver 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 a38c0ca00e0aeb604007e95fe3d7086ea16f88fc..05f03d6f285858a8d69cf9730db64aaf26a145f5 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/,\ - opengauss-jdbc-3.1.0.jar + opengauss-jdbc-3.1.1-og.jar diff --git a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R6Driver.java b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R6Driver.java index 8ac3871b63dfd10b8136c918ff8d5fdc9a60ce14..8be3c01d16c1310c31bf09baecac65c1ec20dbfc 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R6Driver.java +++ b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R6Driver.java @@ -57,7 +57,7 @@ public class Gauss200V1R6Driver extends AbstractConnectionDriver { setToolPathMap(hashMap); - org.postgresql.Driver driver = new org.postgresql.Driver(); + org.opengauss.Driver driver = new org.opengauss.Driver(); setJDBCDriver((Driver) driver); } diff --git a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R7Driver.java b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R7Driver.java index 7ca21c312a639be6246e47649e3e7e162654388a..23ea5b64b80ede1c807b93bbb2dd66ecec63c9d7 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R7Driver.java +++ b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/driver/Gauss200V1R7Driver.java @@ -55,7 +55,7 @@ public class Gauss200V1R7Driver extends AbstractConnectionDriver { setToolPathMap(hashMap); - org.postgresql.Driver driver = new org.postgresql.Driver(); + org.opengauss.Driver driver = new org.opengauss.Driver(); setJDBCDriver((Driver) driver); } diff --git a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/DBConnection.java b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/DBConnection.java index ca7157dc20e19ba605b4c25e06e573ecba0d346b..1b6a796ff66aefb636222c9e85c812dd84d92dd9 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/DBConnection.java +++ b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/DBConnection.java @@ -28,11 +28,11 @@ import java.sql.Statement; import java.util.Locale; import java.util.Properties; -import org.postgresql.copy.CopyManager; -import org.postgresql.core.BaseConnection; -import org.postgresql.core.BaseStatement; -import org.postgresql.core.TransactionState; -import org.postgresql.jdbc.PgConnection; +import org.opengauss.copy.CopyManager; +import org.opengauss.core.BaseConnection; +import org.opengauss.core.BaseStatement; +import org.opengauss.core.TransactionState; +import org.opengauss.jdbc.PgConnection; import org.opengauss.mppdbide.adapter.IConnectionDriver; import org.opengauss.mppdbide.utils.DsEncodingEnum; diff --git a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/GaussMppDbNoticeListner.java b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/GaussMppDbNoticeListner.java index cf4fecd2013bb79787cb4184ff24fadae114f347..b9529c94bdbb10857b25755d6880cf9ed0b5d055 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/GaussMppDbNoticeListner.java +++ b/code/datastudio/src/org.opengauss.mppdbide.adapter.gauss/src/org/opengauss/mppdbide/adapter/gauss/GaussMppDbNoticeListner.java @@ -17,7 +17,7 @@ package org.opengauss.mppdbide.adapter.gauss; import java.sql.SQLWarning; -import org.postgresql.core.NoticeListener; +import org.opengauss.core.NoticeListener; import org.opengauss.mppdbide.utils.messaging.IMessageQueue; import org.opengauss.mppdbide.utils.messaging.Message; diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/META-INF/MANIFEST.MF b/code/datastudio/src/org.opengauss.mppdbide.bl/META-INF/MANIFEST.MF index e9a6cefd62f0fc039d5f81b93454ed4c0e47e7b4..5e6223cdbbfce13c8e32bbf109765f5c16be0ae9 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/META-INF/MANIFEST.MF +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.300", org.eclipse.equinox.registry Import-Package: org.opengauss.mppdbide.bl.serverdatacache, org.apache.commons.lang;version="2.6.0", - org.postgresql.jdbc2 + org.opengauss.jdbc2 Bundle-ClassPath: ., gson-2.8.6.jar, commons-lang3-3.12.0.jar, diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/ColumnMetaData.java b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/ColumnMetaData.java index e60474313feffaae24c7c2c21055cb465a0156c4..0de642689b6dff003bac1871014761271c6e84e5 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/ColumnMetaData.java +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/ColumnMetaData.java @@ -15,6 +15,9 @@ package org.opengauss.mppdbide.bl.serverdatacache; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import org.opengauss.mppdbide.adapter.gauss.DBConnection; import org.opengauss.mppdbide.utils.MPPDBIDEConstants; import org.opengauss.mppdbide.utils.exceptions.DatabaseCriticalException; @@ -66,6 +69,10 @@ public class ColumnMetaData extends BatchDropServerObject implements GaussOLAPDB private String colDescription; + private ArrayList enumOrSetValues; + + private HashSet enumOrSetList; + private static final String OCP = "all"; /** @@ -86,6 +93,24 @@ public class ColumnMetaData extends BatchDropServerObject implements GaussOLAPDB this.colDescription = colDescription; } + /** + * Gets the enum or set values. + * + * @return the enum or set values + */ + public ArrayList getEnumOrSetValues() { + return enumOrSetValues; + } + + /** + * Sets the enum or set values. + * + * @param enumOrSetValues the new enum or set values + */ + public void setEnumOrSetValues(ArrayList enumOrSetValues) { + this.enumOrSetValues = enumOrSetValues; + } + /** * Instantiates a new column meta data. * @@ -403,7 +428,11 @@ public class ColumnMetaData extends BatchDropServerObject implements GaussOLAPDB if (isSchemaselected) { query.append(this.dataType.getDisplayName()); } else { - query.append(this.dataType.getName()); + String dataType = this.dataType.getName(); + query.append(dataType); + if ("set".equals(dataType) || "enum".equals(dataType)) { + query.append(formEnumOrSetValues()); + } } } @@ -435,6 +464,31 @@ public class ColumnMetaData extends BatchDropServerObject implements GaussOLAPDB return query.toString(); } + /** + * Form enum or set values string + * + */ + private String formEnumOrSetValues() { + if (this.enumOrSetValues == null || this.enumOrSetValues.size() == 0) { + return ""; + } + Iterator valuesItr = this.enumOrSetValues.iterator(); + boolean hasNext = valuesItr.hasNext(); + String value = null; + StringBuilder formValues = new StringBuilder(); + formValues.append('('); + while (hasNext) { + value = valuesItr.next(); + formValues.append('\'').append(value).append('\''); + hasNext = valuesItr.hasNext(); + if (hasNext) { + formValues.append(", "); + } + } + formValues.append(')'); + return formValues.toString(); + } + /** * Form precision and array dimension for query. * @@ -621,6 +675,9 @@ public class ColumnMetaData extends BatchDropServerObject implements GaussOLAPDB qry.append(this.dataType.getName()); } + if ("set".equals(this.dataType.getName()) || "enum".equals(this.dataType.getName())) { + qry.append(formEnumOrSetValues()); + } } if (0 != this.lenOrPrecision) { qry.append('('); @@ -950,4 +1007,12 @@ public class ColumnMetaData extends BatchDropServerObject implements GaussOLAPDB return ""; } + public HashSet getEnumOrSetList() { + return enumOrSetList; + } + + public void setEnumOrSetList(HashSet enumOrSetList) { + this.enumOrSetList = enumOrSetList; + } + } diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Database.java b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Database.java index 5f8d2f967efa56b8fcbf80de0b994c52f495aa07..4bdecee261422bac4684025906e34395dd8e7a0d 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Database.java +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Database.java @@ -15,6 +15,7 @@ package org.opengauss.mppdbide.bl.serverdatacache; +import java.sql.Array; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -44,7 +45,6 @@ import org.opengauss.mppdbide.bl.serverdatacache.groups.ObjectList; import org.opengauss.mppdbide.bl.serverdatacache.groups.SystemNamespaceObjectGroup; import org.opengauss.mppdbide.bl.serverdatacache.groups.UserNamespaceObjectGroup; import org.opengauss.mppdbide.bl.util.BLUtils; -import org.opengauss.mppdbide.bl.util.ExecTimer; import org.opengauss.mppdbide.utils.IMessagesConstants; import org.opengauss.mppdbide.utils.MPPDBIDEConstants; import org.opengauss.mppdbide.utils.exceptions.DatabaseCriticalException; @@ -136,6 +136,8 @@ public class Database extends ServerObject implements GaussOLAPDBMSObject { private DataTypeProvider dataTypeProvider = null; + private HashMap dolphinTypes = null; + /** * Gets the db name. * @@ -1431,4 +1433,87 @@ public class Database extends ServerObject implements GaussOLAPDBMSObject { public boolean isExplainPlanSupported() { return isExplainPlanSupported; } + + public void InitDolphinTypesIfNeeded() throws DatabaseCriticalException, DatabaseOperationException { + if (HasDolphin()) { + InitDolphinTypes(); + } + } + + private boolean HasDolphin() + throws DatabaseCriticalException, DatabaseOperationException { + String qry = "select count(*) = 1 from pg_extension where extname = 'dolphin'"; + String qry2 = "select count(*) = 1 from pg_proc where proname = 'dolphin_types' and pronamespace = 11 and pronargs = 0"; + boolean hasDolphinExtention = false; + boolean hasDolphinTypesFunction = false; + ResultSet rs = null; + ResultSet rs2 = null; + try { + rs = this.getConnectionManager().execSelectAndReturnRsOnObjBrowserConn(qry); + boolean hasNext = rs.next(); + while (hasNext) { + hasDolphinExtention = rs.getBoolean(1); + hasNext = rs.next(); + } + rs2 = this.getConnectionManager().execSelectAndReturnRsOnObjBrowserConn(qry2); + hasNext = rs2.next(); + while (hasNext) { + hasDolphinTypesFunction = rs2.getBoolean(1); + hasNext = rs2.next(); + } + } catch (SQLException exp) { + try { + GaussUtils.handleCriticalException(exp); + } catch (DatabaseCriticalException dc) { + throw dc; + } + MPPDBIDELoggerUtility + .error(MessageConfigLoader.getProperty(IMessagesConstants.ERR_FETCH_DATABASE_OPERATION), exp); + throw new DatabaseOperationException(IMessagesConstants.ERR_FETCH_DATABASE_OPERATION, exp); + } finally { + this.getConnectionManager().closeRSOnObjBrowserConn(rs); + this.getConnectionManager().closeRSOnObjBrowserConn(rs2); + } + + return hasDolphinExtention & hasDolphinTypesFunction; + } + + public void InitDolphinTypes() throws DatabaseCriticalException, DatabaseOperationException + { + String qry = "select dolphin_types()"; + ResultSet rs = null; + try { + rs = this.getConnectionManager().execSelectAndReturnRsOnObjBrowserConn(qry); + boolean hasNext = rs.next(); + while (hasNext) { + Array array = rs.getArray(1); + if (array != null) { + String[][] strs = (String[][]) array.getArray(); + dolphinTypes = new HashMap(strs.length); + for (int i = 0; i < strs.length; i++) { + dolphinTypes.put(strs[i][0], new boolean[] {Boolean.parseBoolean(strs[i][1]), + Boolean.parseBoolean(strs[i][2])}); + } + } + hasNext = rs.next(); + } + } catch (SQLException exp) { + try { + GaussUtils.handleCriticalException(exp); + } catch (DatabaseCriticalException dc) { + throw dc; + } + MPPDBIDELoggerUtility + .error(MessageConfigLoader.getProperty(IMessagesConstants.ERR_FETCH_DATABASE_OPERATION), exp); + throw new DatabaseOperationException(IMessagesConstants.ERR_FETCH_DATABASE_OPERATION, exp); + } finally { + this.getConnectionManager().closeRSOnObjBrowserConn(rs); + } + + return; + } + + public HashMap getDolphinTypes() { + return this.dolphinTypes; + } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/DatabaseUtils.java b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/DatabaseUtils.java index 8abd4e68b7072597067caef92b37a05811515252..67ef7e5df757fc7a1c3265b3ebb38eb7550de5df 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/DatabaseUtils.java +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/DatabaseUtils.java @@ -555,7 +555,7 @@ public interface DatabaseUtils { */ static String[][] getdefaultDatatypeList() { String[][] defaultDatatype = {{"char", null}, {"varchar", null}, {"text", null}, {"int4", "integer"}, - {"int2", "smallint"}, {"int8", "bigint"}, {"date", null}, {"money", null}, {"numeric", null}, + {"int1", "tinyint"}, {"int2", "smallint"}, {"int8", "bigint"}, {"date", null}, {"money", null}, {"numeric", null}, {"numeric", "decimal"}, {"float8", "double precision"}, {"float4", "real"}, {"interval", null}, {"time", "time without time zone"}, {"timestamp", "timestamp without time zone"}, {"bool", "boolean"}, {"bit", null}, {"box", null}, {"bytea", null}, {"cidr", null}, {"circle", null}, {"inet", null}, diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Server.java b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Server.java index cb111b44fadeeef095b4b5b54cd96e55148046d5..676679e3793745f26255ab8aaeed6fbe32b779d4 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Server.java +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/Server.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -37,7 +36,6 @@ import org.opengauss.mppdbide.bl.serverdatacache.savepsswordoption.SavePrdOption import org.opengauss.mppdbide.utils.CustomStringUtility; import org.opengauss.mppdbide.utils.IMessagesConstants; import org.opengauss.mppdbide.utils.MPPDBIDEConstants; -import org.opengauss.mppdbide.utils.MemoryCleaner; import org.opengauss.mppdbide.utils.exceptions.DataStudioSecurityException; import org.opengauss.mppdbide.utils.exceptions.DatabaseCriticalException; import org.opengauss.mppdbide.utils.exceptions.DatabaseOperationException; @@ -359,6 +357,7 @@ public class Server implements IConnectionProfile, GaussOLAPDBMSObject { setServerIP2(db.fetchServerIP()); DatabaseUtils.checkCancelStatusAndAbort(status, db); refreshUserRoleObjectGroup(); + db.InitDolphinTypesIfNeeded(); return db.getProfileId(); } diff --git a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/TableValidatorRules.java b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/TableValidatorRules.java index e5f39591fd8dfa28b1293fe492bc40cda62af6a8..2480e29f6729cec203b88a4d4064721d044be1c4 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/TableValidatorRules.java +++ b/code/datastudio/src/org.opengauss.mppdbide.bl/src/org/opengauss/mppdbide/bl/serverdatacache/TableValidatorRules.java @@ -16,6 +16,7 @@ package org.opengauss.mppdbide.bl.serverdatacache; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; /** @@ -89,6 +90,9 @@ public final class TableValidatorRules { ArrayList types = null; types = db.getDefaultDatatype().getList(); + HashMap dolphinTypes = db.getDolphinTypes(); + + boolean dolphin = dolphinTypes != null; // remove pseudo types when listing data types for column if (column) { @@ -106,9 +110,25 @@ public final class TableValidatorRules { objectIter.remove(); } + if (dolphin && dolphinTypes.containsKey(name)) { + dolphin = false; + } hasMore = objectIter.hasNext(); } } + if (dolphin) { + Namespace ns = (Namespace)db.getSystemNamespaces().get("pg_catalog"); + Iterator dolphinTypesIter = dolphinTypes.keySet().stream().sorted().iterator(); + int typeOid = 10000; + String typename = null; + boolean hasMore = dolphinTypesIter.hasNext(); + + while (hasMore) { + typename = dolphinTypesIter.next(); + types.add(new TypeMetaData(typeOid++, typename, ns)); + hasMore = dolphinTypesIter.hasNext(); + } + } return types; } diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/META-INF/MANIFEST.MF b/code/datastudio/src/org.opengauss.mppdbide.debuger/META-INF/MANIFEST.MF index 9fb82c430e9edccf9b45cf9e1f52f58bab881a0f..e274898cb7a73c3f8d4ed217413606615887c18c 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/META-INF/MANIFEST.MF +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Export-Package: org.opengauss.mppdbide.common, org.opengauss.mppdbide.debuger.vo, org.opengauss.mppdbide.debuger.vo.dbe Bundle-ClassPath: . -Import-Package: org.postgresql.core, - org.postgresql.jdbc, - org.postgresql.util +Import-Package: org.opengauss.core, + org.opengauss.jdbc, + org.opengauss.util Bundle-ActivationPolicy: lazy diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/DBConnectionAdapter.java b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/DBConnectionAdapter.java index 85750ffce74eb276841947526b548481f73c1f79..b039b2817768ba4b34d4227ab1b4ac37b8be05a2 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/DBConnectionAdapter.java +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/DBConnectionAdapter.java @@ -19,7 +19,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import org.postgresql.core.NoticeListener; +import org.opengauss.core.NoticeListener; import org.opengauss.mppdbide.adapter.gauss.DBConnection; import org.opengauss.mppdbide.debuger.debug.DebugConstants; diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/GaussManager.java b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/GaussManager.java index 76d141b394f52c32ad0fb22dc6be3fa5933658c3..9a0ecec8e7b8d8cee701926255f6cd62dce2231a 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/GaussManager.java +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/GaussManager.java @@ -15,8 +15,8 @@ package org.opengauss.mppdbide.common; -import org.postgresql.core.BaseStatement; -import org.postgresql.core.NoticeListener; +import org.opengauss.core.BaseStatement; +import org.opengauss.core.NoticeListener; import org.opengauss.mppdbide.utils.logger.MPPDBIDELoggerUtility; diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/IConnection.java b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/IConnection.java index 588ad6893afd925d9f8e6bd5770c05f9f38f2fcb..c3e0277bb9ef30a9dc2367d15c95a2aa5961e204 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/IConnection.java +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/common/IConnection.java @@ -20,7 +20,7 @@ import java.sql.SQLException; import java.util.List; import org.opengauss.mppdbide.debuger.debug.DebugConstants; -import org.postgresql.core.NoticeListener; +import org.opengauss.core.NoticeListener; /** * Title: interface diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/service/DebugService.java b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/service/DebugService.java index 244544b73cafaed63192753864fda801aaba8396..bfb40e394a5f2be9995fef4ca82b0c605249870b 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/service/DebugService.java +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/service/DebugService.java @@ -48,8 +48,8 @@ import org.opengauss.mppdbide.debuger.vo.VariableVo; import org.opengauss.mppdbide.debuger.vo.VersionVo; import org.opengauss.mppdbide.utils.VariableRunLine; import org.opengauss.mppdbide.utils.logger.MPPDBIDELoggerUtility; -import org.postgresql.core.NoticeListener; -import org.postgresql.util.PGobject; +import org.opengauss.core.NoticeListener; +import org.opengauss.util.PGobject; /** * Title: the DebugService class diff --git a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/vo/FunctionVo.java b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/vo/FunctionVo.java index f7c6c953df0ac1f718f386fd7d987e71e2e3912d..75937288f206627511ad27af2bf0c827f4692df0 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/vo/FunctionVo.java +++ b/code/datastudio/src/org.opengauss.mppdbide.debuger/src/org/opengauss/mppdbide/debuger/vo/FunctionVo.java @@ -16,8 +16,8 @@ package org.opengauss.mppdbide.debuger.vo; import org.opengauss.mppdbide.debuger.annotation.DumpFiled; -import org.postgresql.jdbc.PgArray; -import org.postgresql.util.PGobject; +import org.opengauss.jdbc.PgArray; +import org.opengauss.util.PGobject; /** * Title: the FunctionVo class diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/META-INF/MANIFEST.MF b/code/datastudio/src/org.opengauss.mppdbide.presentation/META-INF/MANIFEST.MF index 54a764861fc0c86e73c0b8606e67e21f9a1c3c1a..8237d7dd737a640fe2a6212de464c61d6632b512 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/META-INF/MANIFEST.MF +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Import-Package: ca.odell.glazedlists, org.opengauss.mppdbide.utils.exceptions, org.eclipse.e4.core.services.events, org.eclipse.swt.graphics, - org.postgresql.core + org.opengauss.core Export-Package: org.opengauss.mppdbide.presentation, org.opengauss.mppdbide.presentation.autorefresh, org.opengauss.mppdbide.presentation.contentassistprocesser, 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 2730bf8c9da53079c757a639c784ac5d8b47f480..0ce77deb1b5eb2e83c3d2e1aaa5b8d435344df6e 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 @@ -9,28 +9,28 @@ import java.util.Properties; import java.util.TimerTask; import java.util.concurrent.Executor; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyManager; -import org.postgresql.core.BaseConnection; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Encoding; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ReplicationProtocol; -import org.postgresql.core.TransactionState; -import org.postgresql.core.TypeInfo; -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; -import org.postgresql.largeobject.LargeObjectManager; -import org.postgresql.replication.PGReplicationConnection; -import org.postgresql.util.HostSpec; -import org.postgresql.util.LruCache; -import org.postgresql.xml.PGXmlFactoryFactory; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyManager; +import org.opengauss.core.BaseConnection; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Encoding; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ReplicationProtocol; +import org.opengauss.core.TransactionState; +import org.opengauss.core.TypeInfo; +import org.opengauss.core.Version; +import org.opengauss.log.Log; +import org.opengauss.fastpath.Fastpath; +import org.opengauss.jdbc.AutoSave; +import org.opengauss.jdbc.ClientLogic; +import org.opengauss.jdbc.FieldMetadata; +import org.opengauss.jdbc.FieldMetadata.Key; +import org.opengauss.jdbc.PreferQueryMode; +import org.opengauss.largeobject.LargeObjectManager; +import org.opengauss.replication.PGReplicationConnection; +import org.opengauss.util.HostSpec; +import org.opengauss.util.LruCache; +import org.opengauss.xml.PGXmlFactoryFactory; import com.mockrunner.mock.jdbc.MockConnection; @@ -307,7 +307,7 @@ private boolean throwSQLException; } @Override - public org.postgresql.jdbc.TimestampUtils getTimestampUtils() { + public org.opengauss.jdbc.TimestampUtils getTimestampUtils() { // TODO Auto-generated method stub return null; } diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseStatementHelper.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseStatementHelper.java index 15a0e28400e31f0307639b4697eb9ffea1efbb43..79888b400d821e2284f6ce7fd79e69be53761708 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseStatementHelper.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/BaseStatementHelper.java @@ -6,12 +6,12 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.util.List; -import org.postgresql.core.BaseStatement; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Field; -import org.postgresql.core.NoticeListener; -import org.postgresql.core.Query; -import org.postgresql.core.ResultCursor; +import org.opengauss.core.BaseStatement; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Field; +import org.opengauss.core.NoticeListener; +import org.opengauss.core.Query; +import org.opengauss.core.ResultCursor; public class BaseStatementHelper implements BaseStatement { diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CommonLLTUtils.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CommonLLTUtils.java index ab5abce2c1710755dd4ccc7a858847e69548804c..15753fd98c11fa2844b974b2e7b1c70ac0eec481 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CommonLLTUtils.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CommonLLTUtils.java @@ -282,7 +282,7 @@ public class CommonLLTUtils try { - initDriver("org.postgresql.Driver"); + initDriver("org.opengauss.Driver"); } catch (DatabaseOperationException e) { 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 ad7319da95a4c53726b3595227a7562035b3ad29..1c2dfdb03570d456a8f7ad18f66630f90ef03c0c 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 @@ -7,22 +7,22 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyOperation; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Encoding; -import org.postgresql.core.NativeQuery; -import org.postgresql.core.ParameterList; -import org.postgresql.core.Query; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ReplicationProtocol; -import org.postgresql.core.ResultCursor; -import org.postgresql.core.ResultHandler; -import org.postgresql.core.TransactionState; -import org.postgresql.jdbc.AutoSave; -import org.postgresql.jdbc.BatchResultHandler; -import org.postgresql.jdbc.PreferQueryMode; -import org.postgresql.util.HostSpec; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyOperation; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Encoding; +import org.opengauss.core.NativeQuery; +import org.opengauss.core.ParameterList; +import org.opengauss.core.Query; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ReplicationProtocol; +import org.opengauss.core.ResultCursor; +import org.opengauss.core.ResultHandler; +import org.opengauss.core.TransactionState; +import org.opengauss.jdbc.AutoSave; +import org.opengauss.jdbc.BatchResultHandler; +import org.opengauss.jdbc.PreferQueryMode; +import org.opengauss.util.HostSpec; public class Connfactory implements QueryExecutor { diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CopyOperationHelper.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CopyOperationHelper.java index 9f9b274d49c10894145d72f2fa384a805e7c347f..2ee54aaa45850951e9a536cd164a3a5c8fb3d956 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CopyOperationHelper.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/CopyOperationHelper.java @@ -2,8 +2,8 @@ package org.opengauss.mppdbide.mock.presentation; import java.sql.SQLException; -import org.postgresql.copy.CopyIn; -import org.postgresql.copy.CopyOut; +import org.opengauss.copy.CopyIn; +import org.opengauss.copy.CopyOut; public class CopyOperationHelper implements CopyOut, CopyIn { diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/EncodingHelper.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/EncodingHelper.java index 508aaa5b33d19d8ddace4bebbe27fdba5cffab1b..efb92b90355ffec3e9576456f33f856e4b8862f8 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/EncodingHelper.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/mock/presentation/EncodingHelper.java @@ -1,6 +1,6 @@ package org.opengauss.mppdbide.mock.presentation; -import org.postgresql.core.Encoding; +import org.opengauss.core.Encoding; public class EncodingHelper extends Encoding { 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 3ecc887592771b1cec955874afe1f06048978d7a..f24dcdf2ffa40502a3105b6f33c04cf97f3f303b 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 @@ -14,7 +14,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.postgresql.util.HostSpec; +import org.opengauss.util.HostSpec; import org.opengauss.mppdbide.adapter.gauss.DBConnection; import org.opengauss.mppdbide.bl.importexportdata.ImportExportDataExecuter; diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/GenerateSQLDataCoreTest.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/GenerateSQLDataCoreTest.java index 6e384799c2dd6d4fda152dd82066ec80f8c6de3c..e64485b3024e0c834c567dfa2c9cb27bfd3e52c2 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/GenerateSQLDataCoreTest.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/GenerateSQLDataCoreTest.java @@ -14,7 +14,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.postgresql.util.HostSpec; +import org.opengauss.util.HostSpec; import static org.junit.Assert.*; import org.opengauss.mppdbide.adapter.gauss.DBConnection; diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/ImportExportDataTest.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/ImportExportDataTest.java index 91a1e6c073ebeff2c43cf953224531ad5cc338c2..fc57bf0f8e168f4f8e4bfb944a464acb94cc0390 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/ImportExportDataTest.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/ImportExportDataTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.postgresql.util.HostSpec; +import org.opengauss.util.HostSpec; import org.opengauss.mppdbide.adapter.gauss.DBConnection; import org.opengauss.mppdbide.bl.preferences.BLPreferenceManager; diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/QueryResultMaterializerTest.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/QueryResultMaterializerTest.java index 56c16d213a67fef09b296d6f157eec4ca944fee5..d8bbf2455a6ea46495bbedc9b865aa99a532ead5 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/QueryResultMaterializerTest.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src-test/org/opengauss/mppdbide/test/presentation/table/QueryResultMaterializerTest.java @@ -174,7 +174,7 @@ public class QueryResultMaterializerTest extends BasicJDBCTestCaseAdapter DBConnection dbConnection = new DBConnection(); try { - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); } catch (DatabaseOperationException e1) { diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQuery.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQuery.java index f0b9de3aa956a24da3e385fcee4f4aadee4f8ed0..78d6f3d79f25024aa29fad032cf753ecef37d865 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQuery.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQuery.java @@ -87,7 +87,11 @@ public class EditTableExecuteQuery implements EditTableExecuteQueryUtility { for (int index = 0; index < editValueCount; index++) { value = editValues.get(index); if (!IEditTableExecuteQuery.isNonPlaceholderType(value)) { - stmt.setObject(index + 1, value); + if (value instanceof String) { + stmt.setObject(index + 1, value, Types.OTHER); + } else { + stmt.setObject(index + 1, value); + } } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQueryUtility.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQueryUtility.java index 0236b7ea078cc3e7b24bdfd9b3dca56a3610bd47..6567bfb5e33022f1217466098461a77d9530bb6b 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQueryUtility.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/EditTableExecuteQueryUtility.java @@ -17,6 +17,7 @@ package org.opengauss.mppdbide.presentation.edittabledata; import java.sql.PreparedStatement; import java.sql.SQLException; +import java.util.HashMap; import java.util.List; import org.opengauss.mppdbide.adapter.gauss.DBConnection; @@ -93,7 +94,7 @@ public interface EditTableExecuteQueryUtility { value = updatedRow.getOriginalValue(columnIndex); if (value != null && !IEditTableExecuteQuery.isNonPlaceholderType(value) && IEditTableExecuteQuery.isDatatypeSupported(columnProvider.getColumnDataTypeName(columnIndex), - columnProvider.getPrecision(columnIndex))) { + columnProvider.getPrecision(columnIndex), dsEditTableDataGridDataProvider.getDatabse().getDolphinTypes())) { placeholderIdx++; IEditTableExecuteQuery.preparePlaceHolderStmt(columnProvider, value, placeholderIdx, stmt, index); } @@ -168,7 +169,7 @@ public interface EditTableExecuteQueryUtility { PreparedStatement stmt = null; try { stmt = conn.getConnection().prepareStatement(query); - addPlaceHolderForDeletedClms(deletedRow, uniqueKeys, columnProvider, stmt, conn); + addPlaceHolderForDeletedClms(deletedRow, uniqueKeys, columnProvider, stmt, conn, dsEditTableDataGridDataProvider.getDatabse().getDolphinTypes()); int result = stmt.executeUpdate(); if (result == 0) { @@ -208,7 +209,7 @@ public interface EditTableExecuteQueryUtility { * @throws SQLException the SQL exception */ public default void addPlaceHolderForDeletedClms(IDSGridEditDataRow deletedRow, List uniqueKeys, - IDSGridColumnProvider columnProvider, PreparedStatement stmt, DBConnection conn) throws SQLException { + IDSGridColumnProvider columnProvider, PreparedStatement stmt, DBConnection conn, HashMap dolphinTypes) throws SQLException { Object value; String colName; int columnIndex; @@ -220,7 +221,7 @@ public interface EditTableExecuteQueryUtility { value = deletedRow.getOriginalValue(columnIndex); if (null != value && !IEditTableExecuteQuery.isNonPlaceholderType(value) && IEditTableExecuteQuery.isDatatypeSupported(columnProvider.getColumnDataTypeName(columnIndex), - columnProvider.getPrecision(columnIndex))) { + columnProvider.getPrecision(columnIndex), dolphinTypes)) { placeHolder++; value = IEditTableExecuteQuery.transformToSqlDatatypes(columnProvider, index, value, conn.getConnection()); diff --git a/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/IEditTableExecuteQuery.java b/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/IEditTableExecuteQuery.java index 24d2d5afa58e73a1b6cdbeec6f42da4f0bb962d0..401626d0b7bd9481d2825d230a38e24d7ad2a145 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/IEditTableExecuteQuery.java +++ b/code/datastudio/src/org.opengauss.mppdbide.presentation/src/org/opengauss/mppdbide/presentation/edittabledata/IEditTableExecuteQuery.java @@ -21,6 +21,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Timestamp; import java.sql.Types; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Locale; @@ -244,7 +245,11 @@ public interface IEditTableExecuteQuery { int placeholderIdx, PreparedStatement stmt, int index) throws SQLException { Object value = valueParam; value = transformToSqlDatatypes(columnProvider, index, value, stmt.getConnection()); - stmt.setObject(placeholderIdx, value); + if (value instanceof String) { + stmt.setObject(placeholderIdx, value, Types.OTHER); + } else { + stmt.setObject(placeholderIdx, value); + } } /** @@ -398,7 +403,7 @@ public interface IEditTableExecuteQuery { strBldr.append(" is null"); } else { strBldr.append(" = "); - handleNonEditableDatatypeQuery(columnProvider, value, columnIndex, strBldr); + handleNonEditableDatatypeQuery(columnProvider, value, columnIndex, strBldr, dsEditTableDataGridDataProvider.getDatabse().getDolphinTypes()); } if (iterator.hasNext()) { @@ -463,7 +468,7 @@ public interface IEditTableExecuteQuery { queryBuilder.append(" is null"); } else { queryBuilder.append(" = "); - handleNonEditableDatatypeQuery(columnProvider, value, columnIndex, queryBuilder); + handleNonEditableDatatypeQuery(columnProvider, value, columnIndex, queryBuilder, dsEditTableDataGridDataProvider.getDatabse().getDolphinTypes()); } if (iterator.hasNext()) { @@ -484,9 +489,9 @@ public interface IEditTableExecuteQuery { * @param query the query */ static void handleNonEditableDatatypeQuery(IDSGridColumnProvider columnProvider, Object value, int columnIndex, - StringBuilder query) { + StringBuilder query, HashMap dolphinTypes) { if (!isDatatypeSupported(columnProvider.getColumnDataTypeName(columnIndex), - columnProvider.getPrecision(columnIndex))) { + columnProvider.getPrecision(columnIndex), dolphinTypes)) { query.append(ServerObject.getLiteralName(value.toString())); } else { filterPlaceHolderQuery(value, query); @@ -529,7 +534,7 @@ public interface IEditTableExecuteQuery { * @param precision the precision * @return true, if is datatype supported */ - public static boolean isDatatypeSupported(String sqlType, int precision) { + public static boolean isDatatypeSupported(String sqlType, int precision, HashMap dolphinTypes) { switch (sqlType.toLowerCase(Locale.ENGLISH)) { case "bpchar": case "char": @@ -555,6 +560,9 @@ public interface IEditTableExecuteQuery { } return true; default: + if (dolphinTypes != null && dolphinTypes.containsKey(sqlType.toLowerCase(Locale.ENGLISH))) { + return true; + } return false; } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages.properties b/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages.properties index 9acaa368e2af651ea1741e2f3e2a7e8a7039c21d..f5d6a1a30269aef5b0583ee0431762367b18a2fb 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages.properties +++ b/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages.properties @@ -591,6 +591,9 @@ INDEX_UI_TYPE=Index Type INDEX_UI_ACCESS_METHOD=Access Method INDEX_UI_TABLESPACE=Tablespace +SET_ENUM_UI_USER_VALUE=User Defined Value +EDIT_SETTING_VALUE=Edit Setting Value + DATA_DIST_UI_HAST_FUN=HASH Function Options DATA_DIST_UI_DEFAULT_DIST=DEFAULT DISTRIBUTION diff --git a/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages_zh_CN.properties b/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages_zh_CN.properties index f15d3ac7475ba951dbeb2095c9c79cf00087cab7..5700a3cc886fc92ce0c06ac45cf46794b83b8e93 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages_zh_CN.properties +++ b/code/datastudio/src/org.opengauss.mppdbide.utils/src/messages_zh_CN.properties @@ -575,6 +575,9 @@ INDEX_UI_TYPE=\u7D22\u5F15\u7C7B\u578B INDEX_UI_ACCESS_METHOD=\u8BBF\u95EE\u65B9\u5F0F INDEX_UI_TABLESPACE=\u8868\u7A7A\u95F4 +SET_ENUM_UI_USER_VALUE=\u7528\u6237\u81EA\u5B9A\u4E49\u503C +EDIT_SETTING_VALUE=\u7F16\u8F91\u8BBE\u7F6E\u503C + DATA_DIST_UI_HAST_FUN=HASH\u51FD\u6570\u7684\u9009\u62E9 DATA_DIST_UI_DEFAULT_DIST=\u9ED8\u8BA4\u5206\u5E03 diff --git a/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/IMessagesConstantsOne.java b/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/IMessagesConstantsOne.java index dab1c0c3e9eb5351fe9d8723de87bc93b277d291..e9f0a0fd8660736013828065ef37c682db14e9c2 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/IMessagesConstantsOne.java +++ b/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/IMessagesConstantsOne.java @@ -676,6 +676,9 @@ public interface IMessagesConstantsOne extends IMessagesConstantsTwo { String INDEX_UI_ACCESS_METHOD = "INDEX_UI_ACCESS_METHOD"; String INDEX_UI_TABLESPACE = "INDEX_UI_TABLESPACE"; + String SET_ENUM_UI_USER_VALUE = "SET_ENUM_UI_USER_VALUE"; + String EDIT_SETTING_VALUE="EDIT_SETTING_VALUE"; + String DATA_DIST_UI_HAST_FUN = "DATA_DIST_UI_HAST_FUN"; String DATA_DIST_UI_DEFAULT_DIST = "DATA_DIST_UI_DEFAULT_DIST"; diff --git a/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/MPPDBIDEConstants.java b/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/MPPDBIDEConstants.java index f4d8566b89e4510e16a163988f6d52bc4e9b19c6..7d7f1a10aef6988d1c1da5b65d19b50c18e83d84 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/MPPDBIDEConstants.java +++ b/code/datastudio/src/org.opengauss.mppdbide.utils/src/org/opengauss/mppdbide/utils/MPPDBIDEConstants.java @@ -74,7 +74,7 @@ public interface MPPDBIDEConstants { String UNKNOWN_DATATYPE_STR = ""; - String DRIVER_NAME = "org.postgresql.Driver"; + String DRIVER_NAME = "org.opengauss.Driver"; String SWTBOT_KEY = "org.eclipse.swtbot.widget.key"; diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF b/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF index 3770da56c384bf14f64b3d6a532bdb5e73a63af1..c787810d6e0d36bf779220672a2c616a593c625e 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF +++ b/code/datastudio/src/org.opengauss.mppdbide.view/META-INF/MANIFEST.MF @@ -103,4 +103,4 @@ Import-Package: com.google.common.collect;version="15.0.0", org.opengauss.mppdbide.presentation.resultsetif, org.opengauss.mppdbide.presentation.search, org.opengauss.mppdbide.presentation.visualexplainplan, - org.postgresql + org.opengauss diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/DSGridToolTipProvider.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/DSGridToolTipProvider.java index 4e34bc2104b0a10667d76fcfba8e09ad9449e315..a6daeb8e412f7e6bef946121d7a199fb8a630be0 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/DSGridToolTipProvider.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/DSGridToolTipProvider.java @@ -244,7 +244,8 @@ public class DSGridToolTipProvider extends NatTableContentTooltip { return toolTipText + MessageConfigLoader.getProperty(IMessagesConstants.TOOLTIP_DISTRIBUTION_COL); } else if (dataProvider instanceof DSObjectPropertiesGridDataProvider) { return toolTipText; - } else if (!GridUIUtils.isDatatypeEditSupported(colDatatypeName, colPrecisionVal)) { + } else if (!GridUIUtils.isDatatypeEditSupported(colDatatypeName, colPrecisionVal, + dataProvider.getDatabse())) { return toolTipText + MessageConfigLoader.getProperty(IMessagesConstants.TOOLTIP_READONLY_COL); } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/EditTableGridStyleConfiguration.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/EditTableGridStyleConfiguration.java index 2e7789fead46a2c813bff8f51922a770daebbc44..9eadb54c574633076d208d3aecabe93f9dcf0ed5 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/EditTableGridStyleConfiguration.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/EditTableGridStyleConfiguration.java @@ -16,6 +16,8 @@ package org.opengauss.mppdbide.view.component.grid; import java.sql.Types; +import java.util.HashMap; +import java.util.HashSet; import org.eclipse.nebula.widgets.cdatetime.CDT; import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration; @@ -50,7 +52,10 @@ import org.opengauss.mppdbide.presentation.objectproperties.PropertiesConstants; import org.opengauss.mppdbide.presentation.objectproperties.PropertiesUserRoleImpl; import org.opengauss.mppdbide.utils.IMessagesConstants; import org.opengauss.mppdbide.utils.MPPDBIDEConstants; +import org.opengauss.mppdbide.utils.exceptions.DatabaseCriticalException; +import org.opengauss.mppdbide.utils.exceptions.DatabaseOperationException; import org.opengauss.mppdbide.utils.loader.MessageConfigLoader; +import org.opengauss.mppdbide.utils.logger.MPPDBIDELoggerUtility; import org.opengauss.mppdbide.view.component.IGridUIPreference; import org.opengauss.mppdbide.view.component.grid.core.DSAbstractRegistryConfiguration; import org.opengauss.mppdbide.view.component.grid.core.DSBlobCellEditor; @@ -70,7 +75,24 @@ import org.opengauss.mppdbide.view.utils.icon.IconUtility; public class EditTableGridStyleConfiguration extends AbstractRegistryConfiguration implements IEditTableGridStyleLabelFactory { private static final String COL_LABEL_TIMESTAMP = "TIMESTAMP"; - + private static HashSet extraTypes = new HashSet<>(); + + + static { + extraTypes.add("int1"); + extraTypes.add("nvarchar2"); + extraTypes.add("interval"); + extraTypes.add("blob"); + extraTypes.add("clob"); + extraTypes.add("varbit"); + extraTypes.add("box"); + extraTypes.add("path"); + extraTypes.add("circle"); + extraTypes.add("lseg"); + extraTypes.add("point"); + extraTypes.add("polygon"); + extraTypes.add("binary"); + } /** * Configure registry. * @@ -303,12 +325,13 @@ public class EditTableGridStyleConfiguration extends AbstractRegistryConfigurati if (dataProvider instanceof DSObjectPropertiesGridDataProvider) { handleDSObjectGridConfigureRegistry(configRegistry, dataProvider, columnCount); } - handleCommonColumnConfigureRegistry(configRegistry, dataProvider, columnCount); + handleCommonColumnConfigureRegistry(configRegistry, dataProvider, columnCount, + dataProvider.getDatabse() != null ?dataProvider.getDatabse().getDolphinTypes() : null); } private void handleCommonColumnConfigureRegistry(IConfigRegistry configRegistry, - IDSGridDataProvider dataProvider, int columnCount) { + IDSGridDataProvider dataProvider, int columnCount, HashMapdolphinTypes) { int colDatatype = 0; for (int i = 0; i < columnCount; i++) { colDatatype = dataProvider.getColumnDataProvider().getColumnDatatype(i); @@ -331,6 +354,24 @@ public class EditTableGridStyleConfiguration extends AbstractRegistryConfigurati break; } case Types.OTHER: { + String colDatatypeName = dataProvider.getColumnDataProvider().getColumnDataTypeName(i); + if (extraTypes.contains(colDatatypeName) || (dolphinTypes != null && dolphinTypes.containsKey(colDatatypeName))) { + configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new DSTextCellEditor(), + DisplayMode.NORMAL, COL_LABEL_COPY_READONLY_CELL); + break; + } + try { + if (GridUIUtils.istypType(colDatatypeName, "s", dataProvider.getDatabse()) || + GridUIUtils.istypType(colDatatypeName, "e", dataProvider.getDatabse())) { + configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, new DSTextCellEditor(), + DisplayMode.NORMAL, COL_LABEL_COPY_READONLY_CELL); + break; + } + } catch (DatabaseCriticalException exception) { + MPPDBIDELoggerUtility.error("istypType query failed", exception); + } catch (DatabaseOperationException exception) { + MPPDBIDELoggerUtility.error("istypType query failed", exception); + } cursorTypeConfiguration(configRegistry, dataProvider); break; } diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/GridUIUtils.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/GridUIUtils.java index e2821735de626eac992b8c9bbca34a7b3a58e3fd..8a8a44b9b4f05a4b812b47cdcc65be45c9bbd376 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/GridUIUtils.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/GridUIUtils.java @@ -15,6 +15,9 @@ package org.opengauss.mppdbide.view.component.grid; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashMap; import java.util.Locale; import org.eclipse.swt.SWT; @@ -22,11 +25,15 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; - +import org.opengauss.mppdbide.adapter.gauss.GaussUtils; +import org.opengauss.mppdbide.bl.serverdatacache.Database; import org.opengauss.mppdbide.presentation.objectproperties.PropertiesConstants; import org.opengauss.mppdbide.utils.IMessagesConstants; import org.opengauss.mppdbide.utils.MPPDBIDEConstants; +import org.opengauss.mppdbide.utils.exceptions.DatabaseCriticalException; +import org.opengauss.mppdbide.utils.exceptions.DatabaseOperationException; import org.opengauss.mppdbide.utils.loader.MessageConfigLoader; +import org.opengauss.mppdbide.utils.logger.MPPDBIDELoggerUtility; /** * @@ -95,13 +102,14 @@ public class GridUIUtils { * @param precision the precision * @return true, if is datatype edit supported */ - public static boolean isDatatypeEditSupported(String sqlType, int precision) { + public static boolean isDatatypeEditSupported(String sqlType, int precision, Database db) { switch (sqlType.toLowerCase(Locale.ENGLISH)) { case "bpchar": case "char": case "varchar": case "text": case "int4": + case "int1": case "int2": case "int8": case "date": @@ -118,6 +126,18 @@ public class GridUIUtils { case "real": case "number": case "boolean": + case "nvarchar2": + case "interval": + case "blob": + case "clob": + case "varbit": + case "box": + case "path": + case "circle": + case "lseg": + case "point": + case "polygon": + case "binary": case MPPDBIDEConstants.BYTEA: { return true; } @@ -128,12 +148,54 @@ public class GridUIUtils { return true; } default: { + HashMap dolphinTypes = db.getDolphinTypes(); + if (dolphinTypes != null) { + String typeName = sqlType.toLowerCase(Locale.ENGLISH); + if (dolphinTypes.containsKey(typeName)) { + return true; + } + try { + if (istypType(typeName, "s", db) || istypType(typeName, "e", db)) { + return true; + } + } catch (DatabaseCriticalException exception) { + MPPDBIDELoggerUtility.error("istypType query failed", exception); + } catch (DatabaseOperationException exception) { + MPPDBIDELoggerUtility.error("istypType query failed", exception); + } + } return false; } } } + public static boolean istypType(String typeName, String typType, Database db) throws DatabaseCriticalException, DatabaseOperationException { + String qry = "select count(*) from pg_type where typname = '" + typeName + "' and typtype = '" + typType + "';"; + boolean isSetType = false; + ResultSet rs = null; + try { + rs = db.getConnectionManager().execSelectAndReturnRsOnObjBrowserConn(qry); + boolean hasNext = rs.next(); + while (hasNext) { + isSetType = rs.getBoolean(1); + hasNext = rs.next(); + } + } catch (SQLException exp) { + try { + GaussUtils.handleCriticalException(exp); + } catch (DatabaseCriticalException dc) { + throw dc; + } + MPPDBIDELoggerUtility + .error(MessageConfigLoader.getProperty(IMessagesConstants.ERR_FETCH_DATABASE_OPERATION), exp); + throw new DatabaseOperationException(IMessagesConstants.ERR_FETCH_DATABASE_OPERATION, exp); + } finally { + db.getConnectionManager().closeRSOnObjBrowserConn(rs); + } + return isSetType; + } + /** * Checks if is editable properties attributes. * diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnHeaderAccumulator.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnHeaderAccumulator.java index 0796546f26828c53768d9169e844c0007cf3a635..15aebfcd617d1b1dd82d6ad3740493ddd52eada7 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnHeaderAccumulator.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnHeaderAccumulator.java @@ -76,7 +76,7 @@ public class GridColumnHeaderAccumulator extends ColumnLabelAccumulator { return; } - if (!GridUIUtils.isDatatypeEditSupported(columnDTName, precisionVal) + if (!GridUIUtils.isDatatypeEditSupported(columnDTName, precisionVal, editDP.getDatabse()) || editDP.isDistributionColumn(columnPosition)) { configLabels.addLabel(IEditTableGridStyleLabelFactory.COL_HEADER_LABEL_READONLY_CELL); } diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnLabelAccumulator.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnLabelAccumulator.java index 42ac4c77988e02b892071153747b478e6ce92c50..4554c09f3f230418f51e2ae998ade54c30e821b5 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnLabelAccumulator.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnLabelAccumulator.java @@ -217,7 +217,7 @@ public class GridColumnLabelAccumulator extends ColumnOverrideLabelAccumulator { private boolean checkIfDatatypeSupported(int colPosition, IDSEditGridDataProvider editDataProvider) { String columnDataTypeName = editDataProvider.getColumnDataProvider().getColumnDataTypeName(colPosition); int colPrecisionValue = editDataProvider.getColumnDataProvider().getPrecision(colPosition); - return GridUIUtils.isDatatypeEditSupported(columnDataTypeName, colPrecisionValue); + return GridUIUtils.isDatatypeEditSupported(columnDataTypeName, colPrecisionValue, editDataProvider.getDatabse()); } /* diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnValueAccessor.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnValueAccessor.java index 62d132f6102f7339a344d91ad97a0a8e58889275..89a2cae5d391a84b18917ab518e016887c225651 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnValueAccessor.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/component/grid/core/GridColumnValueAccessor.java @@ -319,7 +319,7 @@ public class GridColumnValueAccessor implements IColumnPropertyAccessor setOrEnumValues; + private HashSet setOrEnumList; + /** * Instantiates a new change data type dialog. * @@ -133,16 +155,16 @@ public class ChangeDataTypeDialog extends Dialog { Composite mainComposite = new Composite(currentShell, SWT.NONE); mainComposite.setLayout(new GridLayout(1, false)); - GridData mainCompositeGD = new GridData(SWT.FILL, SWT.NONE, true, false); + GridData mainCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); mainComposite.setLayoutData(mainCompositeGD); createDatatypeInfoGui(mainComposite); - Composite btnComposite = new Composite(mainComposite, SWT.NONE); + Composite btnComposite = new Composite(mainComposite, SWT.BOTTOM); btnComposite.setLayout(new GridLayout(8, true)); GridData btnCompositeGD = new GridData(SWT.FILL, SWT.BOTTOM, true, false); + btnCompositeGD.heightHint = 40; btnComposite.setLayoutData(btnCompositeGD); - new Label(btnComposite, SWT.NONE).setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 6, 1)); ; okButton = new Button(btnComposite, SWT.NONE); @@ -177,7 +199,7 @@ public class ChangeDataTypeDialog extends Dialog { currentShell.setLayout(new GridLayout(1, false)); GridData currentShellGD = new GridData(SWT.FILL, SWT.NONE, true, true); currentShell.setLayoutData(currentShellGD); - currentShell.setSize(720, 235); + currentShell.setSize(720, 345); /* Place the window in the centre of primary monitor */ if (display != null) { @@ -241,14 +263,16 @@ public class ChangeDataTypeDialog extends Dialog { final Database db = tableMetaData.getNamespace().getDatabase(); Label lblCurrentDataType = new Label(compositeColumns, SWT.NONE); - GridData lblCurrentDataTypeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData lblCurrentDataTypeGD = new GridData(SWT.FILL, SWT.NONE, true, false); lblCurrentDataTypeGD.horizontalIndent = 10; + lblCurrentDataTypeGD.heightHint = 20; lblCurrentDataType.setLayoutData(lblCurrentDataTypeGD); Composite inputComp = new Composite(compositeColumns, SWT.NONE); inputComp.setLayout(new GridLayout(4, false)); - GridData inputCompGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData inputCompGD = new GridData(SWT.FILL, SWT.FILL, true, false); inputComp.setLayoutData(inputCompGD); + inputCompGD.heightHint = 100; createDatatypeSchemaComposite(inputComp, db); createDataTypeComposite(inputComp, db); @@ -257,6 +281,8 @@ public class ChangeDataTypeDialog extends Dialog { createTypeDescriptorComposite(compositeColumns); createTypeConversionTipComposite(compositeColumns); + addDisplayEditValuesButton(compositeColumns); + createColumnOrExpr(compositeColumns); comboClmDataSchema.addSelectionListener(addComboClmDataSchemaSelectionListener(db)); comboClmDataType.addModifyListener(addComboClmDataTypeModifyListener(db)); @@ -280,9 +306,10 @@ public class ChangeDataTypeDialog extends Dialog { private void createTypeDescriptorComposite(Composite compositeColumns) { Composite typeDescriptorComp = new Composite(compositeColumns, SWT.NONE); typeDescriptorComp.setLayout(new GridLayout(2, false)); - GridData typeDescriptorCompGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData typeDescriptorCompGD = new GridData(SWT.FILL, SWT.FILL, true, false); typeDescriptorCompGD.horizontalIndent = 5; typeDescriptorComp.setLayoutData(typeDescriptorCompGD); + typeDescriptorCompGD.heightHint = 40; Label lblTypeDescription = new Label(typeDescriptorComp, SWT.NONE); lblTypeDescription.setText(MessageConfigLoader.getProperty(IMessagesConstants.TYPE_DES)); @@ -290,15 +317,17 @@ public class ChangeDataTypeDialog extends Dialog { lblDescriptionOfDatatype = new Label(typeDescriptorComp, SWT.NONE); lblDescriptionOfDatatype.setBackground(FontAndColorUtility.getColor(SWT.COLOR_WHITE)); - GridData lblDescriptionOfDatatypeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData lblDescriptionOfDatatypeGD = new GridData(SWT.FILL, SWT.NONE, true, false); + lblDescriptionOfDatatypeGD.heightHint = 40; lblDescriptionOfDatatype.setLayoutData(lblDescriptionOfDatatypeGD); lblDescriptionOfDatatype.setText(""); } private void createTypeConversionTipComposite(Composite compositeColumns) { Label datatypeConversionTip = new Label(compositeColumns, SWT.NONE); - GridData datatypeConversionTipGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData datatypeConversionTipGD = new GridData(SWT.FILL, SWT.FILL, true, false); datatypeConversionTipGD.horizontalIndent = 10; + datatypeConversionTipGD.heightHint = 30; datatypeConversionTip.setLayoutData(datatypeConversionTipGD); datatypeConversionTip.setText(MessageConfigLoader.getProperty(IMessagesConstants.DATA_TYPE_CONVERSION_TIP)); datatypeConversionTip.pack(); @@ -307,7 +336,8 @@ public class ChangeDataTypeDialog extends Dialog { private void createScaleComposite(Composite compositeColumns) { Composite scaleComp = new Composite(compositeColumns, SWT.NONE); scaleComp.setLayout(new GridLayout(1, false)); - GridData scaleCompGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData scaleCompGD = new GridData(SWT.FILL, SWT.FILL, true, false); + scaleCompGD.heightHint = 30; scaleCompGD.verticalSpan = 2; scaleComp.setLayoutData(scaleCompGD); @@ -316,14 +346,15 @@ public class ChangeDataTypeDialog extends Dialog { lblScale.pack(); spinnerScale = new Spinner(scaleComp, SWT.BORDER); - GridData spinnerScaleGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData spinnerScaleGD = new GridData(SWT.FILL, SWT.FILL, true, false); spinnerScale.setLayoutData(spinnerScaleGD); } private void createPrecisionComposite(Composite compositeColumns) { Composite precisionSizeComp = new Composite(compositeColumns, SWT.NONE); precisionSizeComp.setLayout(new GridLayout(1, false)); - GridData precisionSizeCompGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData precisionSizeCompGD = new GridData(SWT.FILL, SWT.FILL, true, false); + precisionSizeCompGD.heightHint = 30; precisionSizeCompGD.verticalSpan = 2; precisionSizeComp.setLayoutData(precisionSizeCompGD); @@ -332,7 +363,7 @@ public class ChangeDataTypeDialog extends Dialog { lblPre.pack(); spinnerPrevSize = new Spinner(precisionSizeComp, SWT.BORDER); - GridData spinnerPrevSizeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + GridData spinnerPrevSizeGD = new GridData(SWT.FILL, SWT.FILL, true, false); spinnerPrevSize.setLayoutData(spinnerPrevSizeGD); spinnerPrevSize.setMaximum(Integer.MAX_VALUE); } @@ -437,8 +468,8 @@ public class ChangeDataTypeDialog extends Dialog { return; } - spinnerPrevSize.setEnabled(UIUtils.enableDisablePrecisionFieldForDatatype(type.getName())); - spinnerScale.setEnabled(UIUtils.enableDisableScaleFieldForDatatype(type.getName())); + spinnerPrevSize.setEnabled(UIUtils.enableDisablePrecisionFieldForDatatype(type.getName(), db.getDolphinTypes())); + spinnerScale.setEnabled(UIUtils.enableDisableScaleFieldForDatatype(type.getName(), db.getDolphinTypes())); /* * when dialog is opened the saved value should be displayed @@ -476,8 +507,14 @@ public class ChangeDataTypeDialog extends Dialog { */ if (selectedNamespace == null || (!"information_schema".equals(selectedNamespace.getName()) && !"pg_catalog".equals(selectedNamespace.getName()))) { - spinnerPrevSize.setEnabled(UIUtils.enableDisablePrecisionFieldForDatatype(type.getName())); - spinnerScale.setEnabled(UIUtils.enableDisableScaleFieldForDatatype(type.getName())); + spinnerPrevSize.setEnabled(UIUtils.enableDisablePrecisionFieldForDatatype(type.getName(), db.getDolphinTypes())); + spinnerScale.setEnabled(UIUtils.enableDisableScaleFieldForDatatype(type.getName(), db.getDolphinTypes())); + if ("set".equals(type.getName()) || "enum".equals(type.getName())) { + editValues.setVisible(true); + } else { + grpValues.setVisible(false); + editValues.setVisible(false); + } } else { spinnerPrevSize.setEnabled(false); spinnerScale.setEnabled(false); @@ -512,6 +549,11 @@ public class ChangeDataTypeDialog extends Dialog { if (spinnerPrevSize != null && spinnerScale != null) { columnMetaData.setPre(spinnerPrevSize.getSelection(), spinnerScale.getSelection()); } + + if ("set".equals(type.getName()) || "enum".equals(type.getName())) { + columnMetaData.setEnumOrSetValues(new ArrayList(this.setOrEnumValues)); + columnMetaData.setEnumOrSetList(new HashSet(this.setOrEnumList)); + } } /** @@ -539,7 +581,7 @@ public class ChangeDataTypeDialog extends Dialog { } /** - * Disable data typen combo. + * Disable data type combo. */ private void disableDataTypenCombo() { if (!(validator.enableDisable())) { @@ -576,4 +618,288 @@ public class ChangeDataTypeDialog extends Dialog { public void cancel() { } + /** + * Creates the column or expr. + * + * @param comp the comp + */ + private void createColumnOrExpr(Composite comp) { + grpValues = new Group(comp, SWT.FILL); + grpValues.setLayout(new GridLayout(5, false)); + GridData groupGD = new GridData(SWT.FILL, SWT.FILL, true, true); + groupGD.heightHint = 10; + groupGD.horizontalSpan = 4; + grpValues.setLayoutData(groupGD); + + createUserDefComposite(); + createAddRemoveValueComposite(); + createValueTable(grpValues); + createUpDownValueComposite(); + createFinishComposite(); + grpValues.setVisible(false); + } + + private void createUserDefComposite() { + Composite userValueComp = new Composite(this.grpValues, SWT.FILL); + userValueComp.setLayout(new GridLayout(1, false)); + GridData avalColsOrUserExpCompGD = new GridData(SWT.FILL, SWT.FILL, true, true); + userValueComp.setLayoutData(avalColsOrUserExpCompGD); + + Composite userExprComposite = new Composite(userValueComp, SWT.FILL); + userExprComposite.setLayout(new GridLayout(1, false)); + GridData userExprCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + userExprComposite.setLayoutData(userExprCompositeGD); + userExprComposite.setSize(50, 30); + + Label lblUserDefinedValue = new Label(userExprComposite, SWT.FILL); + lblUserDefinedValue.setText(MessageConfigLoader.getProperty(IMessagesConstants.SET_ENUM_UI_USER_VALUE)); + lblUserDefinedValue.pack(); + + txtUserValue = new StyledText(userExprComposite, SWT.BORDER); + txtUserValue.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TXT_INDEXUI_USEREXPR_001"); + GridData txtUserExprGD = new GridData(SWT.FILL, SWT.NONE, true, true); + txtUserExprGD.heightHint = 30; + txtUserValue.setLayoutData(txtUserExprGD); + + setOrEnumList = new HashSet(); + setOrEnumValues = new ArrayList(); + } + + private void createAddRemoveValueComposite() { + Composite addRemoveValueComposite = new Composite(this.grpValues, SWT.NONE); + addRemoveValueComposite.setLayout(new GridLayout(1, false)); + GridData addRemoveIndexCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + addRemoveIndexCompositeGD.verticalAlignment = SWT.CENTER; + addRemoveValueComposite.setLayoutData(addRemoveIndexCompositeGD); + + createAddToValue(addRemoveValueComposite); + createRemoveFromIndex(addRemoveValueComposite); + } + /** + * Creates the add to index.Add/Remove/MoveUp/MoveDown Buttons + * + * @param comp the comp + */ + private void createAddToValue(Composite comp) { + Button addToIndex = new Button(comp, SWT.ARROW | SWT.RIGHT); + GridData addToIndexGD = new GridData(SWT.FILL, SWT.FILL, true, true); + addToIndexGD.heightHint = 20; + addToIndex.setLayoutData(addToIndexGD); + addToIndex.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_ADD_TO_INDEX_001"); + addToIndex.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_ADD_TO)); + addToIndex.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + String userExpr = txtUserValue.getText().trim(); + if (!"".equals(userExpr)) { + if (!setOrEnumList.contains(userExpr)) { + setOrEnumList.add(userExpr); + setOrEnumValues.add(userExpr); + repopulateValueCols(); + txtUserValue.setText(""); + } + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } + + public void repopulateValueCols() { + TableItem item = null; + tblValues.removeAll(); + Iterator valuesItr = this.setOrEnumValues.iterator(); + boolean hasNext = valuesItr.hasNext(); + String value = null; + + while (hasNext) { + value = valuesItr.next(); + item = new TableItem(tblValues, SWT.NONE); + item.setText(value); + hasNext = valuesItr.hasNext(); + } + } + + + private void createRemoveFromIndex(Composite comp) { + Button removeFromIndex = new Button(comp, SWT.ARROW | SWT.LEFT); + GridData removeFromIndexGD = new GridData(SWT.FILL, SWT.FILL, true, true); + removeFromIndexGD.heightHint = 20; + removeFromIndex.setLayoutData(removeFromIndexGD); + removeFromIndex.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_REMOVE_FROM_INDEX_001"); + removeFromIndex.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_REMOVE)); + removeFromIndex.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + int selectedIdx = tblValues.getSelectionIndex(); + if (selectedIdx > -1) { + String expr = setOrEnumValues.get(selectedIdx); + setOrEnumValues.remove(selectedIdx); + tblValues.remove(selectedIdx); + setOrEnumList.remove(expr); + txtUserValue.setText(expr); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent eevent) { + // Nothing to do. + } + }); + } + + private void createValueTable(Composite comp) { + tblValues = new Table(comp, SWT.BORDER | SWT.FULL_SELECTION); + tblValues.setLayout(new GridLayout(1, false)); + GridData tblIndexColsGD = new GridData(SWT.FILL, SWT.FILL, true, true); + tblIndexColsGD.horizontalIndent = 5; + tblValues.setLayoutData(tblIndexColsGD); + tblValues.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TBL_INDEXUI_INDEX_COLS_001"); + tblValues.setLinesVisible(true); + tblValues.setHeaderVisible(true); + + ControlDecoration decofk = new ControlDecoration(tblValues, SWT.TOP | SWT.LEFT); + + // use an existing image + Image image = IconUtility.getIconImage(IiconPath.MANDATORY_FIELD, this.getClass()); + + // set description and image + decofk.setDescriptionText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_MSG)); + decofk.setImage(image); + + TableColumn tblclmnIndexColumns = new TableColumn(tblValues, SWT.FILL); + tblclmnIndexColumns.setWidth(185); + tblclmnIndexColumns.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TBL_COL_INDEXUI_INDEX_COLS_001"); + tblclmnIndexColumns.setText(MessageConfigLoader.getProperty(IMessagesConstants.SET_ENUM_UI_USER_VALUE)); + + } + + private void createFinishComposite() { + Composite finishValueComposite = new Composite(this.grpValues, SWT.NONE); + finishValueComposite.setLayout(new GridLayout(1, false)); + GridData finishValueCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + finishValueCompositeGD.verticalAlignment = SWT.CENTER; + finishValueComposite.setLayoutData(finishValueCompositeGD); + + Button finish = new Button(finishValueComposite, SWT.NONE); + GridData finishGD = new GridData(SWT.FILL, SWT.FILL, true, true); + finishGD.heightHint = 20; + finish.setLayoutData(finishGD); + finish.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_UP_INDEX_001"); + finish.setText(MessageConfigLoader.getProperty(IMessagesConstants.CREATE_TABLE_FINISH_BTN)); + finish.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + grpValues.setVisible(false); + grpValues.setSize(0,0); + editValues.setVisible(true); + currentShell.setSize(720, 345); + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } + + private void createUpDownValueComposite() { + Composite upDownValueComposite = new Composite(this.grpValues, SWT.NONE); + upDownValueComposite.setLayout(new GridLayout(1, false)); + GridData upDownIndexCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + upDownIndexCompositeGD.verticalAlignment = SWT.CENTER; + upDownValueComposite.setLayoutData(upDownIndexCompositeGD); + + createValueMoveUp(upDownValueComposite); + createValueMoveDown(upDownValueComposite); + } + + private void createValueMoveUp(Composite comp) { + Button moveUp = new Button(comp, SWT.ARROW | SWT.UP); + GridData moveUpGD = new GridData(SWT.FILL, SWT.FILL, true, true); + moveUpGD.heightHint = 20; + moveUp.setLayoutData(moveUpGD); + moveUp.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_UP_INDEX_001"); + moveUp.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_MOVE_UP)); + moveUp.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + int selectedIdx = tblValues.getSelectionIndex(); + if (selectedIdx > 0) { + String value = setOrEnumValues.get(selectedIdx); + setOrEnumValues.remove(selectedIdx); + setOrEnumValues.add(selectedIdx - 1, value); + repopulateValueCols(); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } + + private void createValueMoveDown(Composite comp) { + Button moveDown = new Button(comp, SWT.ARROW | SWT.DOWN); + GridData moveDownGD = new GridData(SWT.FILL, SWT.FILL, true, true); + moveDownGD.heightHint = 20; + moveDown.setLayoutData(moveDownGD); + moveDown.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_DOWN_INDEX_001"); + moveDown.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_MOVE_DOWN)); + moveDown.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + int selectedIdx = tblValues.getSelectionIndex(); + if (selectedIdx > -1 && selectedIdx < (tblValues.getItemCount() - 1)) { + String value = setOrEnumValues.get(selectedIdx); + setOrEnumValues.remove(selectedIdx); + setOrEnumValues.add(selectedIdx + 1, value); + repopulateValueCols(); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + + } + }); + } + + /** + * + * @param compositeColumns + */ + private void addDisplayEditValuesButton(Composite compositeColumns) { + Composite editValuesComposite = new Composite(compositeColumns, SWT.FILL); + editValuesComposite.setLayout(new GridLayout(1, false)); + editValues = new Button(editValuesComposite, SWT.NONE); + GridData editValuesCompositeGD = new GridData(SWT.NONE, SWT.NONE, true, false); + editValuesCompositeGD.horizontalAlignment = SWT.RIGHT; + editValuesCompositeGD.heightHint = 20; + editValuesCompositeGD.widthHint = 100; + editValues.setLayoutData(editValuesCompositeGD); + editValues.setSize(20, 100); + editValues.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_UP_INDEX_001"); + editValues.setText(MessageConfigLoader.getProperty(IMessagesConstants.EDIT_SETTING_VALUE)); + editValues.setVisible(false); + editValues.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + grpValues.setSize(720, 200); + grpValues.setVisible(true); + editValues.setVisible(false); + currentShell.setSize(720, 525); + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } } diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/ColumnUI.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/ColumnUI.java index 1f91fea39039e380bc28b5399a138d72c801317a..2304ffdf697b9b1dcf8146c05665dbd1d723d910 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/ColumnUI.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/ColumnUI.java @@ -15,8 +15,12 @@ package org.opengauss.mppdbide.view.ui.table; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import java.util.Locale; +import org.eclipse.jface.fieldassist.ControlDecoration; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.events.ModifyEvent; @@ -37,6 +41,7 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Spinner; import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; @@ -67,6 +72,7 @@ import org.opengauss.mppdbide.view.utils.icon.IiconPath; */ public class ColumnUI { private Text textColumnName; + private StyledText txtUserValue; private Button chkColumnNameCase; @@ -93,12 +99,14 @@ public class ColumnUI { private StyledText textCheckExpr; private Group grpColumns; + private Group grpValues; private Database db; private TableMetaData selectedTable; private int editIndex = -1; private TableValidatorRules validator; private Table tableCloumnList; + private Table tblValues; private boolean duplicateName; @@ -108,9 +116,13 @@ public class ColumnUI { private Label lblCheck; private Button chkFunction; + private Button editValues; private Text textColumnDescription; + private ArrayList setOrEnumValues; + private HashSet setOrEnumList; + /** * Sets the UI labels color gray. */ @@ -254,9 +266,9 @@ public class ColumnUI { /** * STEP: 2 COLUMN CREATION */ - Composite columnDetails = new Composite(compositeColumns, SWT.NONE); + Composite columnDetails = new Composite(compositeColumns, SWT.FILL); columnDetails.setLayout(new GridLayout(4, false)); - GridData columnDetailsGD = new GridData(SWT.FILL, SWT.NONE, true, true); + GridData columnDetailsGD = new GridData(SWT.FILL, SWT.FILL, true, true); columnDetails.setLayoutData(columnDetailsGD); addColumnNameGui(columnDetails); @@ -270,17 +282,19 @@ public class ColumnUI { addDataTypeSchemaGui(columnDetails); - Composite typeDescriptionComposite = new Composite(compositeColumns, SWT.NONE); + Composite typeDescriptionComposite = new Composite(compositeColumns, SWT.FILL); typeDescriptionComposite.setLayout(new GridLayout(2, false)); GridData typeDescriptionCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); typeDescriptionCompositeGD.heightHint = 50; typeDescriptionComposite.setLayoutData(typeDescriptionCompositeGD); addDatatypeDescpGui(typeDescriptionComposite); + addDisplayEditValuesButton(compositeColumns); addDatatypeGui(columnDetails); addPrecisionSizeGUI(columnDetails); addScaleGui(columnDetails); + createValues(compositeColumns); addColumnConstraintGui(compositeColumns); addColumnDescription(compositeColumns); @@ -448,7 +462,7 @@ public class ColumnUI { * @param compositeColumns the composite columns */ private void addDatatypeGui(Composite compositeColumns) { - Composite dataTypeComposite = new Composite(compositeColumns, SWT.NONE); + Composite dataTypeComposite = new Composite(compositeColumns, SWT.FILL); dataTypeComposite.setLayout(new GridLayout(1, false)); GridData dataTypeCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); dataTypeComposite.setLayoutData(dataTypeCompositeGD); @@ -562,6 +576,7 @@ public class ColumnUI { textColumnName = new Text(columnNameComposite, SWT.BORDER); GridData textColumnNameGD = new GridData(SWT.FILL, SWT.FILL, true, true); + textColumnNameGD.heightHint = 30; textColumnNameGD.widthHint = 200; textColumnName.setLayoutData(textColumnNameGD); textColumnName.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TXT_COLUMNUI_COL_NAME_001"); @@ -596,6 +611,7 @@ public class ColumnUI { */ public void modifyText(ModifyEvent event) { enableDisableSizeLen(); + enableDisableSetValues(); } } @@ -700,8 +716,8 @@ public class ColumnUI { if (selectedNS == null || (!"information_schema".equals(selectedNS.getName()) && !"pg_catalog".equals(selectedNS.getName()))) { - spinnerPreSize.setEnabled(UIUtils.enableDisablePrecisionFieldForDatatype(type.getName())); - spinnerScale.setEnabled(UIUtils.enableDisableScaleFieldForDatatype(type.getName())); + spinnerPreSize.setEnabled(UIUtils.enableDisablePrecisionFieldForDatatype(type.getName(), db.getDolphinTypes())); + spinnerScale.setEnabled(UIUtils.enableDisableScaleFieldForDatatype(type.getName(), db.getDolphinTypes())); } else { spinnerPreSize.setEnabled(false); spinnerScale.setEnabled(false); @@ -721,6 +737,28 @@ public class ColumnUI { } } + /** + * Enable disable set values tab. + */ + public void enableDisableSetValues() { + Namespace selectedNS = UIUtils.getNamespaceForDatatype(db, cmbClmDataSchema); + TypeMetaData type = null; + + type = UIUtils.getDtypeFromCombo(selectedNS, db, cmbClmDataType); + + if (null == type || null == grpValues) { + return; + } + + if ("set".equals(type.getName()) || "enum".equals(type.getName())) { + editValues.setVisible(true); + } else { + grpValues.setVisible(false); + grpValues.setSize(0,0); + editValues.setVisible(false); + } + } + /** * Gets the grp control. * @@ -803,6 +841,14 @@ public class ColumnUI { } newTempColumn.setColDescription(textColumnDescription.getText()); + if ("set".equals(type.getName()) || "enum".equals(type.getName())) { + newTempColumn.setEnumOrSetValues(new ArrayList(this.setOrEnumValues)); + newTempColumn.setEnumOrSetList(new HashSet(this.setOrEnumList)); + setOrEnumValues = new ArrayList(); + setOrEnumList = new HashSet(); + repopulateValueCols(); + txtUserValue.setText(""); + } return newTempColumn; } @@ -854,6 +900,13 @@ public class ColumnUI { spinnerScale.setSelection(columnMetaData.getScale()); chkColumnNameCase.setSelection(columnMetaData.getColumnCase()); this.editIndex = editIndx; + if ("set".equals(columnMetaData.getDataTypeName()) || "enum".equals(columnMetaData.getDataTypeName())) { + this.setOrEnumValues = columnMetaData.getEnumOrSetValues() != null ? new ArrayList(columnMetaData.getEnumOrSetValues()) : + new ArrayList(); + this.setOrEnumList = columnMetaData.getEnumOrSetList() != null ? new HashSet(columnMetaData.getEnumOrSetList()) : + new HashSet(); + repopulateValueCols(); + } setSpinnerData(columnMetaData); } @@ -912,6 +965,9 @@ public class ColumnUI { textColumnDescription.setText(""); cmbClmDataSchema.select(0); + this.setOrEnumList = new HashSet<>(); + this.setOrEnumValues = new ArrayList<>(); + tblValues.removeAll(); populateDataTypes(); this.editIndex = -1; } @@ -1015,4 +1071,298 @@ public class ColumnUI { } } + /** + * Creates the values list for enum or set. + * + * @param comp the comp + */ + private void createValues(Composite comp) { + grpValues = new Group(comp, SWT.FILL); + grpValues.setLayout(new GridLayout(5, false)); + GridData groupGD = new GridData(SWT.FILL, SWT.FILL, true, true); + groupGD.heightHint = 10; + groupGD.horizontalSpan = 4; + grpValues.setLayoutData(groupGD); + + createUserDefComposite(); + createAddRemoveValueComposite(); + createValueTable(grpValues); + createUpDownValueComposite(); + createFinishComposite(); + grpValues.setVisible(false); + + } + + private void createUserDefComposite() { + Composite userValueComp = new Composite(this.grpValues, SWT.FILL); + userValueComp.setLayout(new GridLayout(1, false)); + GridData avalColsOrUserExpCompGD = new GridData(SWT.FILL, SWT.FILL, true, true); + userValueComp.setLayoutData(avalColsOrUserExpCompGD); + + Composite userExprComposite = new Composite(userValueComp, SWT.FILL); + + userExprComposite.setLayout(new GridLayout(1, false)); + GridData userExprCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + userExprCompositeGD.verticalAlignment = SWT.CENTER; + userExprComposite.setLayoutData(userExprCompositeGD); + userExprComposite.setSize(50, 30); + + Label lblUserDefinedValue = new Label(userExprComposite, SWT.FILL); + lblUserDefinedValue.setText(MessageConfigLoader.getProperty(IMessagesConstants.SET_ENUM_UI_USER_VALUE)); + lblUserDefinedValue.pack(); + + txtUserValue = new StyledText(userExprComposite, SWT.BORDER); + txtUserValue.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TXT_INDEXUI_USEREXPR_001"); + GridData txtUserExprGD = new GridData(SWT.FILL, SWT.NONE, true, true); + txtUserExprGD.heightHint = 30; + txtUserValue.setLayoutData(txtUserExprGD); + + setOrEnumList = new HashSet(); + setOrEnumValues = new ArrayList(); + } + + private void createAddRemoveValueComposite() { + Composite addRemoveValueComposite = new Composite(this.grpValues, SWT.NONE); + addRemoveValueComposite.setLayout(new GridLayout(1, false)); + GridData addRemoveIndexCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + addRemoveIndexCompositeGD.verticalAlignment = SWT.CENTER; + addRemoveValueComposite.setLayoutData(addRemoveIndexCompositeGD); + + createAddToValue(addRemoveValueComposite); + createRemoveFromValues(addRemoveValueComposite); + } + + /** + * Creates the add to Add/Remove/MoveUp/MoveDown Buttons + * + * @param comp the comp + */ + private void createAddToValue(Composite comp) { + Button addToIndex = new Button(comp, SWT.ARROW | SWT.RIGHT); + GridData addToIndexGD = new GridData(SWT.FILL, SWT.FILL, true, true); + addToIndexGD.heightHint = 20; + addToIndex.setLayoutData(addToIndexGD); + addToIndex.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_ADD_TO_INDEX_001"); + addToIndex.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_ADD_TO)); + addToIndex.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + String userExpr = txtUserValue.getText().trim(); + if (!"".equals(userExpr)) { + if (!setOrEnumList.contains(userExpr)) { + setOrEnumList.add(userExpr); + setOrEnumValues.add(userExpr); + repopulateValueCols(); + txtUserValue.setText(""); + } + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } + + public void repopulateValueCols() { + TableItem item = null; + tblValues.removeAll(); + Iterator valuesItr = this.setOrEnumValues.iterator(); + boolean hasNext = valuesItr.hasNext(); + String value = null; + + while (hasNext) { + value = valuesItr.next(); + item = new TableItem(tblValues, SWT.NONE); + item.setText(value); + hasNext = valuesItr.hasNext(); + } + } + + private void createRemoveFromValues(Composite comp) { + Button removeFromValues = new Button(comp, SWT.ARROW | SWT.LEFT); + GridData removeFromValuesGD = new GridData(SWT.FILL, SWT.FILL, true, true); + removeFromValuesGD.heightHint = 20; + removeFromValues.setLayoutData(removeFromValuesGD); + removeFromValues.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_REMOVE_FROM_INDEX_001"); + removeFromValues.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_REMOVE)); + removeFromValues.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + int selectedIdx = tblValues.getSelectionIndex(); + if (selectedIdx > -1) { + String expr = setOrEnumValues.get(selectedIdx); + setOrEnumValues.remove(selectedIdx); + tblValues.remove(selectedIdx); + setOrEnumList.remove(expr); + txtUserValue.setText(expr); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent eevent) { + // Nothing to do. + } + }); + } + + private void createValueTable(Composite comp) { + tblValues = new Table(comp, SWT.BORDER | SWT.FULL_SELECTION); + tblValues.setLayout(new GridLayout(1, false)); + GridData tblIndexColsGD = new GridData(SWT.FILL, SWT.FILL, true, true); + tblIndexColsGD.horizontalIndent = 5; + tblValues.setLayoutData(tblIndexColsGD); + + tblValues.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TBL_INDEXUI_INDEX_COLS_001"); + tblValues.setLinesVisible(true); + tblValues.setHeaderVisible(true); + + ControlDecoration decofk = new ControlDecoration(tblValues, SWT.TOP | SWT.LEFT); + + // use an existing image + Image image = IconUtility.getIconImage(IiconPath.MANDATORY_FIELD, this.getClass()); + + // set description and image + decofk.setDescriptionText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_MSG)); + decofk.setImage(image); + + TableColumn tblclmnValues = new TableColumn(tblValues, SWT.NONE); + tblclmnValues.setWidth(185); + tblclmnValues.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_TBL_COL_INDEXUI_INDEX_COLS_001"); + tblclmnValues.setText(MessageConfigLoader.getProperty(IMessagesConstants.SET_ENUM_UI_USER_VALUE)); + + } + + private void createFinishComposite() { + Composite finishValueComposite = new Composite(this.grpValues, SWT.NONE); + finishValueComposite.setLayout(new GridLayout(1, false)); + GridData finishValueCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + finishValueCompositeGD.verticalAlignment = SWT.CENTER; + finishValueComposite.setLayoutData(finishValueCompositeGD); + + Button finish = new Button(finishValueComposite, SWT.NONE); + GridData finishGD = new GridData(SWT.FILL, SWT.FILL, true, true); + finishGD.heightHint = 20; + finish.setLayoutData(finishGD); + finish.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_UP_INDEX_001"); + finish.setText(MessageConfigLoader.getProperty(IMessagesConstants.CREATE_TABLE_FINISH_BTN)); + finish.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + grpValues.setVisible(false); + grpValues.setSize(0,0); + editValues.setVisible(true); + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } + + private void createUpDownValueComposite() { + Composite upDownValueComposite = new Composite(this.grpValues, SWT.NONE); + upDownValueComposite.setLayout(new GridLayout(1, false)); + GridData upDownValueCompositeGD = new GridData(SWT.FILL, SWT.FILL, true, true); + upDownValueCompositeGD.verticalAlignment = SWT.CENTER; + upDownValueComposite.setLayoutData(upDownValueCompositeGD); + + createValueMoveUp(upDownValueComposite); + createValueMoveDown(upDownValueComposite); + } + + /** + * + * @param comp + */ + private void createValueMoveUp(Composite comp) { + Button moveUp = new Button(comp, SWT.ARROW | SWT.UP); + GridData moveUpGD = new GridData(SWT.FILL, SWT.FILL, true, true); + moveUpGD.heightHint = 20; + moveUp.setLayoutData(moveUpGD); + moveUp.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_UP_INDEX_001"); + moveUp.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_MOVE_UP)); + moveUp.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + int selectedIdx = tblValues.getSelectionIndex(); + if (selectedIdx > 0) { + String value = setOrEnumValues.get(selectedIdx); + setOrEnumValues.remove(selectedIdx); + setOrEnumValues.add(selectedIdx - 1, value); + repopulateValueCols(); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } + + /** + * + * @param comp + */ + private void createValueMoveDown(Composite comp) { + Button moveDown = new Button(comp, SWT.ARROW | SWT.DOWN); + GridData moveDownGD = new GridData(SWT.FILL, SWT.FILL, true, true); + moveDownGD.heightHint = 20; + moveDown.setLayoutData(moveDownGD); + moveDown.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_DOWN_INDEX_001"); + moveDown.setText(MessageConfigLoader.getProperty(IMessagesConstants.INDEX_UI_MOVE_DOWN)); + moveDown.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + int selectedIdx = tblValues.getSelectionIndex(); + if (selectedIdx > -1 && selectedIdx < (tblValues.getItemCount() - 1)) { + String value = setOrEnumValues.get(selectedIdx); + setOrEnumValues.remove(selectedIdx); + setOrEnumValues.add(selectedIdx + 1, value); + repopulateValueCols(); + } + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + + } + }); + } + + /** + * + * @param compositeColumns + */ + private void addDisplayEditValuesButton(Composite compositeColumns) { + Composite editValuesComposite = new Composite(compositeColumns, SWT.FILL); + editValuesComposite.setLayout(new GridLayout(1, false)); + editValues = new Button(editValuesComposite, SWT.NONE); + GridData editValuesCompositeGD = new GridData(SWT.NONE, SWT.NONE, true, false); + editValuesCompositeGD.horizontalAlignment = SWT.RIGHT; + editValuesCompositeGD.heightHint = 30; + editValuesCompositeGD.widthHint = 100; + editValues.setLayoutData(editValuesCompositeGD); + editValues.setSize(30, 100); + editValues.setData(MPPDBIDEConstants.SWTBOT_KEY, "ID_BTN_INDEXUI_MOVE_UP_INDEX_001"); + editValues.setText(MessageConfigLoader.getProperty(IMessagesConstants.EDIT_SETTING_VALUE)); + editValues.setVisible(false); + editValues.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent event) { + grpValues.setVisible(true); + editValues.setVisible(false); + grpValues.setSize(625, 200); + } + + @Override + public void widgetDefaultSelected(SelectionEvent event) { + // Nothing to do + } + }); + } } \ No newline at end of file diff --git a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/UIUtils.java b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/UIUtils.java index c2dde2e8f12c4806ccb24d71a86e6c4a69041dda..4ec6612e89e14a77d6c42386a27d7d2f6e9c0d9a 100644 --- a/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/UIUtils.java +++ b/code/datastudio/src/org.opengauss.mppdbide.view/src/org/opengauss/mppdbide/view/ui/table/UIUtils.java @@ -28,9 +28,6 @@ import org.eclipse.swt.widgets.TableItem; import org.opengauss.mppdbide.bl.serverdatacache.ColumnMetaData; import org.opengauss.mppdbide.bl.serverdatacache.Database; -import org.opengauss.mppdbide.bl.serverdatacache.IndexMetaData; -import org.opengauss.mppdbide.bl.serverdatacache.IndexedColumnExpr; -import org.opengauss.mppdbide.bl.serverdatacache.IndexedColumnType; import org.opengauss.mppdbide.bl.serverdatacache.Namespace; import org.opengauss.mppdbide.bl.serverdatacache.ServerObject; import org.opengauss.mppdbide.bl.serverdatacache.TableMetaData; @@ -38,9 +35,7 @@ import org.opengauss.mppdbide.bl.serverdatacache.TableOrientation; import org.opengauss.mppdbide.bl.serverdatacache.Tablespace; import org.opengauss.mppdbide.bl.serverdatacache.TablespaceType; import org.opengauss.mppdbide.bl.serverdatacache.TypeMetaData; -import org.opengauss.mppdbide.utils.IMessagesConstants; import org.opengauss.mppdbide.utils.MPPDBIDEConstants; -import org.opengauss.mppdbide.utils.loader.MessageConfigLoader; /** * @@ -99,7 +94,10 @@ public final class UIUtils { * @param datatype the datatype * @return true, if successful */ - public static boolean enableDisableScaleFieldForDatatype(String datatype) { + public static boolean enableDisableScaleFieldForDatatype(String datatype, HashMap dolphinTypes) { + if (dolphinTypes != null && dolphinTypes.containsKey(datatype)) { + return dolphinTypes.get(datatype)[1]; + } return scaleMap.get(datatype); } @@ -180,8 +178,10 @@ public final class UIUtils { * @param datatype the datatype * @return true, if successful */ - public static boolean enableDisablePrecisionFieldForDatatype(String datatype) { - + public static boolean enableDisablePrecisionFieldForDatatype(String datatype, HashMap dolphinTypes) { + if (dolphinTypes != null && dolphinTypes.containsKey(datatype)) { + return dolphinTypes.get(datatype)[0]; + } return precisionMap.get(datatype); } 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 bdabe24a8aae67b8886810c5d7112fd08049364c..dac9f4199318bf4abd43045d11a39f4e0ca80402 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 @@ -18,6 +18,6 @@ - + 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 44df43f8f10d94a355013ce9fd32e3c08d5f0b75..2e68f60e23226e3408d294b9a85ec1900301f53a 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/opengauss-jdbc-3.1.0.jar + lib/opengauss-jdbc-3.1.1-og.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 7dfa45b380cbc4bf66e29cfb18d1f509b4e6f7f1..137aadef3fe7458381210d5c96a05b1ca706e505 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/opengauss-jdbc-3.1.0.jar + lib/opengauss-jdbc-3.1.1-og.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 ad7f6d2bb495f8198ee7e397b6b33e3f43031822..4b8e6d70576557982b21be16b66809a890817586 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 @@ -10,29 +10,29 @@ import java.util.TimerTask; import java.util.concurrent.Executor; import java.util.logging.Logger; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyManager; -import org.postgresql.core.BaseConnection; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Encoding; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ReplicationProtocol; -import org.postgresql.core.TransactionState; -import org.postgresql.core.TypeInfo; -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; -import org.postgresql.jdbc.TimestampUtils; -import org.postgresql.largeobject.LargeObjectManager; -import org.postgresql.replication.PGReplicationConnection; -import org.postgresql.util.HostSpec; -import org.postgresql.util.LruCache; -import org.postgresql.xml.PGXmlFactoryFactory; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyManager; +import org.opengauss.core.BaseConnection; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Encoding; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ReplicationProtocol; +import org.opengauss.core.TransactionState; +import org.opengauss.core.TypeInfo; +import org.opengauss.core.Version; +import org.opengauss.fastpath.Fastpath; +import org.opengauss.log.Log; +import org.opengauss.jdbc.AutoSave; +import org.opengauss.jdbc.ClientLogic; +import org.opengauss.jdbc.FieldMetadata; +import org.opengauss.jdbc.FieldMetadata.Key; +import org.opengauss.jdbc.PreferQueryMode; +import org.opengauss.jdbc.TimestampUtils; +import org.opengauss.largeobject.LargeObjectManager; +import org.opengauss.replication.PGReplicationConnection; +import org.opengauss.util.HostSpec; +import org.opengauss.util.LruCache; +import org.opengauss.xml.PGXmlFactoryFactory; import com.mockrunner.mock.jdbc.MockConnection; diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseStatementHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseStatementHelper.java index 0c2fc7e42fe2a5ad0a88f0281603574f434f8923..0e0e9f6ec5454f6a2024bf68e197ad67b9fa49dc 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseStatementHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/BaseStatementHelper.java @@ -6,12 +6,12 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.util.List; -import org.postgresql.core.BaseStatement; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Field; -import org.postgresql.core.NoticeListener; -import org.postgresql.core.Query; -import org.postgresql.core.ResultCursor; +import org.opengauss.core.BaseStatement; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Field; +import org.opengauss.core.NoticeListener; +import org.opengauss.core.Query; +import org.opengauss.core.ResultCursor; public class BaseStatementHelper implements BaseStatement { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CommonLLTUtils.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CommonLLTUtils.java index df868854f308498fd9f59d4089b846e6049fd074..cc15cfc4619349136b5c33b2439b217ec6eb618c 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CommonLLTUtils.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CommonLLTUtils.java @@ -206,7 +206,7 @@ public class CommonLLTUtils try { - initDriver("org.postgresql.Driver"); + initDriver("org.opengauss.Driver"); } catch (DatabaseOperationException e) { 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 49c2e11af927386b8268f1bf9ce31480d60be3a0..cc225ca7afbea1b77dbf55c7ad3c18fe1970d903 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 @@ -7,22 +7,22 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyOperation; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Encoding; -import org.postgresql.core.NativeQuery; -import org.postgresql.core.ParameterList; -import org.postgresql.core.Query; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ReplicationProtocol; -import org.postgresql.core.ResultCursor; -import org.postgresql.core.ResultHandler; -import org.postgresql.core.TransactionState; -import org.postgresql.jdbc.AutoSave; -import org.postgresql.jdbc.BatchResultHandler; -import org.postgresql.jdbc.PreferQueryMode; -import org.postgresql.util.HostSpec; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyOperation; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Encoding; +import org.opengauss.core.NativeQuery; +import org.opengauss.core.ParameterList; +import org.opengauss.core.Query; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ReplicationProtocol; +import org.opengauss.core.ResultCursor; +import org.opengauss.core.ResultHandler; +import org.opengauss.core.TransactionState; +import org.opengauss.jdbc.AutoSave; +import org.opengauss.jdbc.BatchResultHandler; +import org.opengauss.jdbc.PreferQueryMode; +import org.opengauss.util.HostSpec; public class Connfactory implements QueryExecutor { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CopyOperationHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CopyOperationHelper.java index e995ab192df5d1ef102acd4582faba49042cb8d4..5015949f0a475b42c54ec6e79d021759349bfff4 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CopyOperationHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/CopyOperationHelper.java @@ -2,8 +2,8 @@ package org.opengauss.mppdbide.mock.adapter; import java.sql.SQLException; -import org.postgresql.copy.CopyIn; -import org.postgresql.copy.CopyOut; +import org.opengauss.copy.CopyIn; +import org.opengauss.copy.CopyOut; public class CopyOperationHelper implements CopyOut, CopyIn { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/EncodingHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/EncodingHelper.java index 9e8ca2cf771a6f366f07dd3522c3b0bca77296bb..3209f4e05a2717983633a8d0fa358b5758d6a0bf 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/EncodingHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/mock/adapter/EncodingHelper.java @@ -1,6 +1,6 @@ package org.opengauss.mppdbide.mock.adapter; -import org.postgresql.core.Encoding; +import org.opengauss.core.Encoding; public class EncodingHelper extends Encoding { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/AdapterTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/AdapterTest.java index 062b9f1817185ed3700256c09c84c85ea840f8b1..a25260bb76535e608158da587e7d59ff7d0223e8 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/AdapterTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/AdapterTest.java @@ -16,7 +16,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.postgresql.util.HostSpec; +import org.opengauss.util.HostSpec; import org.opengauss.mppdbide.adapter.IConnectionDriver; import org.opengauss.mppdbide.adapter.driver.Gauss200V1R6Driver; @@ -108,7 +108,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - dbConnection.initDriver("org.postgresql.Driver"); + dbConnection.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -158,7 +158,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - dbConnection.initDriver("org.postgresql.Driver"); + dbConnection.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -202,7 +202,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -238,7 +238,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -284,7 +284,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test" ); @@ -330,7 +330,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -387,7 +387,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -429,7 +429,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -470,7 +470,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter DBConnection dbConnection = new DBConnection(); - CommonLLTUtils.initDriver("org.postgresql.Driver2"); + CommonLLTUtils.initDriver("org.opengauss.Driver2"); fail("Not expected to come here."); } @@ -508,7 +508,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -555,7 +555,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -594,7 +594,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -632,7 +632,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -678,7 +678,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -720,7 +720,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -771,7 +771,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -816,7 +816,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -855,7 +855,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -901,7 +901,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -944,7 +944,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -988,7 +988,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1034,7 +1034,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1083,7 +1083,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1135,7 +1135,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1187,7 +1187,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1238,7 +1238,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1289,7 +1289,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1335,7 +1335,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1387,7 +1387,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - connection.initDriver("org.postgresql.Driver"); + connection.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1455,7 +1455,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); url = "jdbc:postgresql://127.0.0.1:1234/testDB"; @@ -1508,7 +1508,7 @@ public class AdapterTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); url = "jdbc:postgresql://127.0.0.1:1234/testDB"; @@ -1542,7 +1542,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1702,7 +1702,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1743,7 +1743,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1784,7 +1784,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1825,7 +1825,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1866,7 +1866,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1908,7 +1908,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1949,7 +1949,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -1992,7 +1992,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -2033,7 +2033,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -2074,7 +2074,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -2115,7 +2115,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -2156,7 +2156,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -2198,7 +2198,7 @@ public void testTTA_BL_ADAPTER_FUNC_001_005_() String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/DBConnectionTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/DBConnectionTest.java index 89d4e0e42f5814f9a216ddd15a523b623d1b4d02..866668836b41a1814f59d5cf7d1a5b20e40f2efd 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/DBConnectionTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/DBConnectionTest.java @@ -94,7 +94,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -137,7 +137,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -174,7 +174,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -209,7 +209,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -246,7 +246,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -290,7 +290,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -333,7 +333,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -376,7 +376,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(dbConnection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -421,7 +421,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -465,7 +465,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -503,7 +503,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -541,7 +541,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -585,7 +585,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -626,7 +626,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter @Override public Driver getJDBCDriver() { - return new org.postgresql.Driver(); + return new org.opengauss.Driver(); } @Override @@ -670,7 +670,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter try { DBConnection dbConnection = new DBConnection(); Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); props.setProperty("allowEncodingChanges", "true"); @@ -704,7 +704,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter public void test_DBConnection_001() { try { Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); props.setProperty("allowEncodingChanges", "true"); @@ -751,7 +751,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -788,7 +788,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -829,7 +829,7 @@ public class DBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ExecuteTimerForNonSelectTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ExecuteTimerForNonSelectTest.java index badde73e062a01ce5bffed26bee345ebae3a2dad..4afa00a019c48f90bddb7ca4f7715fee00ce603a 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ExecuteTimerForNonSelectTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ExecuteTimerForNonSelectTest.java @@ -79,7 +79,7 @@ public class ExecuteTimerForNonSelectTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -121,7 +121,7 @@ public class ExecuteTimerForNonSelectTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ObjectBrowserDBConnectionTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ObjectBrowserDBConnectionTest.java index 5524752e788b509a22f522685d0454f3657e3c13..c2a3594ec0988fa819fdc84b6c68e4876e41fbd5 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ObjectBrowserDBConnectionTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/ObjectBrowserDBConnectionTest.java @@ -234,7 +234,7 @@ public class ObjectBrowserDBConnectionTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/StmtExecutorTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/StmtExecutorTest.java index a97f0df334aeb20a73b4b326440faa4b71fec852..bae15e3bfcf8059009fc784515951e39dfb2578f 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/StmtExecutorTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.adapter.test.fragment/src/org/opengauss/mppdbide/test/adapter/StmtExecutorTest.java @@ -207,7 +207,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -255,7 +255,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -300,7 +300,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -338,7 +338,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -384,7 +384,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -422,7 +422,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -471,7 +471,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -523,7 +523,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - connection.initDriver("org.postgresql.Driver"); + connection.initDriver("org.opengauss.Driver"); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -575,7 +575,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriverOLAP(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); @@ -624,7 +624,7 @@ public class StmtExecutorTest extends BasicJDBCTestCaseAdapter String url = null; Properties props = new Properties(); - CommonLLTUtils.initDriver("org.postgresql.Driver"); + CommonLLTUtils.initDriver("org.opengauss.Driver"); setConnectionDriver(connection); props.setProperty("user", "test"); props.setProperty("password", "test"); diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/src/org/opengauss/mppdbide/bl/mock/debug/CommonLLTUtils.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/src/org/opengauss/mppdbide/bl/mock/debug/CommonLLTUtils.java index 0c125984894cccdb03c9d0d9318f41d803fe4e7a..62f46c7b7aca7228de2bc7682085e02623a158bc 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/src/org/opengauss/mppdbide/bl/mock/debug/CommonLLTUtils.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.debug.test.fragment/src/org/opengauss/mppdbide/bl/mock/debug/CommonLLTUtils.java @@ -282,7 +282,7 @@ public class CommonLLTUtils try { - initDriver("org.postgresql.Driver"); + initDriver("org.opengauss.Driver"); } catch (DatabaseOperationException e) { 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 09ac57cd64ed983628d344cf9a90ea63560f33cb..19d609cacf62f69e5595a958f9f03a5927df2a14 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 @@ -40,6 +40,6 @@ - + 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 ccf5fe25846a56bc247e24466d9297d6a5915256..d69897698ab37248429741912cb67333f0086917 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 @@ -39,7 +39,7 @@ Bundle-ClassPath: lib/mockrunner-jdbc.jar, lib/mockito-all-1.10.19.jar, lib/objenesis-3.2.jar, lib/junit-4.13.2.jar, - lib/opengauss-jdbc-3.1.0.jar + lib/opengauss-jdbc-3.1.1-og.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 7224ccc32ede415ba4b06ffb76602a4b1e499487..06919a1de42baa67db5bedd8cf97be6bfc994572 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 @@ -33,4 +33,4 @@ bin.includes = META-INF/,\ lib/mockito-all-1.10.19.jar,\ lib/objenesis-3.2.jar,\ lib/mockrunner-jdbc.jar,\ - lib/opengauss-jdbc-3.1.0.jar + lib/opengauss-jdbc-3.1.1-og.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 e671e06492aadf8bd25cb0d1b36b4749feb5210f..0ef6585490ca2ecb1534851f4c3f1647fbaf54a8 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 @@ -9,28 +9,28 @@ import java.util.Properties; import java.util.TimerTask; import java.util.concurrent.Executor; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyManager; -import org.postgresql.core.BaseConnection; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Encoding; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ReplicationProtocol; -import org.postgresql.core.TransactionState; -import org.postgresql.core.TypeInfo; -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; -import org.postgresql.largeobject.LargeObjectManager; -import org.postgresql.replication.PGReplicationConnection; -import org.postgresql.util.HostSpec; -import org.postgresql.util.LruCache; -import org.postgresql.xml.PGXmlFactoryFactory; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyManager; +import org.opengauss.core.BaseConnection; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Encoding; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ReplicationProtocol; +import org.opengauss.core.TransactionState; +import org.opengauss.core.TypeInfo; +import org.opengauss.core.Version; +import org.opengauss.fastpath.Fastpath; +import org.opengauss.log.Log; +import org.opengauss.jdbc.AutoSave; +import org.opengauss.jdbc.ClientLogic; +import org.opengauss.jdbc.FieldMetadata; +import org.opengauss.jdbc.FieldMetadata.Key; +import org.opengauss.jdbc.PreferQueryMode; +import org.opengauss.largeobject.LargeObjectManager; +import org.opengauss.replication.PGReplicationConnection; +import org.opengauss.util.HostSpec; +import org.opengauss.util.LruCache; +import org.opengauss.xml.PGXmlFactoryFactory; import com.mockrunner.mock.jdbc.MockConnection; @@ -382,7 +382,7 @@ private boolean throwSQLException; } @Override - public org.postgresql.jdbc.TimestampUtils getTimestampUtils() { + public org.opengauss.jdbc.TimestampUtils getTimestampUtils() { // 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/BaseStatementHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseStatementHelper.java index 0f02438bd45c1b48f8e633bd501858783bbd61a6..d244dbf1ce860798c08ce5d522904b7a9f084021 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseStatementHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/BaseStatementHelper.java @@ -6,12 +6,12 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.util.List; -import org.postgresql.core.BaseStatement; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Field; -import org.postgresql.core.NoticeListener; -import org.postgresql.core.Query; -import org.postgresql.core.ResultCursor; +import org.opengauss.core.BaseStatement; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Field; +import org.opengauss.core.NoticeListener; +import org.opengauss.core.Query; +import org.opengauss.core.ResultCursor; public class BaseStatementHelper implements BaseStatement { 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 3e2782841fa3b1525a0ef5aee2b878cde53af2e3..b190842f171ef536854cec38b02fce174dbc00ed 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 @@ -7,22 +7,22 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyOperation; -import org.postgresql.core.CachedQuery; -import org.postgresql.core.Encoding; -import org.postgresql.core.NativeQuery; -import org.postgresql.core.ParameterList; -import org.postgresql.core.Query; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ReplicationProtocol; -import org.postgresql.core.ResultCursor; -import org.postgresql.core.ResultHandler; -import org.postgresql.core.TransactionState; -import org.postgresql.jdbc.AutoSave; -import org.postgresql.jdbc.BatchResultHandler; -import org.postgresql.jdbc.PreferQueryMode; -import org.postgresql.util.HostSpec; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyOperation; +import org.opengauss.core.CachedQuery; +import org.opengauss.core.Encoding; +import org.opengauss.core.NativeQuery; +import org.opengauss.core.ParameterList; +import org.opengauss.core.Query; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ReplicationProtocol; +import org.opengauss.core.ResultCursor; +import org.opengauss.core.ResultHandler; +import org.opengauss.core.TransactionState; +import org.opengauss.jdbc.AutoSave; +import org.opengauss.jdbc.BatchResultHandler; +import org.opengauss.jdbc.PreferQueryMode; +import org.opengauss.util.HostSpec; public class Connfactory implements QueryExecutor { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/CopyOperationHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/CopyOperationHelper.java index de918def8ca643f99da2cfb0e7ebc02b4f0d3e4d..0e464c60a5dd5d6c2f20cbff749876fec556aff3 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/CopyOperationHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/CopyOperationHelper.java @@ -2,8 +2,8 @@ package org.opengauss.mppdbide.mock.bl; import java.sql.SQLException; -import org.postgresql.copy.CopyIn; -import org.postgresql.copy.CopyOut; +import org.opengauss.copy.CopyIn; +import org.opengauss.copy.CopyOut; public class CopyOperationHelper implements CopyOut, CopyIn { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/EncodingHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/EncodingHelper.java index 5aa57a8cbdf830cdb8c7070e358d71ce800d94c5..5358df7dd6f2d72fb93f902e2a903c56d80c3de2 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/EncodingHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/mock/bl/EncodingHelper.java @@ -1,6 +1,6 @@ package org.opengauss.mppdbide.mock.bl; -import org.postgresql.core.Encoding; +import org.opengauss.core.Encoding; public class EncodingHelper extends Encoding { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/test/bl/database/DatabaseTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/test/bl/database/DatabaseTest.java index 65f7b9596bfb80574520b1dec5bd20369cb6dffc..649c16cf7ecfbf7246c8fbc5c03c48db5dc4ee02 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/test/bl/database/DatabaseTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.test.fragment/src/org/opengauss/mppdbide/test/bl/database/DatabaseTest.java @@ -28,7 +28,7 @@ import java.util.TreeMap; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.postgresql.util.HostSpec; +import org.opengauss.util.HostSpec; import org.opengauss.mppdbide.adapter.IConnectionDriver; import org.opengauss.mppdbide.adapter.driver.Gauss200V1R7Driver; @@ -6184,7 +6184,7 @@ public class DatabaseTest extends BasicJDBCTestCaseAdapter @Override public Driver getJDBCDriver() { - return new org.postgresql.Driver(); + return new org.opengauss.Driver(); } @Override @@ -6282,7 +6282,7 @@ public class DatabaseTest extends BasicJDBCTestCaseAdapter @Override public Driver getJDBCDriver() { - return new org.postgresql.Driver(); + return new org.opengauss.Driver(); } @Override diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/src/org/opengauss/mppdbide/mock/bl/windows/CommonLLTUtils.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/src/org/opengauss/mppdbide/mock/bl/windows/CommonLLTUtils.java index 3de3efa312e4b82c18f861a203227e14ca01098c..82dc8a0daacc1786514216c38ffab6b3b185945c 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/src/org/opengauss/mppdbide/mock/bl/windows/CommonLLTUtils.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.bl.windows.test.fragment/src/org/opengauss/mppdbide/mock/bl/windows/CommonLLTUtils.java @@ -300,7 +300,7 @@ public class CommonLLTUtils try { - initDriver("org.postgresql.Driver"); + initDriver("org.opengauss.Driver"); } catch (DatabaseOperationException e) { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseConnectionHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseConnectionHelper.java index 331cab877e97f759b195c6e4823046bdf46f1fd1..c476ac1716d8bd7cc2f1598c0c11b462cf844566 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseConnectionHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseConnectionHelper.java @@ -6,17 +6,17 @@ import java.sql.Statement; import java.util.Properties; import java.util.concurrent.Executor; -import org.postgresql.PGNotification; -import org.postgresql.copy.CopyManager; -import org.postgresql.core.BaseConnection; -import org.postgresql.core.Encoding; -import org.postgresql.core.Logger; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.TypeInfo; -import org.postgresql.fastpath.Fastpath; -import org.postgresql.jdbc2.TimestampUtils; -import org.postgresql.largeobject.LargeObjectManager; -import org.postgresql.util.HostSpec; +import org.opengauss.PGNotification; +import org.opengauss.copy.CopyManager; +import org.opengauss.core.BaseConnection; +import org.opengauss.core.Encoding; +import org.opengauss.core.Logger; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.TypeInfo; +import org.opengauss.fastpath.Fastpath; +import org.opengauss.jdbc2.TimestampUtils; +import org.opengauss.largeobject.LargeObjectManager; +import org.opengauss.util.HostSpec; import com.mockrunner.mock.jdbc.MockConnection; diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseStatementHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseStatementHelper.java index 1213159e4d0f14ef6d31c0ec8d2689569a634340..ba2eaa6d108dc133c3c623f68ba59b62e1366b2a 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseStatementHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/BaseStatementHelper.java @@ -6,11 +6,11 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.util.List; -import org.postgresql.core.BaseStatement; -import org.postgresql.core.Field; -import org.postgresql.core.NoticeListener; -import org.postgresql.core.Query; -import org.postgresql.core.ResultCursor; +import org.opengauss.core.BaseStatement; +import org.opengauss.core.Field; +import org.opengauss.core.NoticeListener; +import org.opengauss.core.Query; +import org.opengauss.core.ResultCursor; public class BaseStatementHelper implements BaseStatement { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CommonLLTUtils.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CommonLLTUtils.java index 6af201de87958b05e1b23f8807cf677a1f10768a..1dee2103ca3eb7bd5f7c749abd022c79cb066463 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CommonLLTUtils.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CommonLLTUtils.java @@ -253,7 +253,7 @@ public class CommonLLTUtils try { - initDriver("org.postgresql.Driver"); + initDriver("org.opengauss.Driver"); } catch (DatabaseOperationException e) { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/Connfactory.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/Connfactory.java index a63b45af8d5790997d080dd6a4d5624901fcf833..ec440c0ea100f5338d1c043df5bf0a9e93ebed30 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/Connfactory.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/Connfactory.java @@ -2,12 +2,12 @@ package org.opengauss.mppdbide.mock.presentation.windows; import java.sql.SQLException; -import org.postgresql.copy.CopyOperation; -import org.postgresql.core.ParameterList; -import org.postgresql.core.Query; -import org.postgresql.core.QueryExecutor; -import org.postgresql.core.ResultCursor; -import org.postgresql.core.ResultHandler; +import org.opengauss.copy.CopyOperation; +import org.opengauss.core.ParameterList; +import org.opengauss.core.Query; +import org.opengauss.core.QueryExecutor; +import org.opengauss.core.ResultCursor; +import org.opengauss.core.ResultHandler; public class Connfactory implements QueryExecutor { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CopyOperationHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CopyOperationHelper.java index 4f6877582419dbc5ab2766b80e9dc13a7b12e659..13ded4c2ea33d4425619d954559cf30ddfae05ce 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CopyOperationHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/CopyOperationHelper.java @@ -2,8 +2,8 @@ package org.opengauss.mppdbide.mock.presentation.windows; import java.sql.SQLException; -import org.postgresql.copy.CopyIn; -import org.postgresql.copy.CopyOut; +import org.opengauss.copy.CopyIn; +import org.opengauss.copy.CopyOut; public class CopyOperationHelper implements CopyOut, CopyIn { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/EncodingHelper.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/EncodingHelper.java index 77b49d43e408f4b9eec014c814de016cef1730a1..d75ecf53e13ca0d6a8fbeb1a5da3505e2f146264 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/EncodingHelper.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/mock/presentation/windows/EncodingHelper.java @@ -1,6 +1,6 @@ package org.opengauss.mppdbide.mock.presentation.windows; -import org.postgresql.core.Encoding; +import org.opengauss.core.Encoding; public class EncodingHelper extends Encoding { diff --git a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/test/presentation/windows/ImportExportDataTest.java b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/test/presentation/windows/ImportExportDataTest.java index 44da0fe4aff36c0fa909cef29507c24db0873e49..30302ec28ceae8cde70ad26d94f061ab473e27c2 100644 --- a/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/test/presentation/windows/ImportExportDataTest.java +++ b/code/datastudio/testcode/LLT/org.opengauss.mppdbide.presentation.windows.test.fragment/src/org/opengauss/mppdbide/test/presentation/windows/ImportExportDataTest.java @@ -12,7 +12,7 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.postgresql.util.HostSpec; +import org.opengauss.util.HostSpec; import org.opengauss.mppdbide.adapter.gauss.DBConnection; import org.opengauss.mppdbide.bl.preferences.BLPreferenceManager;