Merge remote-tracking branch 'origin/master' into release-3.5

thingsboard · May 10, 2023 · 87f1430 · 87f1430
2 parents 5521e57 + fe06734
commit 87f1430
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/src/main/data/upgrade/3.4.4/schema_update.sql b/application/src/main/data/upgrade/3.4.4/schema_update.sql
@@ -415,7 +415,7 @@ BEGIN
                            'FOR VALUES FROM ( %s ) TO ( %s )', p.partition_ts, p.partition_ts, partition_end_ts);
         END LOOP;
 
-    INSERT INTO cloud_event
+    INSERT INTO cloud_event (id, created_time, cloud_event_type, entity_id, cloud_event_action, entity_body, tenant_id, ts)
     SELECT id, created_time, cloud_event_type, entity_id, cloud_event_action, entity_body, tenant_id, ts
     FROM old_cloud_event
     WHERE created_time >= start_time_ms AND created_time < end_time_ms;

diff --git a/msa/tb-edge/pom.xml b/msa/tb-edge/pom.xml
@@ -37,7 +37,7 @@
         <pkg.name>tb-edge</pkg.name>
         <tb.docker.name>tb-edge</tb.docker.name>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
-        <pkg.upgradeVersion>3.4.2</pkg.upgradeVersion>
+        <pkg.upgradeVersion>3.5.0</pkg.upgradeVersion>
     </properties>
 
     <dependencies>