Skip to content

Commit 6366e35

Browse files
kroggenkroggen
authored
Merge pull request #4 from aergoio/brackets-as-list-delimiters
Use brackets as list delimiters
2 parents e4cfaee + d6e5702 commit 6366e35

8 files changed

Lines changed: 513 additions & 309 deletions

File tree

‎README-ja.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ END;
2121
そして、それを呼び出す方法：
2222

2323
```sql
24-
CALL add_new_sale(ARRAY( ARRAY('DJI Avata',1,1168.00), ARRAY('iPhone 14',1,799.90), ARRAY('iWatch',2,249.99) ));
24+
CALL add_new_sale([['DJI Avata',1,1168.00], ['iPhone 14',1,799.90], ['iWatch',2,249.99]]);
2525
```
2626

2727

@@ -106,7 +106,7 @@ SET @variable = ({SQL command});
106106

107107
```sql
108108
SET @value = 12.5;
109-
SET @arr = ARRAY(11, 2.5, 'hello!', x'6120622063');
109+
SET @arr = [11, 2.5, 'hello!', x'6120622063'];
110110
SET @result = @qty * @price;
111111
SET @name, @price = SELECT name, price FROM products WHERE id = 123;
112112
SET @ids = (SELECT id FROM products WHERE price > 250);
@@ -223,7 +223,7 @@ END LOOP;
223223
```
224224
CREATE OR REPLACE PROCEDURE sum_array() BEGIN
225225
SET @sum = 0;
226-
FOREACH @item IN ARRAY(11,22,33) DO
226+
FOREACH @item IN [11,22,33] DO
227227
SET @sum = @sum + @item;
228228
END LOOP;
229229
RETURN @sum;
@@ -288,22 +288,22 @@ CALL {procedure_name} ([{expression} [, {expression}...]]);
288288

289289
- リテラル値
290290
- 変数
291-
- ARRAYリテラル
291+
- LISTリテラル
292292

293293
いくつかの例を示します：
294294

295295
```sql
296296
CALL compute(11, 22);
297297
CALL compute(@val1, @val2);
298-
CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad',1,2345.90), ARRAY('iwatch',2,499.99) ));
298+
CALL add_new_sale([['iphone 14',1,1234.00], ['ipad',1,2345.90], ['iwatch',2,499.99]]);
299299
```
300300

301301
`CALL`文は、`SELECT`文と同様に、プロシージャによって返される結果を返します。
302302

303303
プロシージャ内で実行すると、返された値を変数に割り当てることができます：
304304

305305
```sql
306-
SET @sale_id = CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad 12',1,2345.90) ));
306+
SET @sale_id = CALL add_new_sale([['iphone 14',1,1234.00], ['ipad 12',1,2345.90]]);
307307
```
308308

309309

‎README-ru.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ END;
2121
И как вызвать её:
2222

2323
```sql
24-
CALL add_new_sale(ARRAY( ARRAY('DJI Avata',1,1168.00), ARRAY('iPhone 14',1,799.90), ARRAY('iWatch',2,249.99) ));
24+
CALL add_new_sale([['DJI Avata',1,1168.00], ['iPhone 14',1,799.90], ['iWatch',2,249.99]]);
2525
```
2626

2727

@@ -107,7 +107,7 @@ SET @variable = ({SQL command});
107107

108108
```sql
109109
SET @value = 12.5;
110-
SET @arr = ARRAY(11, 2.5, 'hello!', x'6120622063');
110+
SET @arr = [11, 2.5, 'hello!', x'6120622063'];
111111
SET @result = @qty * @price;
112112
SET @name, @price = SELECT name, price FROM products WHERE id = 123;
113113
SET @ids = (SELECT id FROM products WHERE price > 250);
@@ -209,8 +209,8 @@ END LOOP;
209209

210210
Входные данные могут быть одним из следующих:
211211

212-
- ARRAY литерал
213-
- ARRAY переменная
212+
- LIST литерал
213+
- LIST переменная
214214
- SELECT
215215
- INSERT с RETURNING-клаузой
216216
- UPDATE с RETURNING-клаузой
@@ -219,19 +219,19 @@ END LOOP;
219219

220220
Вот несколько примеров:
221221

222-
* С ARRAY литералом
222+
* С LIST литералом
223223

224224
```
225225
CREATE OR REPLACE PROCEDURE sum_array() BEGIN
226226
SET @sum = 0;
227-
FOREACH @item IN ARRAY(11,22,33) DO
227+
FOREACH @item IN [11,22,33] DO
228228
SET @sum = @sum + @item;
229229
END LOOP;
230230
RETURN @sum;
231231
END
232232
```
233233

234-
* С ARRAY переменной
234+
* С LIST переменной
235235

236236
```
237237
CREATE OR REPLACE PROCEDURE sum_array(@arr) BEGIN
@@ -289,22 +289,22 @@ CALL {procedure_name} ([{expression} [, {expression}...]]);
289289

290290
- литеральное значение
291291
- переменная
292-
- литерал ARRAY
292+
- литерал LIST
293293

294294
Вот несколько примеров:
295295

296296
```sql
297297
CALL compute(11, 22);
298298
CALL compute(@val1, @val2);
299-
CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad',1,2345.90), ARRAY('iwatch',2,499.99) ));
299+
CALL add_new_sale([['iphone 14',1,1234.00], ['ipad',1,2345.90], ['iwatch',2,499.99]]);
300300
```
301301

302302
Оператор `CALL` возвращает результат, возвращаемый процедурой, таким же образом, как оператор `SELECT`.
303303

304304
При выполнении внутри процедуры можно присвоить возвращаемое значение переменной:
305305

306306
```sql
307-
SET @sale_id = CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad 12',1,2345.90) ));
307+
SET @sale_id = CALL add_new_sale([['iphone 14',1,1234.00], ['ipad 12',1,2345.90]]);
308308
```
309309

310310

‎README-zh.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ END;
2121
如何调用它：
2222

2323
```sql
24-
CALL add_new_sale(ARRAY( ARRAY('DJI Avata',1,1168.00), ARRAY('Huawei P50',1,799.90), ARRAY('Xiaomi',2,249.99) ));
24+
CALL add_new_sale([['DJI Avata',1,1168.00], ['Huawei P50',1,799.90], ['Xiaomi',2,249.99]]);
2525
```
2626

2727
## 等等，但是为什么？
@@ -99,7 +99,7 @@ SET @variable = ({SQL command});
9999

100100
```sql
101101
SET @value = 12.5;
102-
SET @arr = ARRAY(11, 2.5, 'hello!', x'6120622063');
102+
SET @arr = [11, 2.5, 'hello!', x'6120622063'];
103103
SET @result = @qty * @price;
104104
SET @name, @price = SELECT name, price FROM products WHERE id = 123;
105105
SET @ids = (SELECT id FROM products WHERE price > 250);
@@ -201,8 +201,8 @@ END LOOP;
201201

202202
输入可以是以下之一：
203203

204-
- ARRAY 字面量
205-
- ARRAY 变量
204+
- LIST 字面量
205+
- LIST 变量
206206
- SELECT
207207
- 带有 RETURNING 子句的 INSERT
208208
- 带有 RETURNING 子句的 UPDATE
@@ -211,19 +211,19 @@ END LOOP;
211211

212212
这里有一些示例：
213213

214-
* 使用 ARRAY 字面量
214+
* 使用 LIST 字面量
215215

216216
```
217217
CREATE OR REPLACE PROCEDURE sum_array() BEGIN
218218
SET @sum = 0;
219-
FOREACH @item IN ARRAY(11,22,33) DO
219+
FOREACH @item IN [11,22,33] DO
220220
SET @sum = @sum + @item;
221221
END LOOP;
222222
RETURN @sum;
223223
END
224224
```
225225

226-
* 使用 ARRAY 变量
226+
* 使用 LIST 变量
227227

228228
```
229229
CREATE OR REPLACE PROCEDURE sum_array(@arr) BEGIN
@@ -281,22 +281,22 @@ CALL {procedure_name} ([{expression} [, {expression}...]]);
281281

282282
- 字面值
283283
- 变量
284-
- ARRAY 字面值
284+
- LIST 字面值
285285

286286
以下是一些示例：
287287

288288
```sql
289289
CALL compute(11, 22);
290290
CALL compute(@val1, @val2);
291-
CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad',1,2345.90), ARRAY('iwatch',2,499.99) ));
291+
CALL add_new_sale([['iphone 14',1,1234.00], ['ipad',1,2345.90], ['iwatch',2,499.99]]);
292292
```
293293

294294
`CALL` 语句以与 `SELECT` 语句相同的方式返回过程返回的结果。
295295

296296
在过程内运行时，可以将返回的值分配给变量：
297297

298298
```sql
299-
SET @sale_id = CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad 12',1,2345.90) ));
299+
SET @sale_id = CALL add_new_sale([['iphone 14',1,1234.00], ['ipad 12',1,2345.90]]);
300300
```
301301

302302

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ END;
2121
And how to call it:
2222

2323
```sql
24-
CALL add_new_sale(ARRAY( ARRAY('DJI Avata',1,1168.00), ARRAY('iPhone 14',1,799.90), ARRAY('iWatch',2,249.99) ));
24+
CALL add_new_sale([['DJI Avata',1,1168.00], ['iPhone 14',1,799.90], ['iWatch',2,249.99]]);
2525
```
2626

2727

@@ -107,7 +107,7 @@ Here are some examples:
107107

108108
```sql
109109
SET @value = 12.5;
110-
SET @arr = ARRAY(11, 2.5, 'hello!', x'6120622063');
110+
SET @arr = [11, 2.5, 'hello!', x'6120622063'];
111111
SET @result = @qty * @price;
112112
SET @name, @price = SELECT name, price FROM products WHERE id = 123;
113113
SET @ids = (SELECT id FROM products WHERE price > 250);
@@ -209,8 +209,8 @@ END LOOP;
209209

210210
The input can be one of the following:
211211

212-
- ARRAY literal
213-
- ARRAY variable
212+
- LIST literal
213+
- LIST variable
214214
- SELECT
215215
- INSERT with RETURNING clause
216216
- UPDATE with RETURNING clause
@@ -219,19 +219,19 @@ The input can be one of the following:
219219

220220
Here are some examples:
221221

222-
* With ARRAY literal
222+
* With LIST literal
223223

224224
```
225225
CREATE OR REPLACE PROCEDURE sum_array() BEGIN
226226
SET @sum = 0;
227-
FOREACH @item IN ARRAY(11,22,33) DO
227+
FOREACH @item IN [11,22,33] DO
228228
SET @sum = @sum + @item;
229229
END LOOP;
230230
RETURN @sum;
231231
END
232232
```
233233

234-
* With ARRAY variable
234+
* With LIST variable
235235

236236
```
237237
CREATE OR REPLACE PROCEDURE sum_array(@arr) BEGIN
@@ -289,22 +289,22 @@ The arguments can be one of the following:
289289

290290
- literal value
291291
- variable
292-
- ARRAY literal
292+
- LIST literal
293293

294294
Here are some examples:
295295

296296
```sql
297297
CALL compute(11, 22);
298298
CALL compute(@val1, @val2);
299-
CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad',1,2345.90), ARRAY('iwatch',2,499.99) ));
299+
CALL add_new_sale([['iphone 14',1,1234.00], ['ipad',1,2345.90], ['iwatch',2,499.99]]);
300300
```
301301

302302
The `CALL` statement returns the result returned by the procedure in the same way as a `SELECT` statement.
303303

304304
When run inside of a procedure, it is possible to assign the returned value to a variable:
305305

306306
```sql
307-
SET @sale_id = CALL add_new_sale(ARRAY( ARRAY('iphone 14',1,1234.00), ARRAY('ipad 12',1,2345.90) ));
307+
SET @sale_id = CALL add_new_sale([['iphone 14',1,1234.00], ['ipad 12',1,2345.90]]);
308308
```
309309

310310

‎sqlite3.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14183,7 +14183,6 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
1418314183
#define TK_ILLEGAL 184
1418414184

1418514185
#define TK_CALL 250
14186-
#define TK_ARRAY 251
1418714186

1418814187
/************** End of parse.h ***********************************************/
1418914188
/************** Continuing where we left off in sqliteInt.h ******************/

0 commit comments

Comments
 (0)