Skip to content

Commit c43b14c

Browse files
committed
Merge branch 'main' into release-v1.3
2 parents c720fd5 + bb6f50b commit c43b14c

File tree

301 files changed

+5199
-11613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+5199
-11613
lines changed

.github/workflows/community_extension_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
unzip generated_md.zip
3030
cp build/docs/*.md community_extensions/extensions/.
31-
# TODO: re-enable this line cp build/docs/extensions_list.md.tmp _includes/list_of_community_extensions.md
31+
cp build/docs/extensions_list.md.tmp _includes/list_of_community_extensions.md
3232
rm -r generated_md.zip
3333
rm -rf build
3434

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ Some of this style guide is automated with GitHub Actions, but feel free to run
9494
* Use **4 spaces** for indentation.
9595
* Use uppercase SQL keywords, e.g., `SELECT 42 AS x, 'hello world' AS y FROM ...;`.
9696
* Use lowercase function names, e.g., `SELECT cos(pi()), date_part('year', DATE '1992-09-20');`.
97-
* Use snake case (lowercase with underscore separators) for table and column names, e.g. `SELECT departure_time FROM train_services;`
98-
* Add spaces around commas and operators, e.g. `SELECT FROM tbl WHERE x > 42;`.
97+
* Use snake case (lowercase with underscore separators) for table and column names, e.g., `SELECT departure_time FROM train_services;`
98+
* Add spaces around commas and operators, e.g., `SELECT FROM tbl WHERE x > 42;`.
9999
* Add a semicolon to the end of each SQL statement, e.g., `SELECT 42 AS x;`.
100100
* Commas should be placed at the end of each line.
101-
* _Do not_ add clauses or expressions purely for aligning lines. For exampe, avoid adding `WHERE 1 = 1` and `WHERE true`.
101+
* _Do not_ add clauses or expressions purely for aligning lines. For example, avoid adding `WHERE 1 = 1` and `WHERE true`.
102102
* _Do not_ include the DuckDB prompt. For example, avoid the following: `D SELECT 42;`.
103103
* Employing DuckDB's syntax extensions, e.g., the [`FROM-first` syntax](https://duckdb.org/docs/sql/query_syntax/from) and [`GROUP BY ALL`](https://duckdb.org/docs/sql/query_syntax/groupby#group-by-all), is allowed but use them sparingly when introducing new features.
104104
* The returned tables should be formatted using the DuckDB CLI's markdown mode (`.mode markdown`) and NULL values rendered as `NULL` (`.nullvalue NULL`).
@@ -108,7 +108,7 @@ Some of this style guide is automated with GitHub Actions, but feel free to run
108108
Error: Constraint Error: Duplicate key "i: 1" violates primary key constraint.
109109
```
110110
````
111-
* To specify placeholders (or template-style code), use the left angle and right angle characters, `` and ``. These will be highlighted in red and typeset in monospace bold italic to draw the reader's attention to them.
111+
* To specify placeholders (or template-style code), use the left angle and right angle characters, `` and ``. These will be highlighted in red and typeset with a bold monospace font to draw the reader's attention to them.
112112
* For example, you could write: To create a table from a Parquet file, run: `CREATE TABLE ⟨your_table_name⟩ AS FROM '⟨your_filename⟩.parquet'`.
113113
* Copy the characters from here: `⟨⟩`.
114114
* These characters are known in LaTeX code as `\langle` and `\rangle`.
@@ -178,7 +178,7 @@ FROM duckdb_functions()
178178
WHERE categories != [];
179179
```
180180

181-
All data (e.g. parameter names, descriptions, examples) comes from the output of `duckdb_functions()`. Any deviations (exclusion, additions or overrides), need to be hardcoded in the script [`generate_sql_function_docs.py`](scripts/generate_sql_function_docs.py) via variables `OVERRIDES` and `EXCLUDES`.
181+
All data (e.g., parameter names, descriptions, examples) comes from the output of `duckdb_functions()`. Any deviations (exclusion, additions or overrides), need to be hardcoded in the script [`generate_sql_function_docs.py`](scripts/generate_sql_function_docs.py) via variables `OVERRIDES` and `EXCLUDES`.
182182

183183
Example: `blob.md`
184184

Gemfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GIT
1010

1111
GIT
1212
remote: https://github.com/duckdb/rouge.git
13-
revision: fa0482c677f38c5b1796d04d84f263178f84c1dd
13+
revision: 1af85d39e38d6dfb2f51f11ba106b97466d1ea76
1414
branch: duckdb
1515
specs:
1616
rouge (3.3823.1)
@@ -40,7 +40,7 @@ GEM
4040
ffi (>= 1.15.0)
4141
eventmachine (1.2.7)
4242
execjs (2.10.0)
43-
faraday (2.13.0)
43+
faraday (2.13.1)
4444
faraday-net_http (>= 2.0, < 3.5)
4545
json
4646
logger
@@ -167,7 +167,7 @@ GEM
167167
nokogiri (~> 1.12)
168168
jekyll-watch (2.2.1)
169169
listen (~> 3.0)
170-
json (2.10.2)
170+
json (2.11.3)
171171
kramdown (2.5.1)
172172
rexml (>= 3.3.9)
173173
kramdown-parser-gfm (1.1.0)
@@ -181,15 +181,15 @@ GEM
181181
mini_portile2 (2.8.8)
182182
net-http (0.6.0)
183183
uri
184-
nokogiri (1.18.7)
184+
nokogiri (1.18.8)
185185
mini_portile2 (~> 2.8.2)
186186
racc (~> 1.4)
187187
octokit (4.25.1)
188188
faraday (>= 1, < 3)
189189
sawyer (~> 0.9)
190190
pathutil (0.16.2)
191191
forwardable-extended (~> 2.6)
192-
public_suffix (6.0.1)
192+
public_suffix (6.0.2)
193193
racc (1.8.1)
194194
rake (13.2.1)
195195
rb-fsevent (0.11.2)
@@ -199,7 +199,7 @@ GEM
199199
safe_yaml (1.0.5)
200200
sass (3.7.4)
201201
sass-listen (~> 4.0.0)
202-
sass-embedded (1.86.3)
202+
sass-embedded (1.87.0)
203203
google-protobuf (~> 4.30)
204204
rake (>= 13)
205205
sass-listen (4.0.0)

_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ preview_short_duckdb_version: "1.4-dev"
2525
current_duckdb_version: 1.2.2
2626
current_duckdb_hash: "7c039464e4"
2727
current_snapshot_version: 1.2.3-dev
28-
current_duckdb_odbc_version: 1.2.2.1
28+
current_duckdb_odbc_version: 1.2.2.2
2929
current_duckdb_odbc_short_version: 1.2.2
3030
current_duckdb_go_version: 1.2.2
3131
current_duckdb_node_neo_version: 1.2.2
3232
current_duckdb_nodejs_version: 1.2.1
33-
current_duckdb_r_version: 1.2.1
33+
current_duckdb_r_version: 1.2.2
3434
current_duckdb_rust_version: 1.2.2
3535
current_duckdb_wasm_version: 1.2.2
3636
current_duckdb_csharp_version: 1.2.1

_data/menu_docs_preview.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,10 @@
785785
{
786786
"page": "Subqueries",
787787
"url": "subqueries"
788+
},
789+
{
790+
"page": "TRY",
791+
"url": "try"
788792
}
789793
]
790794
},
@@ -866,7 +870,7 @@
866870
},
867871
{
868872
"page": "Text Functions",
869-
"url": "char"
873+
"url": "text"
870874
},
871875
{
872876
"page": "Time Functions",
@@ -982,14 +986,6 @@
982986
"page": "Overview",
983987
"url": "overview"
984988
},
985-
{
986-
"page": "Core Extensions",
987-
"url": "core_extensions"
988-
},
989-
{
990-
"page": "Community Extensions",
991-
"url": "community_extensions"
992-
},
993989
{
994990
"page": "Installing Extensions",
995991
"url": "installing_extensions"
@@ -1009,7 +1005,13 @@
10091005
{
10101006
"page": "Troubleshooting of Extensions",
10111007
"url": "troubleshooting"
1012-
},
1008+
}
1009+
]
1010+
},
1011+
{
1012+
"page": "Core Extensions",
1013+
"slug": "core_extensions",
1014+
"subfolderitems": [
10131015
{
10141016
"page": "AutoComplete",
10151017
"url": "autocomplete"
@@ -1030,6 +1032,10 @@
10301032
"page": "Delta",
10311033
"url": "delta"
10321034
},
1035+
{
1036+
"page": "Encodings",
1037+
"url": "encodings"
1038+
},
10331039
{
10341040
"page": "Excel",
10351041
"url": "excel"
@@ -1377,6 +1383,10 @@
13771383
{
13781384
"page": "Benchmarks",
13791385
"url": "benchmarks"
1386+
},
1387+
{
1388+
"page": "Working with Huge Databases",
1389+
"url": "working_with_huge_databases"
13801390
}
13811391
]
13821392
},

0 commit comments

Comments
 (0)