Merge pull request #12 from mariuz/dev

Dev
mariuz · Jan 1, 2021 · 40d96b6 · 40d96b6
2 parents 01ccc59 + 48edff1
commit 40d96b6
Show file tree

Hide file tree

Showing 91 changed files with 6,381 additions and 742 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -2,9 +2,9 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, dev ]
 
 jobs:
   build:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -146,6 +146,7 @@ list(APPEND SOURCE_LIST
         ${SOURCEDIR}/metadata/MetadataItemVisitor.cpp
         ${SOURCEDIR}/metadata/MetadataTemplateCmdHandler.cpp
         ${SOURCEDIR}/metadata/MetadataTemplateManager.cpp
+        ${SOURCEDIR}/metadata/package.cpp
         ${SOURCEDIR}/metadata/parameter.cpp
         ${SOURCEDIR}/metadata/privilege.cpp
         ${SOURCEDIR}/metadata/procedure.cpp
@@ -241,6 +242,7 @@ list(APPEND HEADER_LIST
         ${SOURCEDIR}/MasterPassword.h
         ${SOURCEDIR}/metadata/collection.h
         ${SOURCEDIR}/metadata/column.h
+        ${SOURCEDIR}/metadata/constants.h
         ${SOURCEDIR}/metadata/constraints.h
         ${SOURCEDIR}/metadata/CreateDDLVisitor.h
         ${SOURCEDIR}/metadata/database.h
@@ -256,6 +258,7 @@ list(APPEND HEADER_LIST
         ${SOURCEDIR}/metadata/MetadataItemURIHandlerHelper.h
         ${SOURCEDIR}/metadata/MetadataItemVisitor.h
         ${SOURCEDIR}/metadata/MetadataTemplateManager.h
+        ${SOURCEDIR}/metadata/package.h
         ${SOURCEDIR}/metadata/parameter.h
         ${SOURCEDIR}/metadata/privilege.h
         ${SOURCEDIR}/metadata/procedure.h

diff --git a/flamerobin.sln b/flamerobin.sln
@@ -1,7 +1,6 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30225.117
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flamerobin", "flamerobin_flamerobin.vcxproj", "{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}"
 EndProject
@@ -30,7 +29,8 @@ Global
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|x64.ActiveCfg = Debug Dynamic|x64
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|x64.Build.0 = Debug Dynamic|x64
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|x86.ActiveCfg = Debug Dynamic|Win32
-		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Dynamic|x86.Build.0 = Debug Dynamic|Win32
+		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
+		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|Win32.Build.0 = Debug Static|Win32
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|x64.ActiveCfg = Debug Static|x64
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|x64.Build.0 = Debug Static|x64
 		{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}.Debug Static|x86.ActiveCfg = Debug Static|Win32
@@ -62,7 +62,8 @@ Global
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|x64.ActiveCfg = Debug Dynamic|x64
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|x64.Build.0 = Debug Dynamic|x64
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|x86.ActiveCfg = Debug Dynamic|Win32
-		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Dynamic|x86.Build.0 = Debug Dynamic|Win32
+		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.ActiveCfg = Debug Static|Win32
+		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|Win32.Build.0 = Debug Static|Win32
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|x64.ActiveCfg = Debug Static|x64
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|x64.Build.0 = Debug Static|x64
 		{F98A5270-7698-516C-9430-13EBB667AEA5}.Debug Static|x86.ActiveCfg = Debug Static|Win32
@@ -95,4 +96,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AAC61EBF-B39D-4C16-B7A4-25063DB7928D}
+	EndGlobalSection
 EndGlobal
diff --git a/flamerobin_flamerobin.vcxproj b/flamerobin_flamerobin.vcxproj
@@ -69,88 +69,87 @@
   <PropertyGroup Label="Globals">
     <ProjectName>flamerobin</ProjectName>
     <ProjectGuid>{3C914FEE-C6E8-58AA-B046-6E951FCD6BFC}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Static|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Static|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dynamic|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -219,7 +218,7 @@
     <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
-    <OutDir>vcusd\</OutDir>
+    <OutDir>.\</OutDir>
     <IntDir>vcusd\flamerobin\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>true</GenerateManifest>
@@ -408,7 +407,7 @@
     <Link>
       <AdditionalOptions>/nologo /subsystem:windows %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>wxmsw31ud_aui.lib;wxmsw31ud_stc.lib;wxmsw31ud_html.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxbase31ud_xml.lib;wxbase31ud.lib;wxscintillad.lib;wxexpatd.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;vcusd\ibpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>vcusd\flamerobin.exe</OutputFile>
+      <OutputFile>flamerobin.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(WXDIR)\lib\vc_lib;$(BOOST_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -1084,6 +1083,7 @@
     <ClCompile Include="src\metadata\MetadataItemVisitor.cpp" />
     <ClCompile Include="src\metadata\MetadataTemplateCmdHandler.cpp" />
     <ClCompile Include="src\metadata\MetadataTemplateManager.cpp" />
+    <ClCompile Include="src\metadata\package.cpp" />
     <ClCompile Include="src\metadata\parameter.cpp" />
     <ClCompile Include="src\metadata\privilege.cpp" />
     <ClCompile Include="src\metadata\procedure.cpp" />
@@ -1179,6 +1179,7 @@
     <ClInclude Include="src\MasterPassword.h" />
     <ClInclude Include="src\metadata\collection.h" />
     <ClInclude Include="src\metadata\column.h" />
+    <ClInclude Include="src\metadata\constants.h" />
     <ClInclude Include="src\metadata\constraints.h" />
     <ClInclude Include="src\metadata\CreateDDLVisitor.h" />
     <ClInclude Include="src\metadata\database.h" />
@@ -1194,6 +1195,7 @@
     <ClInclude Include="src\metadata\MetadataItemURIHandlerHelper.h" />
     <ClInclude Include="src\metadata\MetadataItemVisitor.h" />
     <ClInclude Include="src\metadata\MetadataTemplateManager.h" />
+    <ClInclude Include="src\metadata\package.h" />
     <ClInclude Include="src\metadata\parameter.h" />
     <ClInclude Include="src\metadata\privilege.h" />
     <ClInclude Include="src\metadata\procedure.h" />

diff --git a/flamerobin_flamerobin.vcxproj.filters b/flamerobin_flamerobin.vcxproj.filters
@@ -336,6 +336,9 @@
     <ClCompile Include="src\gui\InsertParametersDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\metadata\package.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\gui\AboutBox.h">
@@ -659,6 +662,12 @@
     <ClInclude Include="src\gui\InsertParametersDialog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\metadata\package.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\metadata\constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="res\flamerobin.rc">

diff --git a/flamerobin_ibpp.vcxproj b/flamerobin_ibpp.vcxproj
@@ -69,87 +69,87 @@
   <PropertyGroup Label="Globals">
     <ProjectName>ibpp</ProjectName>
     <ProjectGuid>{F98A5270-7698-516C-9430-13EBB667AEA5}</ProjectGuid>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Static|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Static|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dynamic|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Dynamic|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/html-templates/DATABASE.html b/html-templates/DATABASE.html
@@ -7,8 +7,8 @@
 <br>
 <br>
 <font size=+2>{%object_name%}</font><br>
-{%dbinfo:connection_string%}
-<br><br>
+{%dbinfo:connection_string%}<br>
+{%dbinfo:sql_security%}<br>
 <table bgcolor="white" border=0 cellpadding=2 cellspacing=0 valign=top>
     <tr><td>
 
@@ -54,6 +54,10 @@
         <td nowrap>Sweep Interval</td>
         <td align="right" bgcolor="#CCCCFF" nowrap><a href="fr://edit_db_sweep_interval?parent_window={%parent_window%}&amp;object_handle={%object_handle%}">{%dbinfo:sweep_interval%}</a></td>
     </tr>
+    <tr bgcolor="#DDDDFF">
+        <td nowrap>Linger</td>
+        <td align="right" bgcolor="#CCCCFF" nowrap><a href="fr://edit_db_linger?parent_window={%parent_window%}&amp;object_handle={%object_handle%}">{%dbinfo:linger%}</a></td>
+    </tr>
     <tr bgcolor="#DDDDFF">
         <td nowrap>Forced Writes</td>
         <td align="center" bgcolor="#CCCCFF" nowrap><a href="fr://edit_db_forced_writes?parent_window={%parent_window%}&amp;object_handle={%object_handle%}"><img src="{%template_root%}{%ifeq:{%dbinfo:forced_writes%}:true:ok.png:redx.png%}"></a></td>