@budibase/server 1.1.8 → 1.1.10-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (167) hide show
  1. package/builder/assets/{index.df5b8162.js → index.fa1df184.js} +107 -107
  2. package/builder/index.html +1 -1
  3. package/coverage/clover.xml +198 -198
  4. package/coverage/coverage-final.json +19 -19
  5. package/coverage/lcov-report/api/controllers/apikeys.js.html +1 -1
  6. package/coverage/lcov-report/api/controllers/auth.js.html +1 -1
  7. package/coverage/lcov-report/api/controllers/automation.js.html +1 -1
  8. package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
  9. package/coverage/lcov-report/api/controllers/cloud.js.html +1 -1
  10. package/coverage/lcov-report/api/controllers/component.js.html +1 -1
  11. package/coverage/lcov-report/api/controllers/datasource.js.html +1 -1
  12. package/coverage/lcov-report/api/controllers/dev.js.html +1 -1
  13. package/coverage/lcov-report/api/controllers/index.html +1 -1
  14. package/coverage/lcov-report/api/controllers/integration.js.html +1 -1
  15. package/coverage/lcov-report/api/controllers/layout.js.html +1 -1
  16. package/coverage/lcov-report/api/controllers/metadata.js.html +1 -1
  17. package/coverage/lcov-report/api/controllers/migrations.js.html +1 -1
  18. package/coverage/lcov-report/api/controllers/permission.js.html +1 -1
  19. package/coverage/lcov-report/api/controllers/query/index.html +1 -1
  20. package/coverage/lcov-report/api/controllers/query/validation.js.html +1 -1
  21. package/coverage/lcov-report/api/controllers/role.js.html +1 -1
  22. package/coverage/lcov-report/api/controllers/routing.js.html +1 -1
  23. package/coverage/lcov-report/api/controllers/row/external.js.html +1 -1
  24. package/coverage/lcov-report/api/controllers/row/index.html +1 -1
  25. package/coverage/lcov-report/api/controllers/row/internal.js.html +12 -12
  26. package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +1 -1
  27. package/coverage/lcov-report/api/controllers/row/staticFormula.js.html +15 -15
  28. package/coverage/lcov-report/api/controllers/row/utils.js.html +13 -13
  29. package/coverage/lcov-report/api/controllers/screen.js.html +1 -1
  30. package/coverage/lcov-report/api/controllers/script.js.html +1 -1
  31. package/coverage/lcov-report/api/controllers/table/bulkFormula.js.html +1 -1
  32. package/coverage/lcov-report/api/controllers/table/external.js.html +1 -1
  33. package/coverage/lcov-report/api/controllers/table/index.html +1 -1
  34. package/coverage/lcov-report/api/controllers/table/index.js.html +1 -1
  35. package/coverage/lcov-report/api/controllers/templates.js.html +1 -1
  36. package/coverage/lcov-report/api/controllers/user.js.html +1 -1
  37. package/coverage/lcov-report/api/controllers/view/exporters.js.html +1 -1
  38. package/coverage/lcov-report/api/controllers/view/index.html +1 -1
  39. package/coverage/lcov-report/api/controllers/view/index.js.html +1 -1
  40. package/coverage/lcov-report/api/controllers/view/utils.js.html +1 -1
  41. package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +1 -1
  42. package/coverage/lcov-report/api/controllers/webhook.js.html +1 -1
  43. package/coverage/lcov-report/api/index.html +1 -1
  44. package/coverage/lcov-report/api/index.js.html +5 -5
  45. package/coverage/lcov-report/api/routes/analytics.js.html +1 -1
  46. package/coverage/lcov-report/api/routes/apikeys.js.html +1 -1
  47. package/coverage/lcov-report/api/routes/auth.js.html +1 -1
  48. package/coverage/lcov-report/api/routes/automation.js.html +1 -1
  49. package/coverage/lcov-report/api/routes/backup.js.html +1 -1
  50. package/coverage/lcov-report/api/routes/cloud.js.html +1 -1
  51. package/coverage/lcov-report/api/routes/component.js.html +1 -1
  52. package/coverage/lcov-report/api/routes/datasource.js.html +1 -1
  53. package/coverage/lcov-report/api/routes/deploy.js.html +1 -1
  54. package/coverage/lcov-report/api/routes/dev.js.html +1 -1
  55. package/coverage/lcov-report/api/routes/index.html +1 -1
  56. package/coverage/lcov-report/api/routes/integration.js.html +1 -1
  57. package/coverage/lcov-report/api/routes/layout.js.html +1 -1
  58. package/coverage/lcov-report/api/routes/metadata.js.html +1 -1
  59. package/coverage/lcov-report/api/routes/migrations.js.html +1 -1
  60. package/coverage/lcov-report/api/routes/permission.js.html +1 -1
  61. package/coverage/lcov-report/api/routes/query.js.html +1 -1
  62. package/coverage/lcov-report/api/routes/role.js.html +1 -1
  63. package/coverage/lcov-report/api/routes/routing.js.html +1 -1
  64. package/coverage/lcov-report/api/routes/screen.js.html +1 -1
  65. package/coverage/lcov-report/api/routes/script.js.html +1 -1
  66. package/coverage/lcov-report/api/routes/table.js.html +1 -1
  67. package/coverage/lcov-report/api/routes/templates.js.html +1 -1
  68. package/coverage/lcov-report/api/routes/user.js.html +1 -1
  69. package/coverage/lcov-report/api/routes/utils/index.html +1 -1
  70. package/coverage/lcov-report/api/routes/utils/validators.js.html +1 -1
  71. package/coverage/lcov-report/api/routes/view.js.html +1 -1
  72. package/coverage/lcov-report/api/routes/webhook.js.html +1 -1
  73. package/coverage/lcov-report/automations/actions.js.html +1 -1
  74. package/coverage/lcov-report/automations/automationUtils.js.html +1 -1
  75. package/coverage/lcov-report/automations/bullboard.js.html +1 -1
  76. package/coverage/lcov-report/automations/index.html +1 -1
  77. package/coverage/lcov-report/automations/index.js.html +1 -1
  78. package/coverage/lcov-report/automations/steps/bash.js.html +1 -1
  79. package/coverage/lcov-report/automations/steps/delay.js.html +1 -1
  80. package/coverage/lcov-report/automations/steps/discord.js.html +1 -1
  81. package/coverage/lcov-report/automations/steps/executeQuery.js.html +1 -1
  82. package/coverage/lcov-report/automations/steps/executeScript.js.html +1 -1
  83. package/coverage/lcov-report/automations/steps/filter.js.html +1 -1
  84. package/coverage/lcov-report/automations/steps/index.html +1 -1
  85. package/coverage/lcov-report/automations/steps/integromat.js.html +1 -1
  86. package/coverage/lcov-report/automations/steps/loop.js.html +1 -1
  87. package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +1 -1
  88. package/coverage/lcov-report/automations/steps/queryRows.js.html +1 -1
  89. package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +1 -1
  90. package/coverage/lcov-report/automations/steps/serverLog.js.html +1 -1
  91. package/coverage/lcov-report/automations/steps/slack.js.html +1 -1
  92. package/coverage/lcov-report/automations/steps/updateRow.js.html +1 -1
  93. package/coverage/lcov-report/automations/steps/utils.js.html +1 -1
  94. package/coverage/lcov-report/automations/steps/zapier.js.html +1 -1
  95. package/coverage/lcov-report/automations/triggerInfo/app.js.html +1 -1
  96. package/coverage/lcov-report/automations/triggerInfo/cron.js.html +1 -1
  97. package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
  98. package/coverage/lcov-report/automations/triggerInfo/index.js.html +1 -1
  99. package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +1 -1
  100. package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +1 -1
  101. package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +1 -1
  102. package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +1 -1
  103. package/coverage/lcov-report/automations/triggers.js.html +8 -8
  104. package/coverage/lcov-report/constants/index.html +1 -1
  105. package/coverage/lcov-report/constants/index.js.html +1 -1
  106. package/coverage/lcov-report/constants/layouts.js.html +1 -1
  107. package/coverage/lcov-report/constants/screens.js.html +1 -1
  108. package/coverage/lcov-report/db/inMemoryView.js.html +1 -1
  109. package/coverage/lcov-report/db/index.html +1 -1
  110. package/coverage/lcov-report/db/index.js.html +1 -1
  111. package/coverage/lcov-report/db/linkedRows/LinkController.js.html +11 -11
  112. package/coverage/lcov-report/db/linkedRows/index.html +1 -1
  113. package/coverage/lcov-report/db/linkedRows/index.js.html +11 -11
  114. package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +3 -3
  115. package/coverage/lcov-report/db/newid.js.html +2 -2
  116. package/coverage/lcov-report/db/utils.js.html +8 -8
  117. package/coverage/lcov-report/events/AutomationEmitter.js.html +1 -1
  118. package/coverage/lcov-report/events/index.html +1 -1
  119. package/coverage/lcov-report/events/index.js.html +2 -2
  120. package/coverage/lcov-report/events/utils.js.html +9 -9
  121. package/coverage/lcov-report/index.html +1 -1
  122. package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
  123. package/coverage/lcov-report/integrations/tests/index.html +1 -1
  124. package/coverage/lcov-report/middleware/appInfo.js.html +1 -1
  125. package/coverage/lcov-report/middleware/builder.js.html +11 -11
  126. package/coverage/lcov-report/middleware/currentapp.js.html +33 -33
  127. package/coverage/lcov-report/middleware/index.html +1 -1
  128. package/coverage/lcov-report/middleware/joi-validator.js.html +1 -1
  129. package/coverage/lcov-report/middleware/publicApi.js.html +1 -1
  130. package/coverage/lcov-report/middleware/resourceId.js.html +7 -7
  131. package/coverage/lcov-report/middleware/selfhost.js.html +1 -1
  132. package/coverage/lcov-report/middleware/utils.js.html +2 -2
  133. package/coverage/lcov-report/threads/automation.js.html +1 -1
  134. package/coverage/lcov-report/threads/index.html +1 -1
  135. package/coverage/lcov-report/threads/query.js.html +1 -1
  136. package/coverage/lcov-report/threads/utils.js.html +1 -1
  137. package/coverage/lcov-report/utilities/budibaseDir.js.html +1 -1
  138. package/coverage/lcov-report/utilities/centralPath.js.html +1 -1
  139. package/coverage/lcov-report/utilities/csvParser.js.html +1 -1
  140. package/coverage/lcov-report/utilities/global.js.html +14 -14
  141. package/coverage/lcov-report/utilities/index.html +1 -1
  142. package/coverage/lcov-report/utilities/index.js.html +1 -1
  143. package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +1 -1
  144. package/coverage/lcov-report/utilities/queue/index.html +1 -1
  145. package/coverage/lcov-report/utilities/routing/index.html +1 -1
  146. package/coverage/lcov-report/utilities/routing/index.js.html +1 -1
  147. package/coverage/lcov-report/utilities/rowProcessor/index.html +1 -1
  148. package/coverage/lcov-report/utilities/rowProcessor/index.js.html +38 -38
  149. package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +10 -10
  150. package/coverage/lcov-report/utilities/scriptRunner.js.html +1 -1
  151. package/coverage/lcov-report/utilities/security.js.html +1 -1
  152. package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
  153. package/coverage/lcov-report/utilities/usageQuota/index.html +1 -1
  154. package/coverage/lcov-report/utilities/usageQuota/rows.js.html +1 -1
  155. package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html +1 -1
  156. package/coverage/lcov-report/utilities/users.js.html +1 -1
  157. package/coverage/lcov-report/utilities/workerRequests.js.html +1 -1
  158. package/coverage/lcov.info +351 -351
  159. package/dist/api/controllers/application.js +24 -25
  160. package/dist/package.json +7 -7
  161. package/dist/tests/utilities/TestConfiguration.js +19 -10
  162. package/dist/tsconfig.build.tsbuildinfo +1 -1
  163. package/package.json +8 -8
  164. package/src/api/controllers/application.ts +13 -21
  165. package/src/api/routes/tests/row.spec.js +19 -19
  166. package/src/app.ts +0 -1
  167. package/src/tests/utilities/TestConfiguration.js +21 -10
package/coverage/clover.xml CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1657819041798" clover="3.2.0">
3
- <project timestamp="1657819041798" name="All files">
2
+ <coverage generated="1657873514542" clover="3.2.0">
3
+ <project timestamp="1657873514542" name="All files">
4
4
  <metrics statements="4377" coveredstatements="3163" conditionals="1827" coveredconditionals="963" methods="632" coveredmethods="446" elements="6836" coveredelements="4572" complexity="0" loc="4377" ncloc="4377" packages="23" files="129" classes="129"/>
5
5
  <package name="api">
6
6
  <metrics statements="35" coveredstatements="34" conditionals="5" coveredconditionals="2" methods="4" coveredmethods="4"/>
@@ -21,11 +21,11 @@
21
21
  <line num="19" count="27" type="stmt"/>
22
22
  <line num="20" count="27" type="stmt"/>
23
23
  <line num="22" count="27" type="stmt"/>
24
- <line num="36" count="233" type="stmt"/>
25
- <line num="40" count="233" type="stmt"/>
24
+ <line num="36" count="232" type="stmt"/>
25
+ <line num="40" count="232" type="stmt"/>
26
26
  <line num="62" count="27" type="stmt"/>
27
- <line num="63" count="231" type="stmt"/>
28
- <line num="64" count="231" type="stmt"/>
27
+ <line num="63" count="230" type="stmt"/>
28
+ <line num="64" count="230" type="stmt"/>
29
29
  <line num="66" count="39" type="cond" truecount="1" falsecount="2"/>
30
30
  <line num="67" count="39" type="stmt"/>
31
31
  <line num="68" count="39" type="stmt"/>
@@ -1275,18 +1275,18 @@
1275
1275
  <line num="138" count="0" type="stmt"/>
1276
1276
  <line num="141" count="5" type="stmt"/>
1277
1277
  <line num="147" count="44" type="stmt"/>
1278
- <line num="148" count="75" type="stmt"/>
1279
- <line num="149" count="75" type="stmt"/>
1280
- <line num="150" count="75" type="stmt"/>
1281
- <line num="152" count="75" type="cond" truecount="3" falsecount="1"/>
1282
- <line num="153" count="75" type="stmt"/>
1283
- <line num="157" count="75" type="stmt"/>
1284
- <line num="158" count="75" type="stmt"/>
1285
- <line num="159" count="75" type="stmt"/>
1286
- <line num="164" count="75" type="cond" truecount="1" falsecount="1"/>
1278
+ <line num="148" count="74" type="stmt"/>
1279
+ <line num="149" count="74" type="stmt"/>
1280
+ <line num="150" count="74" type="stmt"/>
1281
+ <line num="152" count="74" type="cond" truecount="3" falsecount="1"/>
1282
+ <line num="153" count="74" type="stmt"/>
1283
+ <line num="157" count="74" type="stmt"/>
1284
+ <line num="158" count="74" type="stmt"/>
1285
+ <line num="159" count="74" type="stmt"/>
1286
+ <line num="164" count="74" type="cond" truecount="1" falsecount="1"/>
1287
1287
  <line num="165" count="0" type="stmt"/>
1288
- <line num="169" count="75" type="stmt"/>
1289
- <line num="176" count="74" type="stmt"/>
1288
+ <line num="169" count="74" type="stmt"/>
1289
+ <line num="176" count="73" type="stmt"/>
1290
1290
  <line num="182" count="44" type="stmt"/>
1291
1291
  <line num="183" count="9" type="stmt"/>
1292
1292
  <line num="186" count="9" type="cond" truecount="2" falsecount="0"/>
@@ -1610,9 +1610,9 @@
1610
1610
  <line num="9" count="44" type="stmt"/>
1611
1611
  <line num="10" count="44" type="stmt"/>
1612
1612
  <line num="18" count="44" type="stmt"/>
1613
- <line num="19" count="84" type="stmt"/>
1614
- <line num="21" count="84" type="cond" truecount="1" falsecount="1"/>
1615
- <line num="22" count="84" type="stmt"/>
1613
+ <line num="19" count="83" type="stmt"/>
1614
+ <line num="21" count="83" type="cond" truecount="1" falsecount="1"/>
1615
+ <line num="22" count="83" type="stmt"/>
1616
1616
  <line num="24" count="0" type="stmt"/>
1617
1617
  <line num="25" count="0" type="cond" truecount="0" falsecount="2"/>
1618
1618
  <line num="29" count="0" type="stmt"/>
@@ -1647,11 +1647,11 @@
1647
1647
  <line num="98" count="0" type="stmt"/>
1648
1648
  <line num="102" count="0" type="stmt"/>
1649
1649
  <line num="111" count="44" type="stmt"/>
1650
- <line num="116" count="79" type="stmt"/>
1651
- <line num="117" count="79" type="stmt"/>
1652
- <line num="119" count="79" type="stmt"/>
1653
- <line num="123" count="79" type="stmt"/>
1654
- <line num="131" count="79" type="cond" truecount="3" falsecount="1"/>
1650
+ <line num="116" count="78" type="stmt"/>
1651
+ <line num="117" count="78" type="stmt"/>
1652
+ <line num="119" count="78" type="stmt"/>
1653
+ <line num="123" count="78" type="stmt"/>
1654
+ <line num="131" count="78" type="cond" truecount="3" falsecount="1"/>
1655
1655
  <line num="132" count="0" type="stmt"/>
1656
1656
  <line num="133" count="0" type="stmt"/>
1657
1657
  <line num="135" count="0" type="cond" truecount="0" falsecount="2"/>
@@ -1660,12 +1660,12 @@
1660
1660
  <line num="140" count="0" type="stmt"/>
1661
1661
  <line num="141" count="0" type="stmt"/>
1662
1662
  <line num="143" count="0" type="stmt"/>
1663
- <line num="147" count="79" type="stmt"/>
1664
- <line num="149" count="79" type="stmt"/>
1665
- <line num="150" count="79" type="stmt"/>
1666
- <line num="152" count="79" type="cond" truecount="1" falsecount="1"/>
1667
- <line num="153" count="79" type="stmt"/>
1668
- <line num="155" count="79" type="stmt"/>
1663
+ <line num="147" count="78" type="stmt"/>
1664
+ <line num="149" count="78" type="stmt"/>
1665
+ <line num="150" count="78" type="stmt"/>
1666
+ <line num="152" count="78" type="cond" truecount="1" falsecount="1"/>
1667
+ <line num="153" count="78" type="stmt"/>
1668
+ <line num="155" count="78" type="stmt"/>
1669
1669
  </file>
1670
1670
  <file name="utils.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/row/utils.js">
1671
1671
  <metrics statements="53" coveredstatements="35" conditionals="34" coveredconditionals="13" methods="6" coveredmethods="4"/>
@@ -1695,18 +1695,18 @@
1695
1695
  <line num="40" count="0" type="stmt"/>
1696
1696
  <line num="42" count="23" type="stmt"/>
1697
1697
  <line num="45" count="44" type="stmt"/>
1698
- <line num="46" count="83" type="cond" truecount="2" falsecount="0"/>
1698
+ <line num="46" count="82" type="cond" truecount="2" falsecount="0"/>
1699
1699
  <line num="47" count="2" type="stmt"/>
1700
1700
  <line num="48" count="2" type="stmt"/>
1701
- <line num="50" count="83" type="stmt"/>
1702
- <line num="51" count="83" type="stmt"/>
1703
- <line num="52" count="224" type="stmt"/>
1704
- <line num="53" count="224" type="stmt"/>
1705
- <line num="55" count="224" type="cond" truecount="1" falsecount="1"/>
1701
+ <line num="50" count="82" type="stmt"/>
1702
+ <line num="51" count="82" type="stmt"/>
1703
+ <line num="52" count="222" type="stmt"/>
1704
+ <line num="53" count="222" type="stmt"/>
1705
+ <line num="55" count="222" type="cond" truecount="1" falsecount="1"/>
1706
1706
  <line num="56" count="0" type="stmt"/>
1707
- <line num="59" count="224" type="cond" truecount="2" falsecount="2"/>
1707
+ <line num="59" count="222" type="cond" truecount="2" falsecount="2"/>
1708
1708
  <line num="60" count="0" type="stmt"/>
1709
- <line num="65" count="224" type="cond" truecount="2" falsecount="2"/>
1709
+ <line num="65" count="222" type="cond" truecount="2" falsecount="2"/>
1710
1710
  <line num="66" count="0" type="cond" truecount="0" falsecount="2"/>
1711
1711
  <line num="67" count="0" type="cond" truecount="0" falsecount="2"/>
1712
1712
  <line num="68" count="0" type="stmt"/>
@@ -1715,13 +1715,13 @@
1715
1715
  <line num="75" count="0" type="stmt"/>
1716
1716
  <line num="78" count="0" type="cond" truecount="0" falsecount="4"/>
1717
1717
  <line num="80" count="0" type="stmt"/>
1718
- <line num="82" count="224" type="cond" truecount="2" falsecount="2"/>
1718
+ <line num="82" count="222" type="cond" truecount="2" falsecount="2"/>
1719
1719
  <line num="84" count="0" type="stmt"/>
1720
1720
  <line num="85" count="0" type="stmt"/>
1721
1721
  <line num="87" count="0" type="stmt"/>
1722
- <line num="90" count="224" type="stmt"/>
1723
- <line num="92" count="224" type="cond" truecount="2" falsecount="0"/>
1724
- <line num="94" count="83" type="stmt"/>
1722
+ <line num="90" count="222" type="stmt"/>
1723
+ <line num="92" count="222" type="cond" truecount="2" falsecount="0"/>
1724
+ <line num="94" count="82" type="stmt"/>
1725
1725
  </file>
1726
1726
  </package>
1727
1727
  <package name="api.controllers.table">
@@ -2727,16 +2727,16 @@
2727
2727
  <line num="11" count="43" type="stmt"/>
2728
2728
  <line num="13" count="43" type="stmt"/>
2729
2729
  <line num="14" count="43" type="stmt"/>
2730
- <line num="20" count="18" type="cond" truecount="1" falsecount="1"/>
2730
+ <line num="20" count="17" type="cond" truecount="1" falsecount="1"/>
2731
2731
  <line num="21" count="0" type="stmt"/>
2732
- <line num="24" count="18" type="stmt"/>
2733
- <line num="25" count="18" type="stmt"/>
2734
- <line num="26" count="18" type="stmt"/>
2735
- <line num="31" count="18" type="stmt"/>
2732
+ <line num="24" count="17" type="stmt"/>
2733
+ <line num="25" count="17" type="stmt"/>
2734
+ <line num="26" count="17" type="stmt"/>
2735
+ <line num="31" count="17" type="stmt"/>
2736
2736
  <line num="32" count="4" type="stmt"/>
2737
2737
  <line num="34" count="4" type="stmt"/>
2738
2738
  <line num="35" count="4" type="cond" truecount="2" falsecount="0"/>
2739
- <line num="38" count="18" type="stmt"/>
2739
+ <line num="38" count="17" type="stmt"/>
2740
2740
  <line num="39" count="4" type="stmt"/>
2741
2741
  <line num="40" count="4" type="cond" truecount="1" falsecount="1"/>
2742
2742
  <line num="44" count="4" type="cond" truecount="1" falsecount="1"/>
@@ -2744,7 +2744,7 @@
2744
2744
  <line num="51" count="4" type="cond" truecount="1" falsecount="1"/>
2745
2745
  <line num="55" count="4" type="stmt"/>
2746
2746
  <line num="61" count="43" type="stmt"/>
2747
- <line num="66" count="8" type="stmt"/>
2747
+ <line num="66" count="7" type="stmt"/>
2748
2748
  <line num="69" count="43" type="stmt"/>
2749
2749
  <line num="74" count="4" type="stmt"/>
2750
2750
  <line num="77" count="43" type="stmt"/>
@@ -3156,7 +3156,7 @@
3156
3156
  <metrics statements="3" coveredstatements="3" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1"/>
3157
3157
  <line num="1" count="57" type="stmt"/>
3158
3158
  <line num="3" count="57" type="stmt"/>
3159
- <line num="4" count="958" type="stmt"/>
3159
+ <line num="4" count="957" type="stmt"/>
3160
3160
  </file>
3161
3161
  <file name="utils.js" path="/home/runner/work/budibase/budibase/packages/server/src/db/utils.js">
3162
3162
  <metrics statements="105" coveredstatements="96" conditionals="48" coveredconditionals="18" methods="29" coveredmethods="24"/>
@@ -3189,9 +3189,9 @@
3189
3189
  <line num="82" count="57" type="stmt"/>
3190
3190
  <line num="83" count="57" type="stmt"/>
3191
3191
  <line num="85" count="57" type="stmt"/>
3192
- <line num="100" count="1098" type="cond" truecount="2" falsecount="0"/>
3193
- <line num="101" count="1081" type="stmt"/>
3194
- <line num="103" count="1098" type="stmt"/>
3192
+ <line num="100" count="1097" type="cond" truecount="2" falsecount="0"/>
3193
+ <line num="101" count="1080" type="stmt"/>
3194
+ <line num="103" count="1097" type="stmt"/>
3195
3195
  <line num="110" count="57" type="stmt"/>
3196
3196
  <line num="115" count="57" type="cond" truecount="0" falsecount="2"/>
3197
3197
  <line num="116" count="267" type="stmt"/>
@@ -3206,19 +3206,19 @@
3206
3206
  <line num="151" count="0" type="stmt"/>
3207
3207
  <line num="154" count="0" type="stmt"/>
3208
3208
  <line num="163" count="57" type="cond" truecount="1" falsecount="0"/>
3209
- <line num="164" count="316" type="cond" truecount="2" falsecount="0"/>
3210
- <line num="165" count="316" type="stmt"/>
3209
+ <line num="164" count="314" type="cond" truecount="2" falsecount="0"/>
3210
+ <line num="165" count="314" type="stmt"/>
3211
3211
  <line num="171" count="57" type="cond" truecount="0" falsecount="2"/>
3212
3212
  <line num="172" count="3" type="stmt"/>
3213
3213
  <line num="180" count="57" type="stmt"/>
3214
- <line num="181" count="238" type="stmt"/>
3214
+ <line num="181" count="237" type="stmt"/>
3215
3215
  <line num="187" count="57" type="stmt"/>
3216
3216
  <line num="188" count="3" type="stmt"/>
3217
3217
  <line num="189" count="3" type="cond" truecount="4" falsecount="0"/>
3218
3218
  <line num="190" count="1" type="stmt"/>
3219
3219
  <line num="192" count="2" type="stmt"/>
3220
3220
  <line num="198" count="57" type="cond" truecount="0" falsecount="2"/>
3221
- <line num="199" count="268" type="stmt"/>
3221
+ <line num="199" count="267" type="stmt"/>
3222
3222
  <line num="206" count="57" type="stmt"/>
3223
3223
  <line num="207" count="27" type="stmt"/>
3224
3224
  <line num="221" count="57" type="stmt"/>
@@ -3280,21 +3280,21 @@
3280
3280
  <line num="41" count="9" type="stmt"/>
3281
3281
  <line num="42" count="9" type="stmt"/>
3282
3282
  <line num="47" count="9" type="stmt"/>
3283
- <line num="56" count="227" type="stmt"/>
3284
- <line num="57" count="227" type="stmt"/>
3285
- <line num="58" count="227" type="stmt"/>
3286
- <line num="59" count="227" type="stmt"/>
3287
- <line num="60" count="227" type="stmt"/>
3283
+ <line num="56" count="226" type="stmt"/>
3284
+ <line num="57" count="226" type="stmt"/>
3285
+ <line num="58" count="226" type="stmt"/>
3286
+ <line num="59" count="226" type="stmt"/>
3287
+ <line num="60" count="226" type="stmt"/>
3288
3288
  <line num="69" count="53" type="cond" truecount="2" falsecount="0"/>
3289
3289
  <line num="70" count="6" type="stmt"/>
3290
3290
  <line num="73" count="53" type="stmt"/>
3291
- <line num="84" count="222" type="cond" truecount="2" falsecount="0"/>
3291
+ <line num="84" count="221" type="cond" truecount="2" falsecount="0"/>
3292
3292
  <line num="85" count="6" type="stmt"/>
3293
- <line num="87" count="222" type="stmt"/>
3294
- <line num="88" count="534" type="stmt"/>
3295
- <line num="89" count="534" type="cond" truecount="2" falsecount="0"/>
3293
+ <line num="87" count="221" type="stmt"/>
3294
+ <line num="88" count="532" type="stmt"/>
3295
+ <line num="89" count="532" type="cond" truecount="2" falsecount="0"/>
3296
3296
  <line num="90" count="41" type="stmt"/>
3297
- <line num="93" count="181" type="stmt"/>
3297
+ <line num="93" count="180" type="stmt"/>
3298
3298
  <line num="100" count="27" type="stmt"/>
3299
3299
  <line num="111" count="9" type="stmt"/>
3300
3300
  <line num="121" count="22" type="stmt"/>
@@ -3464,14 +3464,14 @@
3464
3464
  <line num="91" count="30" type="stmt"/>
3465
3465
  <line num="92" count="30" type="stmt"/>
3466
3466
  <line num="106" count="44" type="stmt"/>
3467
- <line num="107" count="217" type="stmt"/>
3468
- <line num="108" count="217" type="cond" truecount="2" falsecount="0"/>
3469
- <line num="110" count="217" type="cond" truecount="4" falsecount="0"/>
3467
+ <line num="107" count="216" type="stmt"/>
3468
+ <line num="108" count="216" type="cond" truecount="2" falsecount="0"/>
3469
+ <line num="110" count="216" type="cond" truecount="4" falsecount="0"/>
3470
3470
  <line num="111" count="131" type="stmt"/>
3471
- <line num="113" count="217" type="stmt"/>
3472
- <line num="114" count="217" type="stmt"/>
3473
- <line num="115" count="217" type="cond" truecount="2" falsecount="0"/>
3474
- <line num="120" count="176" type="stmt"/>
3471
+ <line num="113" count="216" type="stmt"/>
3472
+ <line num="114" count="216" type="stmt"/>
3473
+ <line num="115" count="216" type="cond" truecount="2" falsecount="0"/>
3474
+ <line num="120" count="175" type="stmt"/>
3475
3475
  <line num="123" count="0" type="stmt"/>
3476
3476
  <line num="125" count="41" type="cond" truecount="5" falsecount="2"/>
3477
3477
  <line num="128" count="21" type="stmt"/>
@@ -3481,9 +3481,9 @@
3481
3481
  <line num="136" count="1" type="stmt"/>
3482
3482
  <line num="138" count="0" type="stmt"/>
3483
3483
  <line num="149" count="44" type="stmt"/>
3484
- <line num="150" count="119" type="stmt"/>
3485
- <line num="151" count="119" type="cond" truecount="2" falsecount="0"/>
3486
- <line num="152" count="89" type="stmt"/>
3484
+ <line num="150" count="118" type="stmt"/>
3485
+ <line num="151" count="118" type="cond" truecount="2" falsecount="0"/>
3486
+ <line num="152" count="88" type="stmt"/>
3487
3487
  <line num="155" count="30" type="stmt"/>
3488
3488
  <line num="156" count="25" type="stmt"/>
3489
3489
  <line num="159" count="30" type="stmt"/>
@@ -3554,8 +3554,8 @@
3554
3554
  <line num="80" count="30" type="stmt"/>
3555
3555
  <line num="81" count="33" type="stmt"/>
3556
3556
  <line num="85" count="44" type="stmt"/>
3557
- <line num="86" count="119" type="stmt"/>
3558
- <line num="87" count="334" type="stmt"/>
3557
+ <line num="86" count="118" type="stmt"/>
3558
+ <line num="87" count="332" type="stmt"/>
3559
3559
  <line num="88" count="53" type="stmt"/>
3560
3560
  <line num="91" count="44" type="stmt"/>
3561
3561
  <line num="92" count="70" type="stmt"/>
@@ -3597,7 +3597,7 @@
3597
3597
  <metrics statements="7" coveredstatements="7" conditionals="2" coveredconditionals="1" methods="3" coveredmethods="3"/>
3598
3598
  <line num="1" count="44" type="stmt"/>
3599
3599
  <line num="2" count="44" type="stmt"/>
3600
- <line num="16" count="14" type="stmt"/>
3600
+ <line num="16" count="13" type="stmt"/>
3601
3601
  <line num="20" count="12" type="stmt"/>
3602
3602
  <line num="24" count="27" type="stmt"/>
3603
3603
  <line num="28" count="44" type="stmt"/>
@@ -3606,15 +3606,15 @@
3606
3606
  <file name="utils.js" path="/home/runner/work/budibase/budibase/packages/server/src/events/utils.js">
3607
3607
  <metrics statements="19" coveredstatements="18" conditionals="10" coveredconditionals="7" methods="2" coveredmethods="2"/>
3608
3608
  <line num="1" count="44" type="stmt"/>
3609
- <line num="2" count="18" type="stmt"/>
3610
- <line num="7" count="18" type="cond" truecount="2" falsecount="0"/>
3611
- <line num="8" count="12" type="stmt"/>
3612
- <line num="10" count="18" type="stmt"/>
3613
- <line num="11" count="18" type="cond" truecount="1" falsecount="1"/>
3614
- <line num="12" count="18" type="stmt"/>
3615
- <line num="14" count="18" type="cond" truecount="2" falsecount="0"/>
3609
+ <line num="2" count="17" type="stmt"/>
3610
+ <line num="7" count="17" type="cond" truecount="2" falsecount="0"/>
3611
+ <line num="8" count="11" type="stmt"/>
3612
+ <line num="10" count="17" type="stmt"/>
3613
+ <line num="11" count="17" type="cond" truecount="1" falsecount="1"/>
3614
+ <line num="12" count="17" type="stmt"/>
3615
+ <line num="14" count="17" type="cond" truecount="2" falsecount="0"/>
3616
3616
  <line num="15" count="4" type="stmt"/>
3617
- <line num="17" count="18" type="stmt"/>
3617
+ <line num="17" count="17" type="stmt"/>
3618
3618
  <line num="20" count="44" type="stmt"/>
3619
3619
  <line num="21" count="12" type="stmt"/>
3620
3620
  <line num="22" count="12" type="stmt"/>
@@ -3676,19 +3676,19 @@
3676
3676
  <line num="59" count="1" type="stmt"/>
3677
3677
  <line num="61" count="1" type="stmt"/>
3678
3678
  <line num="65" count="28" type="stmt"/>
3679
- <line num="66" count="222" type="stmt"/>
3680
- <line num="68" count="222" type="cond" truecount="2" falsecount="0"/>
3679
+ <line num="66" count="221" type="stmt"/>
3680
+ <line num="68" count="221" type="cond" truecount="2" falsecount="0"/>
3681
3681
  <line num="69" count="5" type="stmt"/>
3682
- <line num="71" count="217" type="stmt"/>
3683
- <line num="72" count="217" type="stmt"/>
3684
- <line num="74" count="217" type="stmt"/>
3685
- <line num="75" count="217" type="cond" truecount="2" falsecount="0"/>
3686
- <line num="76" count="217" type="cond" truecount="1" falsecount="1"/>
3682
+ <line num="71" count="216" type="stmt"/>
3683
+ <line num="72" count="216" type="stmt"/>
3684
+ <line num="74" count="216" type="stmt"/>
3685
+ <line num="75" count="216" type="cond" truecount="2" falsecount="0"/>
3686
+ <line num="76" count="216" type="cond" truecount="1" falsecount="1"/>
3687
3687
  <line num="77" count="0" type="stmt"/>
3688
- <line num="80" count="217" type="cond" truecount="2" falsecount="0"/>
3689
- <line num="81" count="217" type="cond" truecount="2" falsecount="0"/>
3690
- <line num="83" count="217" type="cond" truecount="4" falsecount="0"/>
3691
- <line num="84" count="216" type="stmt"/>
3688
+ <line num="80" count="216" type="cond" truecount="2" falsecount="0"/>
3689
+ <line num="81" count="216" type="cond" truecount="2" falsecount="0"/>
3690
+ <line num="83" count="216" type="cond" truecount="4" falsecount="0"/>
3691
+ <line num="84" count="215" type="stmt"/>
3692
3692
  <line num="87" count="1" type="stmt"/>
3693
3693
  <line num="89" count="1" type="stmt"/>
3694
3694
  </file>
@@ -3706,59 +3706,59 @@
3706
3706
  <line num="15" count="32" type="stmt"/>
3707
3707
  <line num="16" count="32" type="stmt"/>
3708
3708
  <line num="18" count="32" type="stmt"/>
3709
- <line num="20" count="238" type="stmt"/>
3710
- <line num="22" count="238" type="stmt"/>
3711
- <line num="23" count="238" type="stmt"/>
3712
- <line num="24" count="238" type="stmt"/>
3709
+ <line num="20" count="237" type="stmt"/>
3710
+ <line num="22" count="237" type="stmt"/>
3711
+ <line num="23" count="237" type="stmt"/>
3712
+ <line num="24" count="237" type="stmt"/>
3713
3713
  <line num="26" count="0" type="stmt"/>
3714
- <line num="28" count="238" type="cond" truecount="4" falsecount="0"/>
3714
+ <line num="28" count="237" type="cond" truecount="4" falsecount="0"/>
3715
3715
  <line num="29" count="1" type="stmt"/>
3716
- <line num="32" count="237" type="cond" truecount="2" falsecount="0"/>
3717
- <line num="33" count="231" type="stmt"/>
3718
- <line num="34" count="231" type="stmt"/>
3719
- <line num="35" count="231" type="cond" truecount="1" falsecount="1"/>
3716
+ <line num="32" count="236" type="cond" truecount="2" falsecount="0"/>
3717
+ <line num="33" count="230" type="stmt"/>
3718
+ <line num="34" count="230" type="stmt"/>
3719
+ <line num="35" count="230" type="cond" truecount="1" falsecount="1"/>
3720
3720
  <line num="36" count="0" type="stmt"/>
3721
3721
  <line num="37" count="0" type="stmt"/>
3722
- <line num="40" count="231" type="cond" truecount="1" falsecount="1"/>
3723
- <line num="44" count="237" type="cond" truecount="2" falsecount="0"/>
3722
+ <line num="40" count="230" type="cond" truecount="1" falsecount="1"/>
3723
+ <line num="44" count="236" type="cond" truecount="2" falsecount="0"/>
3724
3724
  <line num="45" count="2" type="cond" truecount="1" falsecount="1"/>
3725
3725
  <line num="50" count="2" type="stmt"/>
3726
3726
  <line num="51" count="2" type="stmt"/>
3727
- <line num="56" count="235" type="stmt"/>
3728
- <line num="57" count="235" type="cond" truecount="2" falsecount="0"/>
3727
+ <line num="56" count="234" type="stmt"/>
3728
+ <line num="57" count="234" type="cond" truecount="2" falsecount="0"/>
3729
3729
  <line num="59" count="5" type="stmt"/>
3730
- <line num="60" count="230" type="cond" truecount="1" falsecount="1"/>
3731
- <line num="62" count="230" type="stmt"/>
3732
- <line num="63" count="230" type="stmt"/>
3733
- <line num="65" count="230" type="cond" truecount="2" falsecount="0"/>
3734
- <line num="69" count="230" type="cond" truecount="3" falsecount="0"/>
3735
- <line num="70" count="230" type="cond" truecount="2" falsecount="0"/>
3736
- <line num="71" count="230" type="cond" truecount="2" falsecount="0"/>
3737
- <line num="72" count="230" type="cond" truecount="4" falsecount="1"/>
3730
+ <line num="60" count="229" type="cond" truecount="1" falsecount="1"/>
3731
+ <line num="62" count="229" type="stmt"/>
3732
+ <line num="63" count="229" type="stmt"/>
3733
+ <line num="65" count="229" type="cond" truecount="2" falsecount="0"/>
3734
+ <line num="69" count="229" type="cond" truecount="3" falsecount="0"/>
3735
+ <line num="70" count="229" type="cond" truecount="2" falsecount="0"/>
3736
+ <line num="71" count="229" type="cond" truecount="2" falsecount="0"/>
3737
+ <line num="72" count="229" type="cond" truecount="4" falsecount="1"/>
3738
3738
  <line num="74" count="0" type="stmt"/>
3739
3739
  <line num="75" count="0" type="stmt"/>
3740
3740
  <line num="76" count="0" type="stmt"/>
3741
3741
  <line num="79" count="0" type="stmt"/>
3742
3742
  <line num="80" count="0" type="stmt"/>
3743
- <line num="88" count="235" type="cond" truecount="1" falsecount="1"/>
3743
+ <line num="88" count="234" type="cond" truecount="1" falsecount="1"/>
3744
3744
  <line num="89" count="0" type="stmt"/>
3745
- <line num="92" count="235" type="stmt"/>
3746
- <line num="93" count="235" type="stmt"/>
3747
- <line num="96" count="235" type="cond" truecount="1" falsecount="1"/>
3745
+ <line num="92" count="234" type="stmt"/>
3746
+ <line num="93" count="234" type="stmt"/>
3747
+ <line num="96" count="234" type="cond" truecount="1" falsecount="1"/>
3748
3748
  <line num="103" count="0" type="stmt"/>
3749
3749
  <line num="104" count="0" type="stmt"/>
3750
3750
  <line num="105" count="0" type="stmt"/>
3751
3751
  <line num="106" count="0" type="stmt"/>
3752
3752
  <line num="107" count="0" type="stmt"/>
3753
3753
  <line num="108" count="0" type="stmt"/>
3754
- <line num="111" count="235" type="stmt"/>
3755
- <line num="112" count="235" type="cond" truecount="1" falsecount="1"/>
3756
- <line num="113" count="235" type="stmt"/>
3757
- <line num="114" count="235" type="cond" truecount="2" falsecount="0"/>
3758
- <line num="115" count="235" type="stmt"/>
3759
- <line num="124" count="235" type="cond" truecount="2" falsecount="0"/>
3754
+ <line num="111" count="234" type="stmt"/>
3755
+ <line num="112" count="234" type="cond" truecount="1" falsecount="1"/>
3756
+ <line num="113" count="234" type="stmt"/>
3757
+ <line num="114" count="234" type="cond" truecount="2" falsecount="0"/>
3758
+ <line num="115" count="234" type="stmt"/>
3759
+ <line num="124" count="234" type="cond" truecount="2" falsecount="0"/>
3760
3760
  <line num="130" count="9" type="stmt"/>
3761
- <line num="133" count="235" type="stmt"/>
3761
+ <line num="133" count="234" type="stmt"/>
3762
3762
  </file>
3763
3763
  <file name="joi-validator.js" path="/home/runner/work/budibase/budibase/packages/server/src/middleware/joi-validator.js">
3764
3764
  <metrics statements="19" coveredstatements="16" conditionals="8" coveredconditionals="5" methods="4" coveredmethods="4"/>
@@ -3809,14 +3809,14 @@
3809
3809
  <line num="21" count="897" type="stmt"/>
3810
3810
  <line num="22" count="897" type="stmt"/>
3811
3811
  <line num="23" count="897" type="stmt"/>
3812
- <line num="24" count="102" type="cond" truecount="2" falsecount="0"/>
3813
- <line num="25" count="102" type="cond" truecount="2" falsecount="0"/>
3812
+ <line num="24" count="101" type="cond" truecount="2" falsecount="0"/>
3813
+ <line num="25" count="101" type="cond" truecount="2" falsecount="0"/>
3814
3814
  <line num="26" count="1" type="stmt"/>
3815
- <line num="28" count="101" type="cond" truecount="4" falsecount="0"/>
3816
- <line num="29" count="89" type="stmt"/>
3817
- <line num="31" count="101" type="cond" truecount="4" falsecount="0"/>
3815
+ <line num="28" count="100" type="cond" truecount="4" falsecount="0"/>
3816
+ <line num="29" count="88" type="stmt"/>
3817
+ <line num="31" count="100" type="cond" truecount="4" falsecount="0"/>
3818
3818
  <line num="32" count="15" type="stmt"/>
3819
- <line num="34" count="101" type="stmt"/>
3819
+ <line num="34" count="100" type="stmt"/>
3820
3820
  <line num="39" count="28" type="stmt"/>
3821
3821
  <line num="41" count="28" type="stmt"/>
3822
3822
  <line num="42" count="704" type="stmt"/>
@@ -3840,7 +3840,7 @@
3840
3840
  <metrics statements="3" coveredstatements="3" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1"/>
3841
3841
  <line num="1" count="33" type="stmt"/>
3842
3842
  <line num="5" count="33" type="stmt"/>
3843
- <line num="6" count="226" type="stmt"/>
3843
+ <line num="6" count="225" type="stmt"/>
3844
3844
  </file>
3845
3845
  </package>
3846
3846
  <package name="threads">
@@ -4287,27 +4287,27 @@
4287
4287
  <line num="13" count="49" type="stmt"/>
4288
4288
  <line num="14" count="49" type="stmt"/>
4289
4289
  <line num="16" count="49" type="cond" truecount="1" falsecount="0"/>
4290
- <line num="17" count="239" type="cond" truecount="2" falsecount="0"/>
4291
- <line num="18" count="239" type="cond" truecount="4" falsecount="0"/>
4290
+ <line num="17" count="238" type="cond" truecount="2" falsecount="0"/>
4291
+ <line num="18" count="238" type="cond" truecount="4" falsecount="0"/>
4292
4292
  <line num="19" count="3" type="stmt"/>
4293
- <line num="22" count="236" type="cond" truecount="2" falsecount="2"/>
4293
+ <line num="22" count="235" type="cond" truecount="2" falsecount="2"/>
4294
4294
  <line num="23" count="0" type="stmt"/>
4295
4295
  <line num="24" count="0" type="stmt"/>
4296
4296
  <line num="25" count="0" type="stmt"/>
4297
4297
  <line num="26" count="0" type="stmt"/>
4298
- <line num="29" count="236" type="stmt"/>
4299
- <line num="31" count="236" type="cond" truecount="5" falsecount="0"/>
4300
- <line num="32" count="204" type="stmt"/>
4298
+ <line num="29" count="235" type="stmt"/>
4299
+ <line num="31" count="235" type="cond" truecount="5" falsecount="0"/>
4300
+ <line num="32" count="203" type="stmt"/>
4301
4301
  <line num="33" count="32" type="cond" truecount="2" falsecount="0"/>
4302
4302
  <line num="34" count="27" type="stmt"/>
4303
- <line num="36" count="236" type="stmt"/>
4304
- <line num="37" count="236" type="stmt"/>
4305
- <line num="41" count="232" type="cond" truecount="1" falsecount="1"/>
4306
- <line num="42" count="232" type="stmt"/>
4307
- <line num="44" count="232" type="stmt"/>
4303
+ <line num="36" count="235" type="stmt"/>
4304
+ <line num="37" count="235" type="stmt"/>
4305
+ <line num="41" count="231" type="cond" truecount="1" falsecount="1"/>
4306
+ <line num="42" count="231" type="stmt"/>
4307
+ <line num="44" count="231" type="stmt"/>
4308
4308
  <line num="47" count="49" type="stmt"/>
4309
- <line num="50" count="230" type="stmt"/>
4310
- <line num="51" count="230" type="stmt"/>
4309
+ <line num="50" count="229" type="stmt"/>
4310
+ <line num="51" count="229" type="stmt"/>
4311
4311
  <line num="54" count="49" type="stmt"/>
4312
4312
  <line num="55" count="2" type="stmt"/>
4313
4313
  <line num="56" count="2" type="stmt"/>
@@ -4642,14 +4642,14 @@
4642
4642
  <line num="118" count="0" type="stmt"/>
4643
4643
  <line num="120" count="0" type="stmt"/>
4644
4644
  <line num="121" count="0" type="stmt"/>
4645
- <line num="140" count="84" type="cond" truecount="2" falsecount="0"/>
4646
- <line num="141" count="84" type="stmt"/>
4647
- <line num="142" count="84" type="stmt"/>
4648
- <line num="144" count="84" type="stmt"/>
4649
- <line num="147" count="84" type="cond" truecount="4" falsecount="0"/>
4650
- <line num="148" count="84" type="stmt"/>
4651
- <line num="149" count="228" type="cond" truecount="1" falsecount="1"/>
4652
- <line num="150" count="228" type="stmt"/>
4645
+ <line num="140" count="83" type="cond" truecount="2" falsecount="0"/>
4646
+ <line num="141" count="83" type="stmt"/>
4647
+ <line num="142" count="83" type="stmt"/>
4648
+ <line num="144" count="83" type="stmt"/>
4649
+ <line num="147" count="83" type="cond" truecount="4" falsecount="0"/>
4650
+ <line num="148" count="83" type="stmt"/>
4651
+ <line num="149" count="226" type="cond" truecount="1" falsecount="1"/>
4652
+ <line num="150" count="226" type="stmt"/>
4653
4653
  <line num="152" count="0" type="cond" truecount="0" falsecount="2"/>
4654
4654
  <line num="153" count="0" type="stmt"/>
4655
4655
  <line num="155" count="0" type="cond" truecount="0" falsecount="5"/>
@@ -4668,52 +4668,52 @@
4668
4668
  <line num="176" count="0" type="cond" truecount="0" falsecount="2"/>
4669
4669
  <line num="177" count="0" type="stmt"/>
4670
4670
  <line num="179" count="0" type="stmt"/>
4671
- <line num="182" count="84" type="stmt"/>
4671
+ <line num="182" count="83" type="stmt"/>
4672
4672
  <line num="184" count="44" type="stmt"/>
4673
4673
  <line num="185" count="44" type="stmt"/>
4674
4674
  <line num="186" count="44" type="stmt"/>
4675
4675
  <line num="194" count="44" type="stmt"/>
4676
- <line num="196" count="196" type="cond" truecount="1" falsecount="1"/>
4676
+ <line num="196" count="194" type="cond" truecount="1" falsecount="1"/>
4677
4677
  <line num="197" count="0" type="stmt"/>
4678
- <line num="200" count="196" type="cond" truecount="2" falsecount="0"/>
4678
+ <line num="200" count="194" type="cond" truecount="2" falsecount="0"/>
4679
4679
  <line num="201" count="16" type="stmt"/>
4680
- <line num="202" count="180" type="cond" truecount="2" falsecount="0"/>
4680
+ <line num="202" count="178" type="cond" truecount="2" falsecount="0"/>
4681
4681
  <line num="203" count="22" type="stmt"/>
4682
- <line num="206" count="158" type="stmt"/>
4682
+ <line num="206" count="156" type="stmt"/>
4683
4683
  <line num="218" count="44" type="stmt"/>
4684
- <line num="224" count="84" type="stmt"/>
4685
- <line num="226" count="84" type="stmt"/>
4686
- <line num="227" count="84" type="stmt"/>
4687
- <line num="228" count="84" type="stmt"/>
4688
- <line num="229" count="389" type="stmt"/>
4689
- <line num="231" count="389" type="cond" truecount="2" falsecount="0"/>
4690
- <line num="232" count="194" type="cond" truecount="2" falsecount="0"/>
4684
+ <line num="224" count="83" type="stmt"/>
4685
+ <line num="226" count="83" type="stmt"/>
4686
+ <line num="227" count="83" type="stmt"/>
4687
+ <line num="228" count="83" type="stmt"/>
4688
+ <line num="229" count="385" type="stmt"/>
4689
+ <line num="231" count="385" type="cond" truecount="2" falsecount="0"/>
4690
+ <line num="232" count="192" type="cond" truecount="2" falsecount="0"/>
4691
4691
  <line num="233" count="13" type="stmt"/>
4692
- <line num="235" count="194" type="stmt"/>
4693
- <line num="238" count="195" type="cond" truecount="1" falsecount="1"/>
4692
+ <line num="235" count="192" type="stmt"/>
4693
+ <line num="238" count="193" type="cond" truecount="1" falsecount="1"/>
4694
4694
  <line num="239" count="0" type="stmt"/>
4695
- <line num="243" count="195" type="stmt"/>
4696
- <line num="247" count="84" type="cond" truecount="4" falsecount="0"/>
4697
- <line num="248" count="78" type="stmt"/>
4698
- <line num="249" count="78" type="stmt"/>
4699
- <line num="253" count="84" type="stmt"/>
4695
+ <line num="243" count="193" type="stmt"/>
4696
+ <line num="247" count="83" type="cond" truecount="4" falsecount="0"/>
4697
+ <line num="248" count="77" type="stmt"/>
4698
+ <line num="249" count="77" type="stmt"/>
4699
+ <line num="253" count="83" type="stmt"/>
4700
4700
  <line num="265" count="44" type="cond" truecount="1" falsecount="0"/>
4701
- <line num="266" count="119" type="stmt"/>
4702
- <line num="267" count="119" type="cond" truecount="2" falsecount="0"/>
4703
- <line num="268" count="103" type="stmt"/>
4704
- <line num="269" count="103" type="stmt"/>
4705
- <line num="272" count="119" type="stmt"/>
4706
- <line num="275" count="119" type="stmt"/>
4707
- <line num="278" count="119" type="stmt"/>
4708
- <line num="279" count="334" type="cond" truecount="2" falsecount="0"/>
4701
+ <line num="266" count="118" type="stmt"/>
4702
+ <line num="267" count="118" type="cond" truecount="2" falsecount="0"/>
4703
+ <line num="268" count="102" type="stmt"/>
4704
+ <line num="269" count="102" type="stmt"/>
4705
+ <line num="272" count="118" type="stmt"/>
4706
+ <line num="275" count="118" type="stmt"/>
4707
+ <line num="278" count="118" type="stmt"/>
4708
+ <line num="279" count="332" type="cond" truecount="2" falsecount="0"/>
4709
4709
  <line num="280" count="8" type="stmt"/>
4710
4710
  <line num="281" count="8" type="cond" truecount="4" falsecount="0"/>
4711
4711
  <line num="282" count="6" type="stmt"/>
4712
4712
  <line num="284" count="2" type="stmt"/>
4713
4713
  <line num="285" count="2" type="stmt"/>
4714
- <line num="290" count="119" type="cond" truecount="2" falsecount="0"/>
4714
+ <line num="290" count="118" type="cond" truecount="2" falsecount="0"/>
4715
4715
  <line num="291" count="35" type="stmt"/>
4716
- <line num="293" count="119" type="cond" truecount="2" falsecount="0"/>
4716
+ <line num="293" count="118" type="cond" truecount="2" falsecount="0"/>
4717
4717
  <line num="306" count="44" type="stmt"/>
4718
4718
  <line num="307" count="14" type="stmt"/>
4719
4719
  <line num="308" count="14" type="cond" truecount="1" falsecount="1"/>
@@ -4758,20 +4758,20 @@
4758
4758
  <line num="27" count="0" type="stmt"/>
4759
4759
  <line num="29" count="2" type="stmt"/>
4760
4760
  <line num="35" count="44" type="stmt"/>
4761
- <line num="40" count="295" type="stmt"/>
4762
- <line num="41" count="295" type="cond" truecount="2" falsecount="0"/>
4763
- <line num="42" count="176" type="stmt"/>
4764
- <line num="43" count="176" type="cond" truecount="2" falsecount="0"/>
4765
- <line num="45" count="295" type="stmt"/>
4766
- <line num="46" count="832" type="stmt"/>
4767
- <line num="47" count="832" type="cond" truecount="1" falsecount="1"/>
4768
- <line num="52" count="832" type="stmt"/>
4761
+ <line num="40" count="292" type="stmt"/>
4762
+ <line num="41" count="292" type="cond" truecount="2" falsecount="0"/>
4763
+ <line num="42" count="174" type="stmt"/>
4764
+ <line num="43" count="174" type="cond" truecount="2" falsecount="0"/>
4765
+ <line num="45" count="292" type="stmt"/>
4766
+ <line num="46" count="826" type="stmt"/>
4767
+ <line num="47" count="826" type="cond" truecount="1" falsecount="1"/>
4768
+ <line num="52" count="826" type="stmt"/>
4769
4769
  <line num="55" count="0" type="stmt"/>
4770
4770
  <line num="56" count="0" type="cond" truecount="0" falsecount="2"/>
4771
4771
  <line num="57" count="0" type="stmt"/>
4772
4772
  <line num="58" count="0" type="cond" truecount="0" falsecount="2"/>
4773
4773
  <line num="59" count="0" type="stmt"/>
4774
- <line num="66" count="295" type="cond" truecount="2" falsecount="0"/>
4774
+ <line num="66" count="292" type="cond" truecount="2" falsecount="0"/>
4775
4775
  <line num="73" count="44" type="stmt"/>
4776
4776
  <line num="74" count="0" type="stmt"/>
4777
4777
  <line num="75" count="0" type="stmt"/>