Skip to content

Commit 39e9ec4

Browse files
committed
Merge #436 - Fix #431 - management of ALTER USER when used with IDENTIFIED WITH/VIA/BY option
Pull-request: #436 Fixes: #431 Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents 55be476 + 5eff781 commit 39e9ec4

31 files changed

Lines changed: 798 additions & 9 deletions

src/Components/AlterOperation.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,14 @@ class AlterOperation extends Component
159159
1,
160160
'var',
161161
],
162-
'BY' => [
162+
163+
'IDENTIFIED VIA' => [
163164
2,
164-
'expr',
165+
'var',
166+
],
167+
'IDENTIFIED WITH' => [
168+
2,
169+
'var',
165170
],
166171
'PASSWORD' => [
167172
2,
@@ -172,6 +177,11 @@ class AlterOperation extends Component
172177
'var',
173178
],
174179

180+
'BY' => [
181+
4,
182+
'expr',
183+
],
184+
175185
'ACCOUNT' => 1,
176186
'DEFAULT' => 1,
177187

src/Contexts/ContextMariaDb100000.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ class ContextMariaDb100000 extends Context
205205
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
206206
'SPATIAL INDEX' => 23,
207207
'FULLTEXT INDEX' => 23,
208+
'IDENTIFIED WITH' => 23,
208209

209210
'X' => 33, 'Y' => 33,
210211
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMariaDb100100.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ class ContextMariaDb100100 extends Context
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218218
'FULLTEXT INDEX' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMariaDb100200.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ class ContextMariaDb100200 extends Context
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218218
'FULLTEXT INDEX' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMariaDb100300.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ class ContextMariaDb100300 extends Context
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218218
'FULLTEXT INDEX' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMariaDb100400.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ class ContextMariaDb100400 extends Context
215215
'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218-
'FULLTEXT INDEX' => 23,
218+
'FULLTEXT INDEX' => 23, 'IDENTIFIED VIA' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMariaDb100500.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ class ContextMariaDb100500 extends Context
215215
'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218-
'FULLTEXT INDEX' => 23,
218+
'FULLTEXT INDEX' => 23, 'IDENTIFIED VIA' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMariaDb100600.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ class ContextMariaDb100600 extends Context
215215
'FOREIGN KEY' => 23, 'PRIMARY KEY' => 23, 'SPATIAL KEY' => 23,
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218-
'FULLTEXT INDEX' => 23,
218+
'FULLTEXT INDEX' => 23, 'IDENTIFIED VIA' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMySql50700.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ class ContextMySql50700 extends Context
216216
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
217217
'SPATIAL INDEX' => 23,
218218
'FULLTEXT INDEX' => 23,
219+
'IDENTIFIED WITH' => 23,
219220

220221
'X' => 33, 'Y' => 33,
221222
'LN' => 33, 'PI' => 33,

src/Contexts/ContextMySql80000.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ class ContextMySql80000 extends Context
217217
'FULLTEXT KEY' => 23, 'UNIQUE INDEX' => 23,
218218
'SPATIAL INDEX' => 23,
219219
'FULLTEXT INDEX' => 23,
220+
'IDENTIFIED WITH' => 23,
220221

221222
'X' => 33, 'Y' => 33,
222223
'LN' => 33, 'PI' => 33,

0 commit comments

Comments
 (0)