New superPackages database function

resources/schemas/dbscripts/sqlserver/snd-23.004-23.005.sql

@@ -0,0 +1,79 @@
+EXEC core.fn_dropifexists 'fGetAllSuperPkgs', 'snd', 'function';
+go
+
+CREATE FUNCTION [snd].[fGetAllSuperPkgs]
+()
+RETURNS @expandedSuperPackages TABLE
+(
+    TopLevelPkgId INTEGER NOT NULL,
+    SuperPkgId INTEGER NOT NULL,
+    ParentSuperPkgId INTEGER NULL,
+    PkgId INTEGER NOT NULL,
+    TreePath VARCHAR(MAX) NOT NULL,
+    SuperPkgPath INTEGER NOT NULL,
+    SortOrder INTEGER NULL,
+    Required INTEGER NULL,
+    DESCRIPTION VARCHAR(MAX) NOT NULL,
+    Narrative VARCHAR(MAX) NOT NULL,
+    Active INTEGER NOT NULL,
+    Repeatable INTEGER NOT NULL,
+    Level INTEGER NOT NULL
+)
+AS
+BEGIN
+    DECLARE @loopCursor CURSOR;
+    DECLARE @topLevelPkgId INTEGER;
+
+    SET @loopCursor = CURSOR LOCAL FOR
+SELECT PkgId AS topLevelPackageId
+FROM snd.SuperPkgs AS tl
+WHERE ParentSuperPkgId IS NULL
+    FOR READ ONLY;
+
+OPEN @loopCursor;
+FETCH @loopCursor
+    INTO @topLevelPkgId;
+
+WHILE (@@FETCH_STATUS = 0)
+BEGIN
+INSERT INTO @expandedSuperPackages
+(
+    TopLevelPkgId,
+    SuperPkgId,
+    ParentSuperPkgId,
+    PkgId,
+    TreePath,
+    SuperPkgPath,
+    SortOrder,
+    Required,
+    DESCRIPTION,
+    Narrative,
+    Active,
+    Repeatable,
+    Level
+)
+    (SELECT TopLevelPkgId,
+            SuperPkgId,
+            ParentSuperPkgId,
+            PkgId,
+            TreePath,
+            SuperPkgPath,
+            SortOrder,
+            Required,
+            Description,
+            Narrative,
+            Active,
+            Repeatable,
+            Level
+     FROM snd.fGetSuperPkg(@topLevelPkgId) );
+
+FETCH NEXT FROM @loopCursor
+    INTO @topLevelPkgId;
+
+END; -- WHILE LOOP
+
+CLOSE @loopCursor;
+DEALLOCATE @loopCursor;
+
+       RETURN;
+END;

src/org/labkey/snd/SNDController.java

@@ -95,7 +95,7 @@ private Map<GWTPropertyDescriptor, Object> getExtraFields(JSONArray jsonExtras)
         for (int e = 0; e < jsonExtras.length(); e++)
         {
             extra = jsonExtras.getJSONObject(e);
-            extras.put(SNDServiceImpl.jsonToPropertyDescriptor(extra), extra.get("value"));
+            extras.put(SNDServiceImpl.jsonToPropertyDescriptor(extra), extra.optString("value", null));
         }
 
         return extras;

src/org/labkey/snd/SNDModule.java

@@ -65,7 +65,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 23.004;
+        return 23.005;
     }
 
     @Override

src/org/labkey/snd/SNDSchema.java

@@ -37,6 +37,7 @@ public class SNDSchema
     public static final String LOOKUPS_TABLE_NAME = "Lookups";
     public static final String LOOKUPSETS_TABLE_NAME = "LookupSets";
     public static final String SUPERPKGS_FUNCTION_NAME = "fGetSuperPkg";
+    public static final String ALL_SUPERPKGS_FUNCTION_NAME = "fGetAllSuperPkgs";
     public static final String PROJECTS_FUNCTION_NAME = "fGetProjectItems";
     public static final String EVENTSCACHE_TABLE_NAME = "EventsCache";