#3928: fix: 3.1.1_schema mysql ddl sql error (#13485)

commit.ref

@@ -1 +1 @@
-Subproject commit b11431db9565093a766e27dc12240a27e44f2f4c
+Subproject commit 5fb6035f0dc03f6fae0ad9af4d95a49c8985ed57

commit.yml

@@ -2,85 +2,34 @@
 branches: {
   }
 fileChange:
-  /dolphinscheduler-common:
-    newFile: !uuid 'e944348510dee5aead0bc776b4163c843e9494e2'
-    oldFile: !uuid 'd41d851657f326dfa5325fabbeab53d449889158'
-  /dolphinscheduler-common/src:
-    newFile: !uuid '14c9d3dcd7ef5f7ff72e9b62145b9d91881185de'
-    oldFile: !uuid '159e5e0e379c21056ba6c20517e05e2487c16bf9'
-  /dolphinscheduler-common/src/main:
-    newFile: !uuid '5f14498bcf11d174fad57357dcba6bd8dc757e9e'
-    oldFile: !uuid '38a6bac66fae4867505c18d19198e2f0c9aa59a8'
-  /dolphinscheduler-common/src/main/java:
-    newFile: !uuid '8603712de2c850ec282df6888abf92ed9c58cb76'
-    oldFile: !uuid '027aad3a9ab57d6273952f8fccb2bc78c8d6cc20'
-  /dolphinscheduler-common/src/main/java/org:
-    newFile: !uuid '347a531b57a0b6870fa826a49e64237c5435388e'
-    oldFile: !uuid 'db9677cf7d9c70bdac3d3dee43bef8e911306cec'
-  /dolphinscheduler-common/src/main/java/org/apache:
-    newFile: !uuid '042cd798841440d4851f9f78e0f40326cee7d628'
-    oldFile: !uuid '2725c427b7b2aab133a1d167d65717f10c2334e9'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '63ca4b22456659964dfd7dbe74c367c4f9073ff3'
-    oldFile: !uuid '7bb5b9fcc5dbf6976ee2678fd94e3735355da0fc'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common:
-    newFile: !uuid '8939649d632a79e3cdb0610b10dff0fec69d53c1'
-    oldFile: !uuid '4272c843318c233b9290085c12e3425237cd2663'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread:
-    newFile: !uuid '46b986dca70773453c2e84d941d4ac1681729bb9'
-    oldFile: !uuid '81f63af2a004ff17da103c9b9b8033a3b4410421'
-  /dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java:
-    newFile: !uuid 'f73c40b960bc5eba3d1e10210ef6556ee0e3bc98'
-    oldFile: !uuid '6eca0e783f497f1721d17f74b9b8cfda7976d593'
-  /dolphinscheduler-datasource-plugin:
-    newFile: !uuid '8be9874d55167105ba31b069e8558122c2973339'
-    oldFile: !uuid '75c293a3213eda40ac4de60cbbc721930e952ee9'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive:
-    newFile: !uuid '7eb04842ddc31044d7bb0290dd1b6bfd57604144'
-    oldFile: !uuid '527f253176ac14cd7abf3872f6f6f54e9a255f99'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src:
-    newFile: !uuid 'efb23a9e0e0982a223cfa3cb7dbae285117b15e7'
-    oldFile: !uuid '08154978c03cf90dfe813002e2da23214f2d9963'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main:
-    newFile: !uuid '415c97fd6affcb3f5e72612f739d50f0566bd93c'
-    oldFile: !uuid 'e8df7df8de3d25d61f368c75d671f50926a635a6'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java:
-    newFile: !uuid '68dbc7cd7b1889b890710c8d4eb2e07736c97c96'
-    oldFile: !uuid '377dfb609780ee6508e71ad977226b241bda99c3'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org:
-    newFile: !uuid '6ddcfe5537054847452447b851264f2ce8441a96'
-    oldFile: !uuid '3bd2c06c4d300caae9d9f225fecae27e6f34ba6e'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache:
-    newFile: !uuid 'a37b276c40e63c826a12f85f1db1fa56bc75b7d2'
-    oldFile: !uuid 'f72f7d3336a71661e2d4ed81d6b8154f253ac2b5'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '169e221e739efde09acf8d1445e510971d98592f'
-    oldFile: !uuid '0cad2bfc78a47bb9db98dd0a1d9fb31ce4480af3'
-  /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin:
-    newFile: !uuid '7728eed907ff4489a7526159924726c6aeb00c7d'
-    oldFile: !uuid '54f49011b54bcfddcb108476137103b3dc5efd4c'
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource
-  : newFile: !uuid 'a70cb94c849319d12e6c3b71858457000d7366c2'
-    oldFile: !uuid 'f0c699856bd75106ad3a9a3e17f2d54801f928cf'
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive
-  : newFile: !uuid 'd5e82cf667428ae1bed63b35014ce0ae4ffae5da'
-    oldFile: !uuid '126672b53013581028a1f2e8c9971041fb1e8735'
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/HiveDataSourceClient.java
-  : newFile: !uuid 'c7eef482da1fe33a3b896a99da812ab866a98654'
-    oldFile: !uuid 'f2539c7992f367ea9f0553656b81cfc534160e3b'
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/security
-  : newFile: !uuid 'deff19e5bc70648cfc7e4f733908f787d8ef24eb'
-    oldFile: null
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/security/UserGroupInformationFactory.java
-  : newFile: !uuid '168ff3bdca5f288fd8bbc45d6c576ba77ceb93bb'
-    oldFile: null
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/utils
-  : newFile: null
-    oldFile: !uuid '0e8bd3411cbd2fd56b5fb27de60417a74e87246e'
-  ? /dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-hive/src/main/java/org/apache/dolphinscheduler/plugin/datasource/hive/utils/CommonUtil.java
-  : newFile: null
-    oldFile: !uuid 'be9ef1ea1f31d79055a3c54543322c47ab18ecfb'
-gitCommitId: !uuid 'b11431db9565093a766e27dc12240a27e44f2f4c'
+  /dolphinscheduler-dao:
+    newFile: !uuid '182cbd32ce5de27b16939fe88cd842b89506e07e'
+    oldFile: !uuid 'ed8ad419c7cca9083051beed314a4ff0f99256b0'
+  /dolphinscheduler-dao/src:
+    newFile: !uuid '24e72ef5344b54a19e7005da88776e21bb18acb9'
+    oldFile: !uuid '7a9d0d3d2de945427675b5bb873f4bc716f1f470'
+  /dolphinscheduler-dao/src/main:
+    newFile: !uuid '065e48d533cea98885de46cfbf426642b5a5978d'
+    oldFile: !uuid '4a4f8e52cce108dc790b97446d37c7d2df0cb9b3'
+  /dolphinscheduler-dao/src/main/resources:
+    newFile: !uuid '9d839823061f1459887b0c22058092ed577b1f7b'
+    oldFile: !uuid 'ee692b57a8da376e96ab971a3349c028037c955f'
+  /dolphinscheduler-dao/src/main/resources/sql:
+    newFile: !uuid '153de09db211febf80c55f29608854d798f99e9f'
+    oldFile: !uuid '5affe2603c55f5a4e2aa4b930356dd9426cf8b8d'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade:
+    newFile: !uuid 'bdc7e37118322e05367207f08f343d347475c392'
+    oldFile: !uuid 'f7dcbe425e5206db649fcf2a8b2cffdca450dd15'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema:
+    newFile: !uuid '5b6580d49a14274290f689f2cd7584b0b710b2d7'
+    oldFile: !uuid 'e319d39ad8ee4ad69798ee51d3bcebfee58c41a2'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql:
+    newFile: !uuid '74a991e69f266232a107e8e9f039dc842340f4a6'
+    oldFile: !uuid '36de25a168b084f02e382e38e9d0e35cb7f3ca79'
+  /dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.1_schema/mysql/dolphinscheduler_ddl.sql:
+    newFile: !uuid '09043f3c10b97f4d2a755b155f341ee3d2eab443'
+    oldFile: !uuid '989c9b51abcddddb0aba2130fdaed9f94f2b66b3'
+gitCommitId: !uuid '5fb6035f0dc03f6fae0ad9af4d95a49c8985ed57'
 renames: {
   }
-revisionId: 3927
+revisionId: 3928