Merge remote-tracking branch 'origin/develop' into fb_migrate_ss_to_pg

labkey-adam · labkey-adam · commit df2a02b43d9f · 2025-07-30T11:54:33.000-07:00
diff --git a/api/src/org/labkey/api/data/ContainerManager.java b/api/src/org/labkey/api/data/ContainerManager.java
@@ -1554,6 +1554,7 @@ else if (hasAncestryRead)
                             if (isNavAccessOpen)
                             {
                                 NavTree noLinkTree = new NavTree(missing.getName());
+                                noLinkTree.setId(missing.getId());
                                 m.put(missing.getId(), noLinkTree);
                             }
                             else
diff --git a/audit/resources/schemas/dbscripts/postgresql/audit-25.000-25.001.sql b/audit/resources/schemas/dbscripts/postgresql/audit-25.000-25.001.sql
@@ -0,0 +1,2 @@
+-- This old table hasn't been used since we migrated the audit log to provisioned tables (in 2013!)
+DROP TABLE audit.AuditLog;
diff --git a/audit/resources/schemas/dbscripts/sqlserver/audit-25.000-25.001.sql b/audit/resources/schemas/dbscripts/sqlserver/audit-25.000-25.001.sql
@@ -0,0 +1,2 @@
+-- This old table hasn't been used since we migrated the audit log to provisioned tables (in 2013!)
+DROP TABLE audit.AuditLog;
diff --git a/audit/src/org/labkey/audit/AuditModule.java b/audit/src/org/labkey/audit/AuditModule.java
@@ -52,7 +52,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 25.000;
+        return 25.001;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -1554,6 +1554,7 @@ else if (hasAncestryRead)`
`1554`	`1554`	`if (isNavAccessOpen)`
`1555`	`1555`	`{`
`1556`	`1556`	`NavTree noLinkTree = new NavTree(missing.getName());`
	`1557`	`+ noLinkTree.setId(missing.getId());`
`1557`	`1558`	`m.put(missing.getId(), noLinkTree);`
`1558`	`1559`	`}`
`1559`	`1560`	`else`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- This old table hasn't been used since we migrated the audit log to provisioned tables (in 2013!)`
	`2`	`+DROP TABLE audit.AuditLog;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public String getName()`
`52`	`52`	`@Override`
`53`	`53`	`public Double getSchemaVersion()`
`54`	`54`	`{`
`55`		`- return 25.000;`
	`55`	`+ return 25.001;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`