Skip to content

Commit 3f9a95a

Browse files
williamdeswilliamdes
committed
Merge branch 'master' into 6.0.x
Signed-off-by: William Desportes <[email protected]>
2 parents c571579 + de4416b commit 3f9a95a

File tree

11 files changed

+57
-102
lines changed

11 files changed

+57
-102
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,17 @@ jobs:
1616
continue-on-error: ${{ matrix.experimental }}
1717
strategy:
1818
matrix:
19-
php-version: ["7.2", "7.3", "7.4", "8.0"]
19+
php-version: ["7.2", "7.3", "7.4", "8.0", "8.1"]
2020
os: [ubuntu-latest]
2121
experimental: [false]
2222
composer-options: ['']
2323
include:
24-
- { php-version: '8.1', experimental: false, os: ubuntu-latest, composer-options: '--ignore-platform-reqs' }
2524
- { php-version: 'nightly', experimental: true, os: ubuntu-latest, composer-options: '--ignore-platform-reqs' }
2625
steps:
2726
- uses: actions/checkout@v2
27+
with:
28+
# Fetch some commits for Scrutinizer coverage upload
29+
fetch-depth: 15
2830
- name: Use PHP ${{ matrix.php-version }}
2931
uses: shivammathur/setup-php@v2
3032
with:
@@ -55,7 +57,7 @@ jobs:
5557
uses: codecov/codecov-action@v1
5658
- name: Send coverage to Scrutinizer
5759
uses: sudo-bot/action-scrutinizer@latest
58-
# Upload can fail on forks
59-
continue-on-error: true
60+
# Do not run this step on forked versions of the main repository (example: contributor forks)
61+
if: github.repository == 'phpmyadmin/sql-parser'
6062
with:
61-
cli-args: "--format=php-clover build/logs/clover.xml"
63+
cli-args: "--format=php-clover build/logs/clover.xml --revision=${{ github.event.pull_request.head.sha || github.sha }}"

‎locale/de/LC_MESSAGES/sqlparser.mo‎

301 Bytes
Binary file not shown.

‎locale/de/LC_MESSAGES/sqlparser.po‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ msgstr ""
44
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
55
"Report-Msgid-Bugs-To: [email protected]\n"
66
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
7-
"PO-Revision-Date: 2020-04-09 07:25+0000\n"
8-
"Last-Translator: Predatorix Phoenix <[email protected]>\n"
9-
"Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/sql-"
10-
"parser/de/>\n"
7+
"PO-Revision-Date: 2022-03-19 21:46+0000\n"
8+
"Last-Translator: Justin Nogossek <[email protected]>\n"
9+
"Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/"
10+
"sql-parser/de/>\n"
1111
"Language: de\n"
1212
"MIME-Version: 1.0\n"
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=2; plural=n != 1;\n"
16-
"X-Generator: Weblate 4.0-dev\n"
16+
"X-Generator: Weblate 4.12-dev\n"
1717

1818
#: src/Component.php:42 src/Component.php:62
1919
msgid "Not implemented yet."
@@ -252,28 +252,20 @@ msgid "Unexpected keyword"
252252
msgstr "Unerwartetes Schlüsselwort"
253253

254254
#: src/Statements/WithStatement.php:119
255-
#, fuzzy
256-
#| msgid "The name of the entity was expected."
257255
msgid "The name of the CTE was expected."
258-
msgstr "Der Name der Entität wurde erwartet."
256+
msgstr "Der Name des CTE wurde erwartet."
259257

260258
#: src/Statements/WithStatement.php:138
261-
#, fuzzy
262-
#| msgid "A \"RETURNS\" keyword was expected."
263259
msgid "AS keyword was expected."
264-
msgstr "Ein „RETURNS“-Schlüsselwort wurde erwartet."
260+
msgstr "Das Schlüsselwort AS wurde erwartet."
265261

266262
#: src/Statements/WithStatement.php:154
267-
#, fuzzy
268-
#| msgid "The name of the entity was expected."
269263
msgid "Subquery of the CTE was expected."
270-
msgstr "Der Name der Entität wurde erwartet."
264+
msgstr "Es wurde eine Unterabfrage des CTE erwartet."
271265

272266
#: src/Statements/WithStatement.php:271
273-
#, fuzzy
274-
#| msgid "Unexpected end of LOCK statement."
275267
msgid "Unexpected end of the WITH CTE."
276-
msgstr "Unerwartetes Ende einer LOCK-Anweisung."
268+
msgstr "Unerwartetes Ende des WITH CTE."
277269

278270
#~ msgid "error #1"
279271
#~ msgstr "Fehler #1"

‎locale/it/LC_MESSAGES/sqlparser.mo‎

1.06 KB
Binary file not shown.

‎locale/it/LC_MESSAGES/sqlparser.po‎

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ msgstr ""
44
"Project-Id-Version: SQL parser 5\n"
55
"Report-Msgid-Bugs-To: [email protected]\n"
66
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
7-
"PO-Revision-Date: 2017-09-09 08:40+0000\n"
8-
"Last-Translator: Dan Ungureanu <udan1107@gmail.com>\n"
9-
"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/sql-"
10-
"parser/it/>\n"
7+
"PO-Revision-Date: 2022-03-21 18:54+0000\n"
8+
"Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
9+
"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
10+
"sql-parser/it/>\n"
1111
"Language: it\n"
1212
"MIME-Version: 1.0\n"
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=2; plural=n != 1;\n"
16-
"X-Generator: Weblate 2.17-dev\n"
16+
"X-Generator: Weblate 4.12-dev\n"
1717

1818
#: src/Component.php:42 src/Component.php:62
1919
msgid "Not implemented yet."
@@ -23,12 +23,12 @@ msgstr "Non ancora implementato."
2323
msgid ""
2424
"A new statement was found, but no delimiter between it and the previous one."
2525
msgstr ""
26-
"E' stato trovato un nuovo statement, ma c'è alcun delimitatore tra questo "
26+
"E' stato trovato un nuovo statement, ma non c'è alcun delimitatore tra il "
2727
"nuovo statement e il precedente."
2828

2929
#: src/Components/AlterOperation.php:358
3030
msgid "Missing comma before start of a new alter operation."
31-
msgstr ""
31+
msgstr "Virgola assente prima dell'inizio di una nuova operazione alter."
3232

3333
#: src/Components/AlterOperation.php:368
3434
msgid "Unrecognized alter operation."
@@ -69,25 +69,21 @@ msgid "Unexpected end of CASE expression"
6969
msgstr "Inattesa fine dell'espressione CASE"
7070

7171
#: src/Components/CaseExpression.php:215
72-
#, fuzzy
73-
#| msgid "Unexpected end of CASE expression"
7472
msgid "Potential duplicate alias of CASE expression."
75-
msgstr "Inattesa fine dell'espressione CASE"
73+
msgstr "Potenziale alias duplicato dell'espressione CASE."
7674

7775
#: src/Components/CaseExpression.php:228
7876
msgid "An alias expected after AS but got "
79-
msgstr ""
77+
msgstr "Atteso un alias dopo AS ma trovato "
8078

8179
#: src/Components/CaseExpression.php:241 src/Components/Expression.php:353
8280
#: src/Components/Expression.php:373 src/Components/Expression.php:408
8381
msgid "An alias was previously found."
8482
msgstr "Un alias è stato trovato precedentemente."
8583

8684
#: src/Components/CaseExpression.php:255
87-
#, fuzzy
88-
#| msgid "An alias was expected."
8985
msgid "An alias was expected after AS."
90-
msgstr "Era atteso un alias."
86+
msgstr "Era atteso un alias dopo AS."
9187

9288
#: src/Components/CreateDefinition.php:254
9389
msgid ""
@@ -145,16 +141,12 @@ msgid "An offset was expected."
145141
msgstr "Era atteso un offset."
146142

147143
#: src/Components/LockExpression.php:94
148-
#, fuzzy
149-
#| msgid "Unexpected end of CASE expression"
150144
msgid "Unexpected end of LOCK expression."
151-
msgstr "Inattesa fine dell'espressione CASE"
145+
msgstr "Inattesa fine dell'espressione LOCK."
152146

153147
#: src/Components/LockExpression.php:204
154-
#, fuzzy
155-
#| msgid "Unexpected end of CASE expression"
156148
msgid "Unexpected end of Lock expression."
157-
msgstr "Inattesa fine dell'espressione CASE"
149+
msgstr "Inattesa fine dell'espressione Lock."
158150

159151
#: src/Components/OptionsArray.php:151
160152
#, php-format
@@ -251,40 +243,28 @@ msgid "This type of clause is not valid in Multi-table queries."
251243
msgstr "Questo tipo di clausola non è valida nelle query Multi-tabella."
252244

253245
#: src/Statements/LockStatement.php:123
254-
#, fuzzy
255-
#| msgid "Unexpected beginning of statement."
256246
msgid "Unexpected end of LOCK statement."
257-
msgstr "Inizio di statement inatteso."
247+
msgstr "Inattesa fine dello statement LOCK."
258248

259249
#: src/Statements/PurgeStatement.php:141
260-
#, fuzzy
261-
#| msgid "Unexpected keyword."
262250
msgid "Unexpected keyword"
263-
msgstr "Keyword inaspettata."
251+
msgstr "Keyword inaspettata"
264252

265253
#: src/Statements/WithStatement.php:119
266-
#, fuzzy
267-
#| msgid "The name of the entity was expected."
268254
msgid "The name of the CTE was expected."
269-
msgstr "Era atteso il nome dell'entity."
255+
msgstr "Era atteso il nome della CTE."
270256

271257
#: src/Statements/WithStatement.php:138
272-
#, fuzzy
273-
#| msgid "A \"RETURNS\" keyword was expected."
274258
msgid "AS keyword was expected."
275-
msgstr "Era attesa una parola chiave \"RETURNS\"."
259+
msgstr "Era attesa la parola chiave AS."
276260

277261
#: src/Statements/WithStatement.php:154
278-
#, fuzzy
279-
#| msgid "The name of the entity was expected."
280262
msgid "Subquery of the CTE was expected."
281-
msgstr "Era atteso il nome dell'entity."
263+
msgstr "Era attesa una subquery della CTE."
282264

283265
#: src/Statements/WithStatement.php:271
284-
#, fuzzy
285-
#| msgid "Unexpected beginning of statement."
286266
msgid "Unexpected end of the WITH CTE."
287-
msgstr "Inizio di statement inatteso."
267+
msgstr "Inattesa fine dell'espressione WITH CTE."
288268

289269
#~ msgid "error #1"
290270
#~ msgstr "errore #1"

‎locale/nl/LC_MESSAGES/sqlparser.mo‎

313 Bytes
Binary file not shown.

‎locale/nl/LC_MESSAGES/sqlparser.po‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ msgstr ""
44
"Project-Id-Version: SQL parser 5\n"
55
"Report-Msgid-Bugs-To: [email protected]\n"
66
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
7-
"PO-Revision-Date: 2020-06-16 13:41+0000\n"
7+
"PO-Revision-Date: 2022-03-14 11:58+0000\n"
88
"Last-Translator: dingo thirteen <[email protected]>\n"
9-
"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/sql-"
10-
"parser/nl/>\n"
9+
"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/"
10+
"sql-parser/nl/>\n"
1111
"Language: nl\n"
1212
"MIME-Version: 1.0\n"
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=2; plural=n != 1;\n"
16-
"X-Generator: Weblate 4.1.1-dev\n"
16+
"X-Generator: Weblate 4.12-dev\n"
1717

1818
#: src/Component.php:42 src/Component.php:62
1919
msgid "Not implemented yet."
@@ -251,28 +251,20 @@ msgid "Unexpected keyword"
251251
msgstr "Onverwacht sleutelwoord"
252252

253253
#: src/Statements/WithStatement.php:119
254-
#, fuzzy
255-
#| msgid "The name of the entity was expected."
256254
msgid "The name of the CTE was expected."
257-
msgstr "De naam van de entiteit werd verwacht."
255+
msgstr "De naam van de CTE werd verwacht."
258256

259257
#: src/Statements/WithStatement.php:138
260-
#, fuzzy
261-
#| msgid "A \"RETURNS\" keyword was expected."
262258
msgid "AS keyword was expected."
263-
msgstr "Een \"RETURNS\" sleutelwoord werd verwacht."
259+
msgstr "Het AS sleutelwoord werd verwacht."
264260

265261
#: src/Statements/WithStatement.php:154
266-
#, fuzzy
267-
#| msgid "The name of the entity was expected."
268262
msgid "Subquery of the CTE was expected."
269-
msgstr "De naam van de entiteit werd verwacht."
263+
msgstr "Subquery van de CTE werd verwacht."
270264

271265
#: src/Statements/WithStatement.php:271
272-
#, fuzzy
273-
#| msgid "Unexpected end of LOCK statement."
274266
msgid "Unexpected end of the WITH CTE."
275-
msgstr "Onverwacht einde van LOCK opdracht."
267+
msgstr "Onverwacht einde van WITH CTE opdracht."
276268

277269
#~ msgid "error #1"
278270
#~ msgstr "fout #1"

‎locale/pl/LC_MESSAGES/sqlparser.mo‎

291 Bytes
Binary file not shown.

‎locale/pl/LC_MESSAGES/sqlparser.po‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ msgstr ""
44
"Project-Id-Version: SQL parser 5\n"
55
"Report-Msgid-Bugs-To: [email protected]\n"
66
"POT-Creation-Date: 2021-12-29 16:13-0300\n"
7-
"PO-Revision-Date: 2021-04-17 13:26+0000\n"
8-
"Last-Translator: WaldiS <[email protected]>\n"
9-
"Language-Team: Polish <https://hosted.weblate.org/projects/phpmyadmin/sql-"
10-
"parser/pl/>\n"
7+
"PO-Revision-Date: 2022-03-10 16:57+0000\n"
8+
"Last-Translator: Michal Biesiada <[email protected]>\n"
9+
"Language-Team: Polish <https://hosted.weblate.org/projects/phpmyadmin/"
10+
"sql-parser/pl/>\n"
1111
"Language: pl\n"
1212
"MIME-Version: 1.0\n"
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
1616
"|| n%100>=20) ? 1 : 2;\n"
17-
"X-Generator: Weblate 4.6-dev\n"
17+
"X-Generator: Weblate 4.12-dev\n"
1818

1919
#: src/Component.php:42 src/Component.php:62
2020
msgid "Not implemented yet."
@@ -26,7 +26,6 @@ msgid ""
2626
msgstr "Znaleziono kolejne polecenie, ale brakuje między nimi rozgranicznika."
2727

2828
#: src/Components/AlterOperation.php:358
29-
#, fuzzy
3029
msgid "Missing comma before start of a new alter operation."
3130
msgstr "Brak przecinka przed rozpoczęciem nowej operacji zmiany."
3231

@@ -74,18 +73,16 @@ msgstr "Potencjalny zduplikowany alias wyrażenia CASE"
7473

7574
#: src/Components/CaseExpression.php:228
7675
msgid "An alias expected after AS but got "
77-
msgstr ""
76+
msgstr "Oczekiwano alias po AS, lecz otrzymano "
7877

7978
#: src/Components/CaseExpression.php:241 src/Components/Expression.php:353
8079
#: src/Components/Expression.php:373 src/Components/Expression.php:408
8180
msgid "An alias was previously found."
8281
msgstr "Wcześniej znaleziono alias."
8382

8483
#: src/Components/CaseExpression.php:255
85-
#, fuzzy
86-
#| msgid "An alias was expected."
8784
msgid "An alias was expected after AS."
88-
msgstr "Oczekiwano aliasu."
85+
msgstr "Oczekiwano aliasu po AS."
8986

9087
#: src/Components/CreateDefinition.php:254
9188
msgid ""

‎locale/zh_CN/LC_MESSAGES/sqlparser.mo‎

422 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)