@budibase/server 1.0.27-alpha.20 → 1.0.27-alpha.24

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 (179) hide show
  1. package/builder/assets/{index.c5bf8ef6.js → index.fe568eda.js} +155 -155
  2. package/builder/index.html +1 -1
  3. package/coverage/clover.xml +173 -168
  4. package/coverage/coverage-final.json +2 -2
  5. package/coverage/lcov-report/api/controllers/analytics.js.html +1 -1
  6. package/coverage/lcov-report/api/controllers/apikeys.js.html +1 -1
  7. package/coverage/lcov-report/api/controllers/application.js.html +1 -1
  8. package/coverage/lcov-report/api/controllers/auth.js.html +1 -1
  9. package/coverage/lcov-report/api/controllers/automation.js.html +1 -1
  10. package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
  11. package/coverage/lcov-report/api/controllers/cloud.js.html +1 -1
  12. package/coverage/lcov-report/api/controllers/component.js.html +1 -1
  13. package/coverage/lcov-report/api/controllers/datasource.js.html +1 -1
  14. package/coverage/lcov-report/api/controllers/dev.js.html +1 -1
  15. package/coverage/lcov-report/api/controllers/hosting.js.html +1 -1
  16. package/coverage/lcov-report/api/controllers/index.html +1 -1
  17. package/coverage/lcov-report/api/controllers/integration.js.html +1 -1
  18. package/coverage/lcov-report/api/controllers/layout.js.html +1 -1
  19. package/coverage/lcov-report/api/controllers/metadata.js.html +1 -1
  20. package/coverage/lcov-report/api/controllers/permission.js.html +1 -1
  21. package/coverage/lcov-report/api/controllers/query/index.html +1 -1
  22. package/coverage/lcov-report/api/controllers/query/index.js.html +1 -1
  23. package/coverage/lcov-report/api/controllers/query/validation.js.html +1 -1
  24. package/coverage/lcov-report/api/controllers/role.js.html +1 -1
  25. package/coverage/lcov-report/api/controllers/routing.js.html +1 -1
  26. package/coverage/lcov-report/api/controllers/row/external.js.html +1 -1
  27. package/coverage/lcov-report/api/controllers/row/index.html +1 -1
  28. package/coverage/lcov-report/api/controllers/row/index.js.html +1 -1
  29. package/coverage/lcov-report/api/controllers/row/internal.js.html +1 -1
  30. package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +1 -1
  31. package/coverage/lcov-report/api/controllers/row/utils.js.html +1 -1
  32. package/coverage/lcov-report/api/controllers/screen.js.html +1 -1
  33. package/coverage/lcov-report/api/controllers/script.js.html +1 -1
  34. package/coverage/lcov-report/api/controllers/table/external.js.html +1 -1
  35. package/coverage/lcov-report/api/controllers/table/index.html +17 -17
  36. package/coverage/lcov-report/api/controllers/table/index.js.html +34 -16
  37. package/coverage/lcov-report/api/controllers/table/internal.js.html +1 -1
  38. package/coverage/lcov-report/api/controllers/table/utils.js.html +16 -7
  39. package/coverage/lcov-report/api/controllers/templates.js.html +1 -1
  40. package/coverage/lcov-report/api/controllers/user.js.html +1 -1
  41. package/coverage/lcov-report/api/controllers/view/exporters.js.html +1 -1
  42. package/coverage/lcov-report/api/controllers/view/index.html +1 -1
  43. package/coverage/lcov-report/api/controllers/view/index.js.html +1 -1
  44. package/coverage/lcov-report/api/controllers/view/utils.js.html +1 -1
  45. package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +1 -1
  46. package/coverage/lcov-report/api/controllers/webhook.js.html +1 -1
  47. package/coverage/lcov-report/api/index.html +1 -1
  48. package/coverage/lcov-report/api/index.js.html +1 -1
  49. package/coverage/lcov-report/api/routes/analytics.js.html +1 -1
  50. package/coverage/lcov-report/api/routes/apikeys.js.html +1 -1
  51. package/coverage/lcov-report/api/routes/application.js.html +1 -1
  52. package/coverage/lcov-report/api/routes/auth.js.html +1 -1
  53. package/coverage/lcov-report/api/routes/automation.js.html +1 -1
  54. package/coverage/lcov-report/api/routes/backup.js.html +1 -1
  55. package/coverage/lcov-report/api/routes/cloud.js.html +1 -1
  56. package/coverage/lcov-report/api/routes/component.js.html +1 -1
  57. package/coverage/lcov-report/api/routes/datasource.js.html +1 -1
  58. package/coverage/lcov-report/api/routes/deploy.js.html +1 -1
  59. package/coverage/lcov-report/api/routes/dev.js.html +1 -1
  60. package/coverage/lcov-report/api/routes/hosting.js.html +1 -1
  61. package/coverage/lcov-report/api/routes/index.html +1 -1
  62. package/coverage/lcov-report/api/routes/index.js.html +1 -1
  63. package/coverage/lcov-report/api/routes/integration.js.html +1 -1
  64. package/coverage/lcov-report/api/routes/layout.js.html +1 -1
  65. package/coverage/lcov-report/api/routes/metadata.js.html +1 -1
  66. package/coverage/lcov-report/api/routes/permission.js.html +1 -1
  67. package/coverage/lcov-report/api/routes/query.js.html +1 -1
  68. package/coverage/lcov-report/api/routes/role.js.html +1 -1
  69. package/coverage/lcov-report/api/routes/routing.js.html +1 -1
  70. package/coverage/lcov-report/api/routes/row.js.html +1 -1
  71. package/coverage/lcov-report/api/routes/screen.js.html +1 -1
  72. package/coverage/lcov-report/api/routes/script.js.html +1 -1
  73. package/coverage/lcov-report/api/routes/static.js.html +1 -1
  74. package/coverage/lcov-report/api/routes/table.js.html +1 -1
  75. package/coverage/lcov-report/api/routes/templates.js.html +1 -1
  76. package/coverage/lcov-report/api/routes/user.js.html +1 -1
  77. package/coverage/lcov-report/api/routes/view.js.html +1 -1
  78. package/coverage/lcov-report/api/routes/webhook.js.html +1 -1
  79. package/coverage/lcov-report/automations/actions.js.html +1 -1
  80. package/coverage/lcov-report/automations/automationUtils.js.html +1 -1
  81. package/coverage/lcov-report/automations/bullboard.js.html +1 -1
  82. package/coverage/lcov-report/automations/index.html +1 -1
  83. package/coverage/lcov-report/automations/index.js.html +1 -1
  84. package/coverage/lcov-report/automations/steps/bash.js.html +1 -1
  85. package/coverage/lcov-report/automations/steps/createRow.js.html +1 -1
  86. package/coverage/lcov-report/automations/steps/delay.js.html +1 -1
  87. package/coverage/lcov-report/automations/steps/deleteRow.js.html +1 -1
  88. package/coverage/lcov-report/automations/steps/discord.js.html +1 -1
  89. package/coverage/lcov-report/automations/steps/executeQuery.js.html +1 -1
  90. package/coverage/lcov-report/automations/steps/executeScript.js.html +1 -1
  91. package/coverage/lcov-report/automations/steps/filter.js.html +1 -1
  92. package/coverage/lcov-report/automations/steps/index.html +1 -1
  93. package/coverage/lcov-report/automations/steps/integromat.js.html +1 -1
  94. package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +1 -1
  95. package/coverage/lcov-report/automations/steps/queryRows.js.html +1 -1
  96. package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +1 -1
  97. package/coverage/lcov-report/automations/steps/serverLog.js.html +1 -1
  98. package/coverage/lcov-report/automations/steps/slack.js.html +1 -1
  99. package/coverage/lcov-report/automations/steps/updateRow.js.html +1 -1
  100. package/coverage/lcov-report/automations/steps/utils.js.html +1 -1
  101. package/coverage/lcov-report/automations/steps/zapier.js.html +1 -1
  102. package/coverage/lcov-report/automations/triggerInfo/app.js.html +1 -1
  103. package/coverage/lcov-report/automations/triggerInfo/cron.js.html +1 -1
  104. package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
  105. package/coverage/lcov-report/automations/triggerInfo/index.js.html +1 -1
  106. package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +1 -1
  107. package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +1 -1
  108. package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +1 -1
  109. package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +1 -1
  110. package/coverage/lcov-report/automations/triggers.js.html +1 -1
  111. package/coverage/lcov-report/automations/utils.js.html +1 -1
  112. package/coverage/lcov-report/constants/index.html +1 -1
  113. package/coverage/lcov-report/constants/index.js.html +1 -1
  114. package/coverage/lcov-report/constants/layouts.js.html +1 -1
  115. package/coverage/lcov-report/constants/screens.js.html +1 -1
  116. package/coverage/lcov-report/db/client.js.html +1 -1
  117. package/coverage/lcov-report/db/inMemoryView.js.html +1 -1
  118. package/coverage/lcov-report/db/index.html +1 -1
  119. package/coverage/lcov-report/db/index.js.html +1 -1
  120. package/coverage/lcov-report/db/linkedRows/LinkController.js.html +1 -1
  121. package/coverage/lcov-report/db/linkedRows/index.html +1 -1
  122. package/coverage/lcov-report/db/linkedRows/index.js.html +1 -1
  123. package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +1 -1
  124. package/coverage/lcov-report/db/newid.js.html +1 -1
  125. package/coverage/lcov-report/db/utils.js.html +1 -1
  126. package/coverage/lcov-report/events/AutomationEmitter.js.html +1 -1
  127. package/coverage/lcov-report/events/index.html +1 -1
  128. package/coverage/lcov-report/events/index.js.html +1 -1
  129. package/coverage/lcov-report/events/utils.js.html +1 -1
  130. package/coverage/lcov-report/index.html +11 -11
  131. package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
  132. package/coverage/lcov-report/integrations/tests/index.html +1 -1
  133. package/coverage/lcov-report/middleware/appInfo.js.html +1 -1
  134. package/coverage/lcov-report/middleware/authorized.js.html +1 -1
  135. package/coverage/lcov-report/middleware/builder.js.html +1 -1
  136. package/coverage/lcov-report/middleware/currentapp.js.html +1 -1
  137. package/coverage/lcov-report/middleware/index.html +1 -1
  138. package/coverage/lcov-report/middleware/joi-validator.js.html +1 -1
  139. package/coverage/lcov-report/middleware/resourceId.js.html +1 -1
  140. package/coverage/lcov-report/middleware/selfhost.js.html +1 -1
  141. package/coverage/lcov-report/middleware/usageQuota.js.html +1 -1
  142. package/coverage/lcov-report/middleware/utils.js.html +1 -1
  143. package/coverage/lcov-report/threads/automation.js.html +1 -1
  144. package/coverage/lcov-report/threads/index.html +1 -1
  145. package/coverage/lcov-report/threads/index.js.html +1 -1
  146. package/coverage/lcov-report/threads/query.js.html +1 -1
  147. package/coverage/lcov-report/threads/utils.js.html +1 -1
  148. package/coverage/lcov-report/utilities/bcrypt.js.html +1 -1
  149. package/coverage/lcov-report/utilities/budibaseDir.js.html +1 -1
  150. package/coverage/lcov-report/utilities/centralPath.js.html +1 -1
  151. package/coverage/lcov-report/utilities/csvParser.js.html +1 -1
  152. package/coverage/lcov-report/utilities/global.js.html +1 -1
  153. package/coverage/lcov-report/utilities/index.html +1 -1
  154. package/coverage/lcov-report/utilities/index.js.html +1 -1
  155. package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +1 -1
  156. package/coverage/lcov-report/utilities/queue/index.html +1 -1
  157. package/coverage/lcov-report/utilities/routing/index.html +1 -1
  158. package/coverage/lcov-report/utilities/routing/index.js.html +1 -1
  159. package/coverage/lcov-report/utilities/rowProcessor/index.html +1 -1
  160. package/coverage/lcov-report/utilities/rowProcessor/index.js.html +1 -1
  161. package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +1 -1
  162. package/coverage/lcov-report/utilities/scriptRunner.js.html +1 -1
  163. package/coverage/lcov-report/utilities/security.js.html +1 -1
  164. package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
  165. package/coverage/lcov-report/utilities/users.js.html +1 -1
  166. package/coverage/lcov-report/utilities/workerRequests.js.html +1 -1
  167. package/coverage/lcov.info +282 -277
  168. package/dist/api/controllers/table/index.js +10 -4
  169. package/dist/api/controllers/table/utils.js +4 -2
  170. package/dist/integrations/base/sql.js +13 -6
  171. package/dist/integrations/utils.js +6 -1
  172. package/dist/package.json +4 -4
  173. package/dist/tsconfig.tsbuildinfo +1 -1
  174. package/package.json +5 -5
  175. package/src/api/controllers/table/index.js +15 -9
  176. package/src/api/controllers/table/utils.js +4 -1
  177. package/src/integrations/base/sql.ts +14 -7
  178. package/src/integrations/tests/sql.spec.js +16 -0
  179. package/src/integrations/utils.ts +7 -3
package/builder/index.html CHANGED
@@ -10,7 +10,7 @@
10
10
  href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
11
11
  rel="stylesheet"
12
12
  />
13
- <script type="module" crossorigin src="/builder/assets/index.c5bf8ef6.js"></script>
13
+ <script type="module" crossorigin src="/builder/assets/index.fe568eda.js"></script>
14
14
  <link rel="modulepreload" href="/builder/assets/vendor.10e2ad1b.js">
15
15
  <link rel="stylesheet" href="/builder/assets/vendor.5e1fe644.css">
16
16
  <link rel="stylesheet" href="/builder/assets/index.39e01193.css">
package/coverage/clover.xml CHANGED
@@ -1,7 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <coverage generated="1642414507318" clover="3.2.0">
3
- <project timestamp="1642414507318" name="All files">
4
- <metrics statements="4634" coveredstatements="3428" conditionals="1856" coveredconditionals="1013" methods="661" coveredmethods="465" elements="7151" coveredelements="4906" complexity="0" loc="4634" ncloc="4634" packages="21" files="140" classes="140"/>
2
+ <coverage generated="1642511771913" clover="3.2.0">
3
+ <project timestamp="1642511771914" name="All files">
4
+ <metrics statements="4639" coveredstatements="3428" conditionals="1856" coveredconditionals="1013" methods="661" coveredmethods="465" elements="7156" coveredelements="4906" complexity="0" loc="4639" ncloc="4639" packages="21" files="140" classes="140"/>
5
5
  <package name="api">
6
6
  <metrics statements="29" coveredstatements="27" conditionals="5" coveredconditionals="2" methods="5" coveredmethods="4"/>
7
7
  <file name="index.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/index.js">
@@ -1903,7 +1903,7 @@
1903
1903
  </file>
1904
1904
  </package>
1905
1905
  <package name="api.controllers.table">
1906
- <metrics statements="422" coveredstatements="218" conditionals="221" coveredconditionals="81" methods="56" coveredmethods="27"/>
1906
+ <metrics statements="427" coveredstatements="218" conditionals="221" coveredconditionals="81" methods="56" coveredmethods="27"/>
1907
1907
  <file name="external.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/table/external.js">
1908
1908
  <metrics statements="137" coveredstatements="11" conditionals="76" coveredconditionals="0" methods="14" coveredmethods="0"/>
1909
1909
  <line num="1" count="34" type="stmt"/>
@@ -2045,7 +2045,7 @@
2045
2045
  <line num="306" count="0" type="stmt"/>
2046
2046
  </file>
2047
2047
  <file name="index.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/table/index.js">
2048
- <metrics statements="53" coveredstatements="44" conditionals="23" coveredconditionals="17" methods="10" coveredmethods="7"/>
2048
+ <metrics statements="56" coveredstatements="44" conditionals="23" coveredconditionals="17" methods="10" coveredmethods="7"/>
2049
2049
  <line num="1" count="34" type="stmt"/>
2050
2050
  <line num="2" count="34" type="stmt"/>
2051
2051
  <line num="3" count="34" type="stmt"/>
@@ -2066,39 +2066,42 @@
2066
2066
  <line num="35" count="2" type="stmt"/>
2067
2067
  <line num="41" count="1" type="stmt"/>
2068
2068
  <line num="47" count="1" type="stmt"/>
2069
- <line num="48" count="0" type="cond" truecount="0" falsecount="2"/>
2070
- <line num="55" count="1" type="stmt"/>
2071
- <line num="58" count="34" type="stmt"/>
2072
- <line num="59" count="19" type="stmt"/>
2073
- <line num="60" count="19" type="stmt"/>
2074
- <line num="63" count="34" type="stmt"/>
2075
- <line num="64" count="99" type="stmt"/>
2076
- <line num="65" count="99" type="stmt"/>
2077
- <line num="66" count="99" type="stmt"/>
2078
- <line num="67" count="99" type="stmt"/>
2079
- <line num="68" count="99" type="stmt"/>
2080
- <line num="69" count="99" type="cond" truecount="2" falsecount="0"/>
2069
+ <line num="48" count="0" type="stmt"/>
2070
+ <line num="49" count="0" type="cond" truecount="0" falsecount="2"/>
2071
+ <line num="50" count="0" type="stmt"/>
2072
+ <line num="57" count="0" type="stmt"/>
2073
+ <line num="61" count="1" type="stmt"/>
2074
+ <line num="64" count="34" type="stmt"/>
2075
+ <line num="65" count="19" type="stmt"/>
2076
+ <line num="66" count="19" type="stmt"/>
2077
+ <line num="69" count="34" type="stmt"/>
2078
+ <line num="70" count="99" type="stmt"/>
2081
2079
  <line num="71" count="99" type="stmt"/>
2082
- <line num="74" count="34" type="stmt"/>
2083
- <line num="75" count="2" type="stmt"/>
2084
- <line num="76" count="2" type="stmt"/>
2085
- <line num="77" count="2" type="stmt"/>
2086
- <line num="78" count="2" type="cond" truecount="2" falsecount="0"/>
2087
- <line num="80" count="2" type="stmt"/>
2080
+ <line num="72" count="99" type="stmt"/>
2081
+ <line num="73" count="99" type="stmt"/>
2082
+ <line num="74" count="99" type="stmt"/>
2083
+ <line num="75" count="99" type="cond" truecount="2" falsecount="0"/>
2084
+ <line num="77" count="99" type="stmt"/>
2085
+ <line num="80" count="34" type="stmt"/>
2088
2086
  <line num="81" count="2" type="stmt"/>
2089
- <line num="84" count="34" type="stmt"/>
2090
- <line num="85" count="0" type="stmt"/>
2091
- <line num="86" count="0" type="stmt"/>
2092
- <line num="90" count="0" type="stmt"/>
2087
+ <line num="82" count="2" type="stmt"/>
2088
+ <line num="83" count="2" type="stmt"/>
2089
+ <line num="84" count="2" type="cond" truecount="2" falsecount="0"/>
2090
+ <line num="86" count="2" type="stmt"/>
2091
+ <line num="87" count="2" type="stmt"/>
2092
+ <line num="90" count="34" type="stmt"/>
2093
2093
  <line num="91" count="0" type="stmt"/>
2094
- <line num="94" count="34" type="stmt"/>
2095
- <line num="96" count="1" type="cond" truecount="1" falsecount="0"/>
2096
- <line num="98" count="1" type="cond" truecount="1" falsecount="1"/>
2097
- <line num="99" count="0" type="stmt"/>
2098
- <line num="101" count="1" type="stmt"/>
2099
- <line num="102" count="1" type="cond" truecount="1" falsecount="1"/>
2100
- <line num="103" count="0" type="stmt"/>
2101
- <line num="105" count="1" type="stmt"/>
2094
+ <line num="92" count="0" type="stmt"/>
2095
+ <line num="96" count="0" type="stmt"/>
2096
+ <line num="97" count="0" type="stmt"/>
2097
+ <line num="100" count="34" type="stmt"/>
2098
+ <line num="102" count="1" type="cond" truecount="1" falsecount="0"/>
2099
+ <line num="104" count="1" type="cond" truecount="1" falsecount="1"/>
2100
+ <line num="105" count="0" type="stmt"/>
2101
+ <line num="107" count="1" type="stmt"/>
2102
+ <line num="108" count="1" type="cond" truecount="1" falsecount="1"/>
2103
+ <line num="109" count="0" type="stmt"/>
2104
+ <line num="111" count="1" type="stmt"/>
2102
2105
  </file>
2103
2106
  <file name="internal.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/table/internal.js">
2104
2107
  <metrics statements="60" coveredstatements="47" conditionals="32" coveredconditionals="23" methods="5" coveredmethods="3"/>
@@ -2164,7 +2167,7 @@
2164
2167
  <line num="150" count="0" type="stmt"/>
2165
2168
  </file>
2166
2169
  <file name="utils.js" path="/home/runner/work/budibase/budibase/packages/server/src/api/controllers/table/utils.js">
2167
- <metrics statements="172" coveredstatements="116" conditionals="90" coveredconditionals="41" methods="27" coveredmethods="17"/>
2170
+ <metrics statements="174" coveredstatements="116" conditionals="90" coveredconditionals="41" methods="27" coveredmethods="17"/>
2168
2171
  <line num="1" count="34" type="stmt"/>
2169
2172
  <line num="2" count="34" type="stmt"/>
2170
2173
  <line num="7" count="34" type="stmt"/>
@@ -2172,171 +2175,173 @@
2172
2175
  <line num="9" count="34" type="stmt"/>
2173
2176
  <line num="10" count="34" type="stmt"/>
2174
2177
  <line num="11" count="34" type="stmt"/>
2175
- <line num="15" count="34" type="stmt"/>
2176
2178
  <line num="16" count="34" type="stmt"/>
2177
2179
  <line num="17" count="34" type="stmt"/>
2178
- <line num="19" count="34" type="stmt"/>
2179
- <line num="20" count="99" type="stmt"/>
2180
+ <line num="18" count="34" type="stmt"/>
2181
+ <line num="20" count="34" type="stmt"/>
2180
2182
  <line num="21" count="99" type="stmt"/>
2181
2183
  <line num="22" count="99" type="stmt"/>
2182
- <line num="23" count="99" type="cond" truecount="5" falsecount="0"/>
2183
- <line num="24" count="4" type="stmt"/>
2184
- <line num="25" count="11" type="stmt"/>
2185
- <line num="29" count="99" type="cond" truecount="4" falsecount="0"/>
2186
- <line num="31" count="1" type="stmt"/>
2187
- <line num="36" count="1" type="stmt"/>
2188
- <line num="37" count="1" type="cond" truecount="1" falsecount="1"/>
2189
- <line num="38" count="1" type="stmt"/>
2184
+ <line num="23" count="99" type="stmt"/>
2185
+ <line num="24" count="99" type="cond" truecount="5" falsecount="0"/>
2186
+ <line num="25" count="4" type="stmt"/>
2187
+ <line num="26" count="11" type="stmt"/>
2188
+ <line num="30" count="99" type="cond" truecount="4" falsecount="0"/>
2189
+ <line num="32" count="1" type="stmt"/>
2190
+ <line num="37" count="1" type="stmt"/>
2191
+ <line num="38" count="1" type="cond" truecount="1" falsecount="1"/>
2190
2192
  <line num="39" count="1" type="stmt"/>
2191
- <line num="40" count="0" type="cond" truecount="0" falsecount="2"/>
2192
- <line num="41" count="0" type="stmt"/>
2193
- <line num="43" count="1" type="stmt"/>
2194
- <line num="47" count="1" type="stmt"/>
2193
+ <line num="40" count="1" type="stmt"/>
2194
+ <line num="41" count="0" type="cond" truecount="0" falsecount="2"/>
2195
+ <line num="42" count="0" type="stmt"/>
2196
+ <line num="44" count="1" type="stmt"/>
2195
2197
  <line num="48" count="1" type="stmt"/>
2196
- <line num="50" count="99" type="stmt"/>
2197
- <line num="54" count="34" type="stmt"/>
2198
- <line num="55" count="4" type="cond" truecount="1" falsecount="1"/>
2199
- <line num="56" count="0" type="stmt"/>
2200
- <line num="59" count="4" type="stmt"/>
2201
- <line num="62" count="4" type="stmt"/>
2202
- <line num="63" count="11" type="cond" truecount="1" falsecount="1"/>
2203
- <line num="68" count="0" type="stmt"/>
2204
- <line num="71" count="4" type="stmt"/>
2205
- <line num="74" count="34" type="stmt"/>
2206
- <line num="75" count="100" type="cond" truecount="4" falsecount="0"/>
2207
- <line num="76" count="99" type="stmt"/>
2208
- <line num="79" count="1" type="stmt"/>
2209
- <line num="81" count="1" type="stmt"/>
2210
- <line num="86" count="1" type="stmt"/>
2198
+ <line num="49" count="1" type="stmt"/>
2199
+ <line num="51" count="99" type="stmt"/>
2200
+ <line num="55" count="34" type="stmt"/>
2201
+ <line num="56" count="4" type="cond" truecount="1" falsecount="1"/>
2202
+ <line num="57" count="0" type="stmt"/>
2203
+ <line num="60" count="4" type="stmt"/>
2204
+ <line num="63" count="4" type="stmt"/>
2205
+ <line num="64" count="11" type="cond" truecount="1" falsecount="1"/>
2206
+ <line num="69" count="0" type="stmt"/>
2207
+ <line num="72" count="4" type="stmt"/>
2208
+ <line num="75" count="34" type="stmt"/>
2209
+ <line num="76" count="100" type="cond" truecount="4" falsecount="0"/>
2210
+ <line num="77" count="99" type="stmt"/>
2211
+ <line num="80" count="1" type="stmt"/>
2212
+ <line num="82" count="1" type="stmt"/>
2211
2213
  <line num="87" count="1" type="stmt"/>
2212
2214
  <line num="88" count="1" type="stmt"/>
2213
2215
  <line num="89" count="1" type="stmt"/>
2214
2216
  <line num="90" count="1" type="stmt"/>
2215
2217
  <line num="91" count="1" type="stmt"/>
2216
- <line num="94" count="1" type="stmt"/>
2218
+ <line num="92" count="1" type="stmt"/>
2217
2219
  <line num="95" count="1" type="stmt"/>
2218
- <line num="97" count="1" type="stmt"/>
2219
- <line num="99" count="4" type="cond" truecount="1" falsecount="1"/>
2220
- <line num="104" count="0" type="stmt"/>
2221
- <line num="111" count="1" type="stmt"/>
2222
- <line num="114" count="1" type="stmt"/>
2220
+ <line num="96" count="1" type="stmt"/>
2221
+ <line num="98" count="1" type="stmt"/>
2222
+ <line num="100" count="4" type="cond" truecount="1" falsecount="1"/>
2223
+ <line num="105" count="0" type="stmt"/>
2224
+ <line num="112" count="1" type="stmt"/>
2223
2225
  <line num="115" count="1" type="stmt"/>
2224
2226
  <line num="116" count="1" type="stmt"/>
2225
2227
  <line num="117" count="1" type="stmt"/>
2226
- <line num="120" count="34" type="stmt"/>
2227
- <line num="121" count="99" type="stmt"/>
2228
- <line num="123" count="99" type="cond" truecount="4" falsecount="0"/>
2229
- <line num="124" count="2" type="stmt"/>
2228
+ <line num="118" count="1" type="stmt"/>
2229
+ <line num="121" count="34" type="stmt"/>
2230
+ <line num="122" count="99" type="stmt"/>
2231
+ <line num="124" count="99" type="cond" truecount="4" falsecount="0"/>
2230
2232
  <line num="125" count="2" type="stmt"/>
2231
- <line num="127" count="2" type="stmt"/>
2232
- <line num="128" count="3" type="stmt"/>
2233
- <line num="131" count="2" type="cond" truecount="2" falsecount="0"/>
2234
- <line num="132" count="1" type="stmt"/>
2233
+ <line num="126" count="2" type="stmt"/>
2234
+ <line num="128" count="2" type="stmt"/>
2235
+ <line num="129" count="3" type="stmt"/>
2236
+ <line num="132" count="2" type="cond" truecount="2" falsecount="0"/>
2235
2237
  <line num="133" count="1" type="stmt"/>
2236
- <line num="137" count="1" type="cond" truecount="1" falsecount="1"/>
2237
- <line num="138" count="1" type="stmt"/>
2238
- <line num="140" count="1" type="stmt"/>
2239
- <line num="151" count="1" type="stmt"/>
2240
- <line num="161" count="99" type="stmt"/>
2241
- <line num="164" count="34" type="stmt"/>
2242
- <line num="166" count="99" type="cond" truecount="2" falsecount="0"/>
2243
- <line num="167" count="1" type="stmt"/>
2244
- <line num="169" count="5" type="cond" truecount="1" falsecount="1"/>
2245
- <line num="170" count="5" type="stmt"/>
2246
- <line num="174" count="99" type="stmt"/>
2247
- <line num="179" count="99" type="stmt"/>
2238
+ <line num="134" count="1" type="stmt"/>
2239
+ <line num="138" count="1" type="cond" truecount="1" falsecount="1"/>
2240
+ <line num="139" count="1" type="stmt"/>
2241
+ <line num="141" count="1" type="stmt"/>
2242
+ <line num="152" count="1" type="stmt"/>
2243
+ <line num="162" count="99" type="stmt"/>
2244
+ <line num="165" count="34" type="stmt"/>
2245
+ <line num="167" count="99" type="cond" truecount="2" falsecount="0"/>
2246
+ <line num="168" count="1" type="stmt"/>
2247
+ <line num="170" count="5" type="cond" truecount="1" falsecount="1"/>
2248
+ <line num="171" count="5" type="stmt"/>
2249
+ <line num="175" count="99" type="stmt"/>
2248
2250
  <line num="180" count="99" type="stmt"/>
2249
- <line num="181" count="99" type="cond" truecount="3" falsecount="1"/>
2250
- <line num="182" count="99" type="stmt"/>
2251
- <line num="184" count="99" type="stmt"/>
2251
+ <line num="181" count="99" type="stmt"/>
2252
+ <line num="182" count="99" type="cond" truecount="3" falsecount="1"/>
2253
+ <line num="183" count="99" type="stmt"/>
2252
2254
  <line num="185" count="99" type="stmt"/>
2253
- <line num="187" count="99" type="stmt"/>
2254
- <line num="192" count="99" type="cond" truecount="2" falsecount="0"/>
2255
- <line num="193" count="4" type="stmt"/>
2256
- <line num="195" count="99" type="stmt"/>
2255
+ <line num="186" count="99" type="stmt"/>
2256
+ <line num="188" count="99" type="stmt"/>
2257
+ <line num="193" count="99" type="cond" truecount="2" falsecount="0"/>
2258
+ <line num="194" count="4" type="stmt"/>
2257
2259
  <line num="196" count="99" type="stmt"/>
2258
- <line num="201" count="99" type="stmt"/>
2259
- <line num="206" count="99" type="stmt"/>
2260
+ <line num="197" count="99" type="stmt"/>
2261
+ <line num="202" count="99" type="stmt"/>
2260
2262
  <line num="207" count="99" type="stmt"/>
2261
- <line num="212" count="99" type="stmt"/>
2263
+ <line num="208" count="99" type="stmt"/>
2262
2264
  <line num="213" count="99" type="stmt"/>
2263
- <line num="219" count="99" type="stmt"/>
2264
- <line num="223" count="99" type="stmt"/>
2265
- <line num="227" count="34" type="stmt"/>
2266
- <line num="228" count="0" type="stmt"/>
2265
+ <line num="214" count="99" type="stmt"/>
2266
+ <line num="220" count="99" type="stmt"/>
2267
+ <line num="224" count="99" type="stmt"/>
2268
+ <line num="228" count="34" type="stmt"/>
2267
2269
  <line num="229" count="0" type="stmt"/>
2268
- <line num="230" count="0" type="cond" truecount="0" falsecount="4"/>
2269
- <line num="231" count="0" type="stmt"/>
2270
- <line num="233" count="0" type="stmt"/>
2271
- <line num="236" count="34" type="stmt"/>
2272
- <line num="237" count="0" type="stmt"/>
2270
+ <line num="230" count="0" type="stmt"/>
2271
+ <line num="231" count="0" type="cond" truecount="0" falsecount="4"/>
2272
+ <line num="232" count="0" type="stmt"/>
2273
+ <line num="234" count="0" type="stmt"/>
2274
+ <line num="237" count="34" type="stmt"/>
2273
2275
  <line num="238" count="0" type="stmt"/>
2274
- <line num="241" count="34" type="stmt"/>
2275
- <line num="242" count="30" type="stmt"/>
2276
- <line num="243" count="30" type="cond" truecount="1" falsecount="1"/>
2277
- <line num="244" count="0" type="stmt"/>
2276
+ <line num="239" count="0" type="stmt"/>
2277
+ <line num="242" count="34" type="stmt"/>
2278
+ <line num="243" count="30" type="stmt"/>
2279
+ <line num="244" count="30" type="cond" truecount="1" falsecount="1"/>
2278
2280
  <line num="245" count="0" type="stmt"/>
2279
- <line num="247" count="30" type="stmt"/>
2280
- <line num="251" count="34" type="stmt"/>
2281
- <line num="252" count="1" type="stmt"/>
2282
- <line num="253" count="1" type="stmt"/>
2281
+ <line num="246" count="0" type="stmt"/>
2282
+ <line num="247" count="0" type="stmt"/>
2283
+ <line num="248" count="0" type="stmt"/>
2284
+ <line num="250" count="30" type="stmt"/>
2285
+ <line num="254" count="34" type="stmt"/>
2286
+ <line num="255" count="1" type="stmt"/>
2283
2287
  <line num="256" count="1" type="stmt"/>
2284
- <line num="257" count="0" type="stmt"/>
2285
- <line num="260" count="0" type="cond" truecount="0" falsecount="2"/>
2286
- <line num="262" count="0" type="cond" truecount="0" falsecount="2"/>
2287
- <line num="263" count="0" type="stmt"/>
2288
- <line num="264" count="0" type="stmt"/>
2289
- <line num="268" count="0" type="cond" truecount="0" falsecount="2"/>
2290
- <line num="269" count="0" type="stmt"/>
2291
- <line num="270" count="0" type="stmt"/>
2292
- <line num="274" count="0" type="cond" truecount="0" falsecount="2"/>
2293
- <line num="275" count="0" type="stmt"/>
2294
- <line num="276" count="0" type="cond" truecount="0" falsecount="2"/>
2295
- <line num="277" count="0" type="stmt"/>
2288
+ <line num="259" count="1" type="stmt"/>
2289
+ <line num="260" count="0" type="stmt"/>
2290
+ <line num="263" count="0" type="cond" truecount="0" falsecount="2"/>
2291
+ <line num="265" count="0" type="cond" truecount="0" falsecount="2"/>
2292
+ <line num="266" count="0" type="stmt"/>
2293
+ <line num="267" count="0" type="stmt"/>
2294
+ <line num="271" count="0" type="cond" truecount="0" falsecount="2"/>
2295
+ <line num="272" count="0" type="stmt"/>
2296
+ <line num="273" count="0" type="stmt"/>
2297
+ <line num="277" count="0" type="cond" truecount="0" falsecount="2"/>
2296
2298
  <line num="278" count="0" type="stmt"/>
2297
- <line num="282" count="0" type="cond" truecount="0" falsecount="2"/>
2298
- <line num="283" count="0" type="stmt"/>
2299
+ <line num="279" count="0" type="cond" truecount="0" falsecount="2"/>
2300
+ <line num="280" count="0" type="stmt"/>
2301
+ <line num="281" count="0" type="stmt"/>
2299
2302
  <line num="285" count="0" type="cond" truecount="0" falsecount="2"/>
2300
2303
  <line num="286" count="0" type="stmt"/>
2301
- <line num="287" count="0" type="stmt"/>
2302
- <line num="288" count="0" type="stmt"/>
2304
+ <line num="288" count="0" type="cond" truecount="0" falsecount="2"/>
2303
2305
  <line num="289" count="0" type="stmt"/>
2304
- <line num="293" count="0" type="cond" truecount="0" falsecount="2"/>
2305
- <line num="294" count="0" type="stmt"/>
2306
- <line num="295" count="0" type="stmt"/>
2307
- <line num="299" count="0" type="cond" truecount="0" falsecount="4"/>
2308
- <line num="300" count="0" type="stmt"/>
2309
- <line num="301" count="0" type="stmt"/>
2310
- <line num="302" count="0" type="stmt"/>
2311
- <line num="304" count="0" type="cond" truecount="0" falsecount="2"/>
2306
+ <line num="290" count="0" type="stmt"/>
2307
+ <line num="291" count="0" type="stmt"/>
2308
+ <line num="292" count="0" type="stmt"/>
2309
+ <line num="296" count="0" type="cond" truecount="0" falsecount="2"/>
2310
+ <line num="297" count="0" type="stmt"/>
2311
+ <line num="298" count="0" type="stmt"/>
2312
+ <line num="302" count="0" type="cond" truecount="0" falsecount="4"/>
2313
+ <line num="303" count="0" type="stmt"/>
2314
+ <line num="304" count="0" type="stmt"/>
2312
2315
  <line num="305" count="0" type="stmt"/>
2313
- <line num="312" count="0" type="cond" truecount="0" falsecount="2"/>
2314
- <line num="313" count="0" type="stmt"/>
2315
- <line num="314" count="0" type="stmt"/>
2316
+ <line num="307" count="0" type="cond" truecount="0" falsecount="2"/>
2317
+ <line num="308" count="0" type="stmt"/>
2316
2318
  <line num="315" count="0" type="cond" truecount="0" falsecount="2"/>
2317
2319
  <line num="316" count="0" type="stmt"/>
2318
- <line num="318" count="0" type="stmt"/>
2319
- <line num="323" count="34" type="stmt"/>
2320
- <line num="324" count="0" type="stmt"/>
2321
- <line num="327" count="34" type="stmt"/>
2322
- <line num="328" count="0" type="stmt"/>
2323
- <line num="331" count="34" type="cond" truecount="0" falsecount="1"/>
2324
- <line num="332" count="0" type="stmt"/>
2325
- <line num="337" count="0" type="cond" truecount="0" falsecount="2"/>
2326
- <line num="338" count="0" type="stmt"/>
2327
- <line num="340" count="0" type="stmt"/>
2328
- <line num="343" count="34" type="stmt"/>
2329
- <line num="344" count="99" type="cond" truecount="2" falsecount="0"/>
2330
- <line num="345" count="95" type="stmt"/>
2331
- <line num="347" count="4" type="stmt"/>
2332
- <line num="348" count="11" type="stmt"/>
2333
- <line num="349" count="11" type="cond" truecount="2" falsecount="0"/>
2334
- <line num="350" count="7" type="stmt"/>
2335
- <line num="352" count="4" type="stmt"/>
2336
- <line num="353" count="4" type="cond" truecount="2" falsecount="2"/>
2337
- <line num="354" count="0" type="stmt"/>
2338
- <line num="357" count="4" type="stmt"/>
2339
- <line num="360" count="34" type="stmt"/>
2320
+ <line num="317" count="0" type="stmt"/>
2321
+ <line num="318" count="0" type="cond" truecount="0" falsecount="2"/>
2322
+ <line num="319" count="0" type="stmt"/>
2323
+ <line num="321" count="0" type="stmt"/>
2324
+ <line num="326" count="34" type="stmt"/>
2325
+ <line num="327" count="0" type="stmt"/>
2326
+ <line num="330" count="34" type="stmt"/>
2327
+ <line num="331" count="0" type="stmt"/>
2328
+ <line num="334" count="34" type="cond" truecount="0" falsecount="1"/>
2329
+ <line num="335" count="0" type="stmt"/>
2330
+ <line num="340" count="0" type="cond" truecount="0" falsecount="2"/>
2331
+ <line num="341" count="0" type="stmt"/>
2332
+ <line num="343" count="0" type="stmt"/>
2333
+ <line num="346" count="34" type="stmt"/>
2334
+ <line num="347" count="99" type="cond" truecount="2" falsecount="0"/>
2335
+ <line num="348" count="95" type="stmt"/>
2336
+ <line num="350" count="4" type="stmt"/>
2337
+ <line num="351" count="11" type="stmt"/>
2338
+ <line num="352" count="11" type="cond" truecount="2" falsecount="0"/>
2339
+ <line num="353" count="7" type="stmt"/>
2340
+ <line num="355" count="4" type="stmt"/>
2341
+ <line num="356" count="4" type="cond" truecount="2" falsecount="2"/>
2342
+ <line num="357" count="0" type="stmt"/>
2343
+ <line num="360" count="4" type="stmt"/>
2344
+ <line num="363" count="34" type="stmt"/>
2340
2345
  </file>
2341
2346
  </package>
2342
2347
  <package name="api.controllers.view">