Merge branch 'master' into stable

red-soft-ru · Dec 13, 2024 · 11b89d0 · 11b89d0
2 parents f915c8b + 7dec811
commit 11b89d0
Show file tree

Hide file tree

Showing 68 changed files with 3,313 additions and 1,464 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -253,6 +253,9 @@ test:windows:
   dependencies: ["prepare", "sources", "build:windows"]
   needs: ["prepare", "sources", "build:windows"]
   timeout: 2 hours
+  only:
+    variables:
+      - ($CONTEXT == "weekly" || $CI_COMMIT_TAG) && $TEST_TYPE == "core"
 
 test:windows-robot:
   extends: .test_template
@@ -286,6 +289,10 @@ test:windows-robot:
   dependencies: ["prepare", "sources", "build:windows"]
   needs: ["prepare", "sources", "build:windows"]
   timeout: 2 hours
+  only:
+    variables:
+      - ($CONTEXT == "weekly" || $CI_COMMIT_TAG) && $TEST_TYPE == "core"
+      - $CONTEXT == "commit" && $DBMS == "rdb50"
 
 test:linux-robot:
   extends: .test_template
@@ -324,6 +331,10 @@ test:linux-robot:
   dependencies: ["prepare", "sources", "build:linux"]
   needs: ["prepare", "sources", "build:linux"]
   timeout: 2 hours
+  only:
+    variables:
+      - ($CONTEXT == "weekly" || $CI_COMMIT_TAG) && $TEST_TYPE == "core"
+      - $CONTEXT == "commit" && $DBMS == "rdb50"
 
 repackage:
   tags:

diff --git a/ci/download_dbms.py b/ci/download_dbms.py
@@ -20,7 +20,7 @@
         last_stable_version = "3.0.18"
 
     if DBMS == "rdb50":
-        last_stable_version = "5.0.0"       
+        last_stable_version = "5.0.1-rc.1"       
 
     url = f"http://builds.red-soft.biz/release_hub/{DBMS}/{last_stable_version}/download/red-database:{os}-x86_64-enterprise:{last_stable_version}:{bin}"
 

diff --git a/ci/test_robot.ps1 b/ci/test_robot.ps1
@@ -29,7 +29,7 @@ git clone -q http://git.red-soft.biz/red-database/re-tests-robot
 
 echo "Installing components"
 start-process "${PYTHON}" "-m pip install git+http://git.red-soft.biz/red-database/python/red-database-python-driver.git" -wait -nonewwindow
-start-process "${PYTHON}" "-m pip install robotframework" -wait -nonewwindow
+start-process "${PYTHON}" "-m pip install robotframework psutil" -wait -nonewwindow
 
 echo "Set .xml"
 $BUILD_PATH="$env:USERPROFILE\.redexpert\${BUILD}"

diff --git a/ci/test_robot.sh b/ci/test_robot.sh
@@ -27,7 +27,7 @@ git clone -q http://git.red-soft.biz/red-database/re-tests-robot
 
 echo "Installing components"
 $PYTHON -m pip install git+http://git.red-soft.biz/red-database/python/red-database-python-driver.git
-$PYTHON -m pip install robotframework
+$PYTHON -m pip install robotframework psutil
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/RedDatabase/lib
 

diff --git a/guide_rst/source/conf.py b/guide_rst/source/conf.py
@@ -6,20 +6,25 @@
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
-latex_use_latex_multicolumn = True
-
-project = 'Red_Expert'
-copyright = '2024, Red Soft'
-author = 'Red Soft'
-
 # General configuration
 
 import re
 import os
 import sys
 sys.path.append(os.path.abspath("./_ext"))
 import globalvar
+from datetime import datetime
+
 
+year = datetime.now().year
+
+version = os.environ.get('VERSION', "VERSION")
+
+latex_use_latex_multicolumn = True
+
+project = 'Red_Expert'
+copyright = f'{year}, Red Soft'
+author = 'Red Soft'
 
 # функция подменяет один список слов на другой в rst файлах
 # эта функция вспомогательная, она работает, но выполнить ее достаточно один раз для замены необходимых слов
@@ -103,7 +108,7 @@ def replace_words_in_files(words_to_replace, new_words):
 
 \begin{flushright}
 \Huge {\xhrulefill{red}{2mm}\color{red} Ред} Эксперт\\
-\LARGE Версия 2024.11\\
+\LARGE Версия """ + f"{version}" + r"""\\
 \huge Руководство пользователя\\
 
 \end{flushright}

diff --git a/modules/plugins/fbclient-3/pom.xml b/modules/plugins/fbclient-3/pom.xml
@@ -7,31 +7,26 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>fbclient-3</artifactId>
-    <version>3.0.17</version>
+    <version>${fbclient3.version}</version>
     <packaging>jar</packaging>
 
-    <inceptionYear>2019</inceptionYear>
-    <developers>
-        <developer>
-            <id>mrotteveel</id>
-            <name>Mark Rotteveel</name>
-            <email>[email protected]</email>
-            <roles>
-                <role>Administrator</role>
-            </roles>
-        </developer>
-    </developers>
-    <licenses>
-        <license>
-            <name>Initial Developer's Public License Version 1.0</name>
-            <url>https://firebirdsql.org/en/initial-developer-s-public-license-version-1-0/</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <outputDirectory>../../../lib</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/modules/plugins/fbclient-4/pom.xml b/modules/plugins/fbclient-4/pom.xml
@@ -7,31 +7,26 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>fbclient-4</artifactId>
-    <version>4.0.0</version>
+    <version>${fbclient4.version}</version>
     <packaging>jar</packaging>
 
-    <inceptionYear>2019</inceptionYear>
-    <developers>
-        <developer>
-            <id>mrotteveel</id>
-            <name>Mark Rotteveel</name>
-            <email>[email protected]</email>
-            <roles>
-                <role>Administrator</role>
-            </roles>
-        </developer>
-    </developers>
-    <licenses>
-        <license>
-            <name>Initial Developer's Public License Version 1.0</name>
-            <url>https://firebirdsql.org/en/initial-developer-s-public-license-version-1-0/</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <outputDirectory>../../../lib</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/modules/plugins/fbclient-5/pom.xml b/modules/plugins/fbclient-5/pom.xml
@@ -7,31 +7,26 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
     <artifactId>fbclient-5</artifactId>
-    <version>5.0.0-rc.5</version>
+    <version>${fbclient5.version}</version>
     <packaging>jar</packaging>
 
-    <inceptionYear>2019</inceptionYear>
-    <developers>
-        <developer>
-            <id>mrotteveel</id>
-            <name>Mark Rotteveel</name>
-            <email>[email protected]</email>
-            <roles>
-                <role>Administrator</role>
-            </roles>
-        </developer>
-    </developers>
-    <licenses>
-        <license>
-            <name>Initial Developer's Public License Version 1.0</name>
-            <url>https://firebirdsql.org/en/initial-developer-s-public-license-version-1-0/</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <outputDirectory>../../../lib</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
diff --git a/modules/plugins/fbplugin-impl/pom.xml b/modules/plugins/fbplugin-impl/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.executequery</groupId>
     <artifactId>RedExpert-parent</artifactId>
-    <version>2024.11</version>
+    <version>2024.12</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/plugins/fbplugin-impl5/pom.xml b/modules/plugins/fbplugin-impl5/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/plugins/fbplugin/pom.xml b/modules/plugins/fbplugin/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.executequery</groupId>
     <artifactId>RedExpert-parent</artifactId>
-    <version>2024.11</version>
+    <version>2024.12</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 

diff --git a/modules/plugins/procedure-parser/pom.xml b/modules/plugins/procedure-parser/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/plugins/sql-parser/pom.xml b/modules/plugins/sql-parser/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <version>1.0</version>

diff --git a/modules/plugins/sqlLexer/pom.xml b/modules/plugins/sqlLexer/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/plugins/trace-parser/pom.xml b/modules/plugins/trace-parser/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
-        <version>2024.11</version>
+        <version>2024.12</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/redexpert/pom.xml b/modules/redexpert/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.executequery</groupId>
         <artifactId>RedExpert-parent</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>2024.11</version>
+        <version>2024.12</version>
     </parent>
 
     <dependencies>
@@ -28,19 +28,19 @@
         <dependency>
             <groupId>org.executequery</groupId>
             <artifactId>fbclient-3</artifactId>
-            <version>3.0.17</version>
+            <version>${fbclient3.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.executequery</groupId>
             <artifactId>fbclient-4</artifactId>
-            <version>4.0.0</version>
+            <version>${fbclient4.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.executequery</groupId>
             <artifactId>fbclient-5</artifactId>
-            <version>5.0.0-rc.5</version>
+            <version>${fbclient5.version}</version>
         </dependency>
 
         <dependency>
@@ -312,6 +312,9 @@
                                 <resource>
                                     <directory>${pom.basedir}/../../lib</directory>
                                     <includes>
+                                        <include>fbclient-3.jar</include>
+                                        <include>fbclient-4.jar</include>
+                                        <include>fbclient-5.jar</include>
                                         <include>fbplugin-impl.jar</include>
                                         <include>fbplugin-impl5.jar</include>
                                         <include>jdbc-logger.jar</include>
@@ -394,18 +397,6 @@
                             <outputDirectory>${project.build.directory}/lib</outputDirectory>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-fbclient-libs</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <stripVersion>true</stripVersion>
-                            <includeArtifactIds>fbclient-3,fbclient-4,fbclient-5</includeArtifactIds>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -5,14 +5,17 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <antlr.version>4.7</antlr.version>
+        <fbclient3.version>3.0.17</fbclient3.version>
+        <fbclient4.version>4.0.0</fbclient4.version>
+        <fbclient5.version>5.0.0-rc.5</fbclient5.version>
         <jaybird3.version>3.0.36</jaybird3.version>
         <jaybird4.version>4.0.30</jaybird4.version>
         <jaybird5.version>5.0.18</jaybird5.version>
     </properties>
     <groupId>org.executequery</groupId>
     <artifactId>RedExpert-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2024.11</version>
+    <version>2024.12</version>
     <modules>
         <module>modules/plugins/fbplugin</module>
         <module>modules/plugins/fbclient-3</module>

diff --git a/src/org/executequery/actions/othercommands/ExportDataCommand.java b/src/org/executequery/actions/othercommands/ExportDataCommand.java
@@ -22,7 +22,7 @@
 
 import org.executequery.GUIUtilities;
 import org.executequery.gui.editor.QueryEditor;
-import org.executequery.gui.exportData.ExportDataPanel;
+import org.executequery.gui.export.ExportDataPanel;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;