@lando/drupal 1.5.0 → 1.6.0

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.
@@ -0,0 +1 @@
1
+ {"/home/runner/work/drupal/drupal/lib/utils.js":{"path":"/home/runner/work/drupal/drupal/lib/utils.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":27}},"1":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"2":{"start":{"line":11,"column":0},"end":{"line":23,"column":2}},"3":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"4":{"start":{"line":13,"column":25},"end":{"line":13,"column":41}},"5":{"start":{"line":15,"column":22},"end":{"line":20,"column":3}},"6":{"start":{"line":22,"column":2},"end":{"line":22,"column":63}},"7":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"8":{"start":{"line":26,"column":19},"end":{"line":37,"column":1}},"9":{"start":{"line":39,"column":17},"end":{"line":50,"column":1}},"10":{"start":{"line":52,"column":20},"end":{"line":64,"column":1}},"11":{"start":{"line":69,"column":20},"end":{"line":69,"column":107}},"12":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"13":{"start":{"line":74,"column":0},"end":{"line":94,"column":2}},"14":{"start":{"line":76,"column":2},"end":{"line":76,"column":30}},"15":{"start":{"line":77,"column":2},"end":{"line":77,"column":31}},"16":{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},"17":{"start":{"line":80,"column":4},"end":{"line":80,"column":29}},"18":{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},"19":{"start":{"line":83,"column":4},"end":{"line":83,"column":29}},"20":{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},"21":{"start":{"line":85,"column":4},"end":{"line":85,"column":33}},"22":{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},"23":{"start":{"line":87,"column":4},"end":{"line":87,"column":31}},"24":{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},"25":{"start":{"line":89,"column":4},"end":{"line":92,"column":7}},"26":{"start":{"line":99,"column":0},"end":{"line":104,"column":2}},"27":{"start":{"line":99,"column":40},"end":{"line":104,"column":1}},"28":{"start":{"line":110,"column":0},"end":{"line":122,"column":2}},"29":{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},"30":{"start":{"line":112,"column":25},"end":{"line":112,"column":41}},"31":{"start":{"line":114,"column":22},"end":{"line":119,"column":3}},"32":{"start":{"line":121,"column":2},"end":{"line":121,"column":63}},"33":{"start":{"line":121,"column":35},"end":{"line":121,"column":48}},"34":{"start":{"line":127,"column":0},"end":{"line":139,"column":2}},"35":{"start":{"line":128,"column":17},"end":{"line":128,"column":19}},"36":{"start":{"line":129,"column":2},"end":{"line":137,"column":5}},"37":{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},"38":{"start":{"line":131,"column":6},"end":{"line":131,"column":42}},"39":{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},"40":{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},"41":{"start":{"line":134,"column":8},"end":{"line":134,"column":79}},"42":{"start":{"line":138,"column":2},"end":{"line":138,"column":16}},"43":{"start":{"line":144,"column":0},"end":{"line":153,"column":3}},"44":{"start":{"line":144,"column":39},"end":{"line":153,"column":2}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":11,"column":18},"end":{"line":11,"column":19}},"loc":{"start":{"line":11,"column":54},"end":{"line":23,"column":1}},"line":11},"1":{"name":"(anonymous_1)","decl":{"start":{"line":22,"column":28},"end":{"line":22,"column":29}},"loc":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"line":22},"2":{"name":"(anonymous_2)","decl":{"start":{"line":69,"column":20},"end":{"line":69,"column":21}},"loc":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"line":69},"3":{"name":"(anonymous_3)","decl":{"start":{"line":74,"column":23},"end":{"line":74,"column":24}},"loc":{"start":{"line":74,"column":35},"end":{"line":94,"column":1}},"line":74},"4":{"name":"(anonymous_4)","decl":{"start":{"line":99,"column":19},"end":{"line":99,"column":20}},"loc":{"start":{"line":99,"column":40},"end":{"line":104,"column":1}},"line":99},"5":{"name":"(anonymous_5)","decl":{"start":{"line":110,"column":18},"end":{"line":110,"column":19}},"loc":{"start":{"line":110,"column":54},"end":{"line":122,"column":1}},"line":110},"6":{"name":"(anonymous_6)","decl":{"start":{"line":121,"column":28},"end":{"line":121,"column":29}},"loc":{"start":{"line":121,"column":35},"end":{"line":121,"column":48}},"line":121},"7":{"name":"(anonymous_7)","decl":{"start":{"line":127,"column":27},"end":{"line":127,"column":28}},"loc":{"start":{"line":127,"column":77},"end":{"line":139,"column":1}},"line":127},"8":{"name":"(anonymous_8)","decl":{"start":{"line":129,"column":19},"end":{"line":129,"column":20}},"loc":{"start":{"line":129,"column":27},"end":{"line":137,"column":3}},"line":129},"9":{"name":"(anonymous_9)","decl":{"start":{"line":144,"column":22},"end":{"line":144,"column":23}},"loc":{"start":{"line":144,"column":39},"end":{"line":153,"column":2}},"line":144}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":49}},"type":"default-arg","locations":[{"start":{"line":11,"column":43},"end":{"line":11,"column":49}}],"line":11},"1":{"loc":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},{"start":{"line":13,"column":2},"end":{"line":13,"column":41}}],"line":13},"2":{"loc":{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},{"start":{"line":79,"column":2},"end":{"line":93,"column":3}}],"line":79},"3":{"loc":{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},{"start":{"line":81,"column":9},"end":{"line":93,"column":3}}],"line":81},"4":{"loc":{"start":{"line":81,"column":13},"end":{"line":81,"column":43}},"type":"binary-expr","locations":[{"start":{"line":81,"column":13},"end":{"line":81,"column":29}},{"start":{"line":81,"column":33},"end":{"line":81,"column":43}}],"line":81},"5":{"loc":{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},{"start":{"line":84,"column":9},"end":{"line":93,"column":3}}],"line":84},"6":{"loc":{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},{"start":{"line":86,"column":9},"end":{"line":93,"column":3}}],"line":86},"7":{"loc":{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},{"start":{"line":88,"column":9},"end":{"line":93,"column":3}}],"line":88},"8":{"loc":{"start":{"line":110,"column":35},"end":{"line":110,"column":49}},"type":"default-arg","locations":[{"start":{"line":110,"column":43},"end":{"line":110,"column":49}}],"line":110},"9":{"loc":{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},"type":"if","locations":[{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},{"start":{"line":112,"column":2},"end":{"line":112,"column":41}}],"line":112},"10":{"loc":{"start":{"line":127,"column":37},"end":{"line":127,"column":72}},"type":"default-arg","locations":[{"start":{"line":127,"column":45},"end":{"line":127,"column":72}}],"line":127},"11":{"loc":{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},"type":"if","locations":[{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},{"start":{"line":130,"column":4},"end":{"line":136,"column":5}}],"line":130},"12":{"loc":{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},"type":"if","locations":[{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},{"start":{"line":132,"column":11},"end":{"line":136,"column":5}}],"line":132},"13":{"loc":{"start":{"line":132,"column":15},"end":{"line":132,"column":90}},"type":"binary-expr","locations":[{"start":{"line":132,"column":15},"end":{"line":132,"column":48}},{"start":{"line":132,"column":52},"end":{"line":132,"column":90}}],"line":132},"14":{"loc":{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},"type":"if","locations":[{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},{"start":{"line":133,"column":6},"end":{"line":135,"column":7}}],"line":133}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"b":{"0":[0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0,0],"6":[0,0],"7":[0,0],"8":[0],"9":[0,0],"10":[0],"11":[0,0],"12":[0,0],"13":[0,0],"14":[0,0]},"all":true},"/home/runner/work/drupal/drupal/lib/warnings.js":{"path":"/home/runner/work/drupal/drupal/lib/warnings.js","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":13,"column":3}},"1":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":5,"column":20},"end":{"line":5,"column":21}},"loc":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}},"line":5}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0},"b":{},"all":true}}
@@ -0,0 +1 @@
1
+ {"parent":null,"pid":2017,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1716838013031,"ppid":2016,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/a429ea73-cd15-4ad9-a2ac-1365773339cf.json","externalId":"","uuid":"a429ea73-cd15-4ad9-a2ac-1365773339cf","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}
@@ -0,0 +1 @@
1
+ {"parent":null,"pid":2028,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1716838013477,"ppid":2017,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/d414c776-d2a1-41d8-8549-8b0524ed17c8.json","externalId":"","uuid":"d414c776-d2a1-41d8-8549-8b0524ed17c8","files":[]}
@@ -1 +1 @@
1
- {"processes":{"85d65275-0a95-4a60-a626-06f63d95d46f":{"parent":null,"children":[]},"f0add8e0-d60a-460b-9cfd-21beb5545a6e":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["85d65275-0a95-4a60-a626-06f63d95d46f"],"/home/runner/work/drupal/drupal/lib/warnings.js":["85d65275-0a95-4a60-a626-06f63d95d46f"]},"externalIds":{}}
1
+ {"processes":{"a429ea73-cd15-4ad9-a2ac-1365773339cf":{"parent":null,"children":[]},"d414c776-d2a1-41d8-8549-8b0524ed17c8":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["a429ea73-cd15-4ad9-a2ac-1365773339cf"],"/home/runner/work/drupal/drupal/lib/warnings.js":["a429ea73-cd15-4ad9-a2ac-1365773339cf"]},"externalIds":{}}
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
2
2
 
3
+ ## v1.6.0 - [May 27, 2024](https://github.com/lando/drupal/releases/tag/v1.6.0)
4
+
5
+ * Use mysql command for MariaDB 10.3.x and below
6
+
3
7
  ## v1.5.0 - [May 8, 2024](https://github.com/lando/drupal/releases/tag/v1.5.0)
4
8
 
5
9
  * Updated mariadb plugin and added tooling support for the mariadb executable. [#51](https://github.com/lando/mariadb/issues/51
@@ -163,15 +163,19 @@ const getServices = options => ({
163
163
  */
164
164
  const getDbTooling = database => {
165
165
  // Make sure we strip out any version number
166
- database = database.split(':')[0];
166
+ const db = database.split(':')[0];
167
+ const ver = database.split(':')[1];
167
168
  // Choose wisely
168
- if (database === 'mysql') {
169
+ if (db === 'mysql') {
169
170
  return {mysql: mysqlCli};
170
- } else if (database === 'mariadb') {
171
+ } else if (db === 'mariadb' && ver < 10.4) {
172
+ // Use mysql command for MariaDB 10.3.x and below
173
+ return {mysql: mysqlCli};
174
+ } else if (db === 'mariadb') {
171
175
  return {mariadb: mariadbCli};
172
- } else if (database === 'postgres') {
176
+ } else if (db === 'postgres') {
173
177
  return {psql: postgresCli};
174
- } else if (database === 'mongo') {
178
+ } else if (db === 'mongo') {
175
179
  return {mongo: {
176
180
  service: 'database',
177
181
  description: 'Drop into the mongo shell',
@@ -25,14 +25,14 @@
25
25
  <div class='fl pad1y space-right2'>
26
26
  <span class="strong">0% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>0/44</span>
28
+ <span class='fraction'>0/47</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
33
  <span class="strong">0% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>0/23</span>
35
+ <span class='fraction'>0/27</span>
36
36
  </div>
37
37
 
38
38
 
@@ -46,7 +46,7 @@
46
46
  <div class='fl pad1y space-right2'>
47
47
  <span class="strong">0% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>0/36</span>
49
+ <span class='fraction'>0/39</span>
50
50
  </div>
51
51
 
52
52
 
@@ -84,13 +84,13 @@
84
84
  <div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
85
85
  </td>
86
86
  <td data-value="0" class="pct low">0%</td>
87
- <td data-value="42" class="abs low">0/42</td>
87
+ <td data-value="45" class="abs low">0/45</td>
88
88
  <td data-value="0" class="pct low">0%</td>
89
- <td data-value="23" class="abs low">0/23</td>
89
+ <td data-value="27" class="abs low">0/27</td>
90
90
  <td data-value="0" class="pct low">0%</td>
91
91
  <td data-value="10" class="abs low">0/10</td>
92
92
  <td data-value="0" class="pct low">0%</td>
93
- <td data-value="35" class="abs low">0/35</td>
93
+ <td data-value="38" class="abs low">0/38</td>
94
94
  </tr>
95
95
 
96
96
  <tr>
@@ -116,7 +116,7 @@
116
116
  <div class='footer quiet pad2 space-top1 center small'>
117
117
  Code coverage generated by
118
118
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
119
- at 2024-05-08T18:30:59.565Z
119
+ at 2024-05-27T19:26:53.668Z
120
120
  </div>
121
121
  <script src="prettify.js"></script>
122
122
  <script>
@@ -25,14 +25,14 @@
25
25
  <div class='fl pad1y space-right2'>
26
26
  <span class="strong">0% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>0/42</span>
28
+ <span class='fraction'>0/45</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
33
  <span class="strong">0% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>0/23</span>
35
+ <span class='fraction'>0/27</span>
36
36
  </div>
37
37
 
38
38
 
@@ -46,7 +46,7 @@
46
46
  <div class='fl pad1y space-right2'>
47
47
  <span class="strong">0% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>0/35</span>
49
+ <span class='fraction'>0/38</span>
50
50
  </div>
51
51
 
52
52
 
@@ -212,7 +212,11 @@
212
212
  <a name='L147'></a><a href='#L147'>147</a>
213
213
  <a name='L148'></a><a href='#L148'>148</a>
214
214
  <a name='L149'></a><a href='#L149'>149</a>
215
- <a name='L150'></a><a href='#L150'>150</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
215
+ <a name='L150'></a><a href='#L150'>150</a>
216
+ <a name='L151'></a><a href='#L151'>151</a>
217
+ <a name='L152'></a><a href='#L152'>152</a>
218
+ <a name='L153'></a><a href='#L153'>153</a>
219
+ <a name='L154'></a><a href='#L154'>154</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
216
220
  <span class="cline-any cline-neutral">&nbsp;</span>
217
221
  <span class="cline-any cline-neutral">&nbsp;</span>
218
222
  <span class="cline-any cline-no">&nbsp;</span>
@@ -288,10 +292,14 @@
288
292
  <span class="cline-any cline-no">&nbsp;</span>
289
293
  <span class="cline-any cline-neutral">&nbsp;</span>
290
294
  <span class="cline-any cline-no">&nbsp;</span>
295
+ <span class="cline-any cline-no">&nbsp;</span>
291
296
  <span class="cline-any cline-neutral">&nbsp;</span>
292
297
  <span class="cline-any cline-no">&nbsp;</span>
293
298
  <span class="cline-any cline-no">&nbsp;</span>
294
299
  <span class="cline-any cline-no">&nbsp;</span>
300
+ <span class="cline-any cline-neutral">&nbsp;</span>
301
+ <span class="cline-any cline-no">&nbsp;</span>
302
+ <span class="cline-any cline-no">&nbsp;</span>
295
303
  <span class="cline-any cline-no">&nbsp;</span>
296
304
  <span class="cline-any cline-no">&nbsp;</span>
297
305
  <span class="cline-any cline-no">&nbsp;</span>
@@ -436,15 +444,19 @@ const getDrushUrl = <span class="cstat-no" title="statement not covered" ><span
436
444
  */
437
445
  <span class="cstat-no" title="statement not covered" >exports.getDbTooling = <span class="fstat-no" title="function not covered" >da</span>tabase =&gt; {</span>
438
446
  // Make sure we strip out any version number
439
- <span class="cstat-no" title="statement not covered" > database = database.split(':')[0];</span>
447
+ <span class="cstat-no" title="statement not covered" > db = database.split(':')[0];</span>
448
+ <span class="cstat-no" title="statement not covered" > ver = database.split(':')[1];</span>
440
449
  // Choose wisely
441
- <span class="cstat-no" title="statement not covered" > if (database === 'mysql') {</span>
450
+ <span class="cstat-no" title="statement not covered" > if (db === 'mysql') {</span>
451
+ <span class="cstat-no" title="statement not covered" > return {mysql: mysqlCli};</span>
452
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'mariadb' &amp;&amp; ver &lt; 10.4) {</span>
453
+ // Use mysql command for MariaDB 10.3.x and below
442
454
  <span class="cstat-no" title="statement not covered" > return {mysql: mysqlCli};</span>
443
- } else <span class="cstat-no" title="statement not covered" >if (database === 'mariadb') {</span>
455
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'mariadb') {</span>
444
456
  <span class="cstat-no" title="statement not covered" > return {mariadb: mariadbCli};</span>
445
- } else <span class="cstat-no" title="statement not covered" >if (database === 'postgres') {</span>
457
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'postgres') {</span>
446
458
  <span class="cstat-no" title="statement not covered" > return {psql: postgresCli};</span>
447
- } else <span class="cstat-no" title="statement not covered" >if (database === 'mongo') {</span>
459
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'mongo') {</span>
448
460
  <span class="cstat-no" title="statement not covered" > return {mongo: {</span>
449
461
  service: 'database',
450
462
  description: 'Drop into the mongo shell',
@@ -517,7 +529,7 @@ const getDrushUrl = <span class="cstat-no" title="statement not covered" ><span
517
529
  <div class='footer quiet pad2 space-top1 center small'>
518
530
  Code coverage generated by
519
531
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
520
- at 2024-05-08T18:30:59.565Z
532
+ at 2024-05-27T19:26:53.668Z
521
533
  </div>
522
534
  <script src="prettify.js"></script>
523
535
  <script>
@@ -109,7 +109,7 @@
109
109
  <div class='footer quiet pad2 space-top1 center small'>
110
110
  Code coverage generated by
111
111
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
112
- at 2024-05-08T18:30:59.565Z
112
+ at 2024-05-27T19:26:53.668Z
113
113
  </div>
114
114
  <script src="prettify.js"></script>
115
115
  <script>
package/lib/utils.js CHANGED
@@ -73,15 +73,19 @@ const getDrushUrl = version => `https://github.com/drush-ops/drush/releases/down
73
73
  */
74
74
  exports.getDbTooling = database => {
75
75
  // Make sure we strip out any version number
76
- database = database.split(':')[0];
76
+ db = database.split(':')[0];
77
+ ver = database.split(':')[1];
77
78
  // Choose wisely
78
- if (database === 'mysql') {
79
+ if (db === 'mysql') {
79
80
  return {mysql: mysqlCli};
80
- } else if (database === 'mariadb') {
81
+ } else if (db === 'mariadb' && ver < 10.4) {
82
+ // Use mysql command for MariaDB 10.3.x and below
83
+ return {mysql: mysqlCli};
84
+ } else if (db === 'mariadb') {
81
85
  return {mariadb: mariadbCli};
82
- } else if (database === 'postgres') {
86
+ } else if (db === 'postgres') {
83
87
  return {psql: postgresCli};
84
- } else if (database === 'mongo') {
88
+ } else if (db === 'mongo') {
85
89
  return {mongo: {
86
90
  service: 'database',
87
91
  description: 'Drop into the mongo shell',
package/netlify.toml CHANGED
@@ -45,5 +45,11 @@
45
45
  from = "/plugins/drupal/*"
46
46
  to = "/:splat"
47
47
  status = 200
48
-
49
-
48
+ [[redirects]]
49
+ from = "/legacy-versions.html"
50
+ to = "/plugins/drupal/legacy/drupal-8.html"
51
+ status = 302
52
+ [[redirects]]
53
+ from = "/plugins/drupal/drupal-multisite.html"
54
+ to = "/plugins/drupal/guides/drupal-multisite.html"
55
+ status = 302
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lando/drupal",
3
3
  "description": "A Lando plugin that provides a tight integration with Drupal.",
4
- "version": "1.5.0",
4
+ "version": "1.6.0",
5
5
  "author": "Mike Pirog @pirog",
6
6
  "license": "GPL-3.0",
7
7
  "repository": "lando/drupal",
@@ -76,9 +76,9 @@
76
76
  "semver"
77
77
  ],
78
78
  "dist": {
79
- "integrity": "sha512-ePpVmVPfmbd3ugvoUVqX87eKKTj9nKD9cO9PFYZFh/pgAL8KHjdyMYn4qCz17cxA3CxgoEEffW9NKsimflQ0pg==",
80
- "shasum": "67909777573e1b385ed854d9127b4546c2e91b5a",
81
- "filename": "lando-drupal-1.5.0.tgz",
82
- "unpackedSize": 12386687
79
+ "integrity": "sha512-O90bibksiHZvqQ+ZazYP6H/iXRW70tShgNCTatNXqrIigRKqYYA9JhMVLV/zYh0vYP78WUoj4z6AkEJn4qXzAw==",
80
+ "shasum": "5a99ac444b9d2ea121920a72ee49a13100ebdb6f",
81
+ "filename": "lando-drupal-1.6.0.tgz",
82
+ "unpackedSize": 12388757
83
83
  }
84
84
  }
@@ -1 +0,0 @@
1
- {"/home/runner/work/drupal/drupal/lib/utils.js":{"path":"/home/runner/work/drupal/drupal/lib/utils.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":27}},"1":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"2":{"start":{"line":11,"column":0},"end":{"line":23,"column":2}},"3":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"4":{"start":{"line":13,"column":25},"end":{"line":13,"column":41}},"5":{"start":{"line":15,"column":22},"end":{"line":20,"column":3}},"6":{"start":{"line":22,"column":2},"end":{"line":22,"column":63}},"7":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"8":{"start":{"line":26,"column":19},"end":{"line":37,"column":1}},"9":{"start":{"line":39,"column":17},"end":{"line":50,"column":1}},"10":{"start":{"line":52,"column":20},"end":{"line":64,"column":1}},"11":{"start":{"line":69,"column":20},"end":{"line":69,"column":107}},"12":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"13":{"start":{"line":74,"column":0},"end":{"line":90,"column":2}},"14":{"start":{"line":76,"column":2},"end":{"line":76,"column":36}},"15":{"start":{"line":78,"column":2},"end":{"line":89,"column":3}},"16":{"start":{"line":79,"column":4},"end":{"line":79,"column":29}},"17":{"start":{"line":80,"column":9},"end":{"line":89,"column":3}},"18":{"start":{"line":81,"column":4},"end":{"line":81,"column":33}},"19":{"start":{"line":82,"column":9},"end":{"line":89,"column":3}},"20":{"start":{"line":83,"column":4},"end":{"line":83,"column":31}},"21":{"start":{"line":84,"column":9},"end":{"line":89,"column":3}},"22":{"start":{"line":85,"column":4},"end":{"line":88,"column":7}},"23":{"start":{"line":95,"column":0},"end":{"line":100,"column":2}},"24":{"start":{"line":95,"column":40},"end":{"line":100,"column":1}},"25":{"start":{"line":106,"column":0},"end":{"line":118,"column":2}},"26":{"start":{"line":108,"column":2},"end":{"line":108,"column":41}},"27":{"start":{"line":108,"column":25},"end":{"line":108,"column":41}},"28":{"start":{"line":110,"column":22},"end":{"line":115,"column":3}},"29":{"start":{"line":117,"column":2},"end":{"line":117,"column":63}},"30":{"start":{"line":117,"column":35},"end":{"line":117,"column":48}},"31":{"start":{"line":123,"column":0},"end":{"line":135,"column":2}},"32":{"start":{"line":124,"column":17},"end":{"line":124,"column":19}},"33":{"start":{"line":125,"column":2},"end":{"line":133,"column":5}},"34":{"start":{"line":126,"column":4},"end":{"line":132,"column":5}},"35":{"start":{"line":127,"column":6},"end":{"line":127,"column":42}},"36":{"start":{"line":128,"column":11},"end":{"line":132,"column":5}},"37":{"start":{"line":129,"column":6},"end":{"line":131,"column":7}},"38":{"start":{"line":130,"column":8},"end":{"line":130,"column":79}},"39":{"start":{"line":134,"column":2},"end":{"line":134,"column":16}},"40":{"start":{"line":140,"column":0},"end":{"line":149,"column":3}},"41":{"start":{"line":140,"column":39},"end":{"line":149,"column":2}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":11,"column":18},"end":{"line":11,"column":19}},"loc":{"start":{"line":11,"column":54},"end":{"line":23,"column":1}},"line":11},"1":{"name":"(anonymous_1)","decl":{"start":{"line":22,"column":28},"end":{"line":22,"column":29}},"loc":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"line":22},"2":{"name":"(anonymous_2)","decl":{"start":{"line":69,"column":20},"end":{"line":69,"column":21}},"loc":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"line":69},"3":{"name":"(anonymous_3)","decl":{"start":{"line":74,"column":23},"end":{"line":74,"column":24}},"loc":{"start":{"line":74,"column":35},"end":{"line":90,"column":1}},"line":74},"4":{"name":"(anonymous_4)","decl":{"start":{"line":95,"column":19},"end":{"line":95,"column":20}},"loc":{"start":{"line":95,"column":40},"end":{"line":100,"column":1}},"line":95},"5":{"name":"(anonymous_5)","decl":{"start":{"line":106,"column":18},"end":{"line":106,"column":19}},"loc":{"start":{"line":106,"column":54},"end":{"line":118,"column":1}},"line":106},"6":{"name":"(anonymous_6)","decl":{"start":{"line":117,"column":28},"end":{"line":117,"column":29}},"loc":{"start":{"line":117,"column":35},"end":{"line":117,"column":48}},"line":117},"7":{"name":"(anonymous_7)","decl":{"start":{"line":123,"column":27},"end":{"line":123,"column":28}},"loc":{"start":{"line":123,"column":77},"end":{"line":135,"column":1}},"line":123},"8":{"name":"(anonymous_8)","decl":{"start":{"line":125,"column":19},"end":{"line":125,"column":20}},"loc":{"start":{"line":125,"column":27},"end":{"line":133,"column":3}},"line":125},"9":{"name":"(anonymous_9)","decl":{"start":{"line":140,"column":22},"end":{"line":140,"column":23}},"loc":{"start":{"line":140,"column":39},"end":{"line":149,"column":2}},"line":140}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":49}},"type":"default-arg","locations":[{"start":{"line":11,"column":43},"end":{"line":11,"column":49}}],"line":11},"1":{"loc":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},{"start":{"line":13,"column":2},"end":{"line":13,"column":41}}],"line":13},"2":{"loc":{"start":{"line":78,"column":2},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":78,"column":2},"end":{"line":89,"column":3}},{"start":{"line":78,"column":2},"end":{"line":89,"column":3}}],"line":78},"3":{"loc":{"start":{"line":80,"column":9},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":80,"column":9},"end":{"line":89,"column":3}},{"start":{"line":80,"column":9},"end":{"line":89,"column":3}}],"line":80},"4":{"loc":{"start":{"line":82,"column":9},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":82,"column":9},"end":{"line":89,"column":3}},{"start":{"line":82,"column":9},"end":{"line":89,"column":3}}],"line":82},"5":{"loc":{"start":{"line":84,"column":9},"end":{"line":89,"column":3}},"type":"if","locations":[{"start":{"line":84,"column":9},"end":{"line":89,"column":3}},{"start":{"line":84,"column":9},"end":{"line":89,"column":3}}],"line":84},"6":{"loc":{"start":{"line":106,"column":35},"end":{"line":106,"column":49}},"type":"default-arg","locations":[{"start":{"line":106,"column":43},"end":{"line":106,"column":49}}],"line":106},"7":{"loc":{"start":{"line":108,"column":2},"end":{"line":108,"column":41}},"type":"if","locations":[{"start":{"line":108,"column":2},"end":{"line":108,"column":41}},{"start":{"line":108,"column":2},"end":{"line":108,"column":41}}],"line":108},"8":{"loc":{"start":{"line":123,"column":37},"end":{"line":123,"column":72}},"type":"default-arg","locations":[{"start":{"line":123,"column":45},"end":{"line":123,"column":72}}],"line":123},"9":{"loc":{"start":{"line":126,"column":4},"end":{"line":132,"column":5}},"type":"if","locations":[{"start":{"line":126,"column":4},"end":{"line":132,"column":5}},{"start":{"line":126,"column":4},"end":{"line":132,"column":5}}],"line":126},"10":{"loc":{"start":{"line":128,"column":11},"end":{"line":132,"column":5}},"type":"if","locations":[{"start":{"line":128,"column":11},"end":{"line":132,"column":5}},{"start":{"line":128,"column":11},"end":{"line":132,"column":5}}],"line":128},"11":{"loc":{"start":{"line":128,"column":15},"end":{"line":128,"column":90}},"type":"binary-expr","locations":[{"start":{"line":128,"column":15},"end":{"line":128,"column":48}},{"start":{"line":128,"column":52},"end":{"line":128,"column":90}}],"line":128},"12":{"loc":{"start":{"line":129,"column":6},"end":{"line":131,"column":7}},"type":"if","locations":[{"start":{"line":129,"column":6},"end":{"line":131,"column":7}},{"start":{"line":129,"column":6},"end":{"line":131,"column":7}}],"line":129}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"b":{"0":[0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0,0],"6":[0],"7":[0,0],"8":[0],"9":[0,0],"10":[0,0],"11":[0,0],"12":[0,0]},"all":true},"/home/runner/work/drupal/drupal/lib/warnings.js":{"path":"/home/runner/work/drupal/drupal/lib/warnings.js","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":13,"column":3}},"1":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":5,"column":20},"end":{"line":5,"column":21}},"loc":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}},"line":5}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0},"b":{},"all":true}}
@@ -1 +0,0 @@
1
- {"parent":null,"pid":1853,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1715193058931,"ppid":1852,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/85d65275-0a95-4a60-a626-06f63d95d46f.json","externalId":"","uuid":"85d65275-0a95-4a60-a626-06f63d95d46f","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}
@@ -1 +0,0 @@
1
- {"parent":null,"pid":1864,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1715193059364,"ppid":1853,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/f0add8e0-d60a-460b-9cfd-21beb5545a6e.json","externalId":"","uuid":"f0add8e0-d60a-460b-9cfd-21beb5545a6e","files":[]}