Merge branch 'main' into main

mimkes · web-flow · commit 2360c2b39445 · 2023-09-21T17:35:38.000+02:00
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -96,7 +96,7 @@ are okay.
 
 This update is run ~~weekly or~~ on demand.
 
-### 03 Maintain: Update Pacakge Cache (update-cache.yaml)
+### 03 Maintain: Update Package Cache (update-cache.yaml)
 
 For lessons that have generated content, we use {renv} to ensure that the output
 is stable. This is controlled by a single lockfile which documents the packages
diff --git a/.github/workflows/sandpaper-version.txt b/.github/workflows/sandpaper-version.txt
@@ -1 +1 @@
-0.11.15
+0.13.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -26,12 +26,13 @@ introduce yourself and to meet some of our community members.
 
 2. If you have a [GitHub][github] account, or are willing to [create
    one][github-join], but do not know how to use Git, you can report problems
-   or suggest improvements by [creating an issue][issues]. This allows us to
-   assign the item to someone and to respond to it in a threaded discussion.
+   or suggest improvements by [creating an issue][repo-issues]. This allows us
+   to assign the item to someone and to respond to it in a threaded discussion.
 
 3. If you are comfortable with Git, and would like to add or change material,
    you can submit a pull request (PR). Instructions for doing this are
-   [included below](#using-github).
+   [included below](#using-github). For inspiration about changes that need to
+   be made, check out the [list of open issues][issues] across the Carpentries.
 
 Note: if you want to build the website locally, please refer to [The Workbench
 documentation][template-doc].
@@ -49,8 +50,8 @@ There are many ways to contribute, from writing new exercises and improving
 existing ones to updating or filling in the documentation and submitting [bug
 reports][issues] about things that do not work, are not clear, or are missing.
 If you are looking for ideas, please see [the list of issues for this
-repository][repo], or the issues for [Data Carpentry][dc-issues], [Library
-Carpentry][lc-issues], and [Software Carpentry][swc-issues] projects.
+repository][repo-issues], or the issues for [Data Carpentry][dc-issues],
+[Library Carpentry][lc-issues], and [Software Carpentry][swc-issues] projects.
 
 Comments on issues and reviews of pull requests are just as welcome: we are
 smarter together than we are on our own. **Reviews from novices and newcomers
@@ -101,7 +102,8 @@ community listed at <https://carpentries.org/connect/> including via social
 media, slack, newsletters, and email lists. You can also [reach us by
 email][contact].
 
-[repo]: https://example.com/FIXME
+[repo]: https://github.com/LibraryCarpentry/lc-sql
+[repo-issues]: https://github.com/LibraryCarpentry/lc-sql/issues
 [contact]: mailto:team@carpentries.org
 [cp-site]: https://carpentries.org/
 [dc-issues]: https://github.com/issues?q=user%3Adatacarpentry
@@ -111,7 +113,7 @@ email][contact].
 [github]: https://github.com
 [github-flow]: https://guides.github.com/introduction/flow/
 [github-join]: https://github.com/join
-[how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
+[how-contribute]: https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github
 [issues]: https://carpentries.org/help-wanted-issues/
 [lc-issues]: https://github.com/issues?q=user%3ALibraryCarpentry
 [swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
diff --git a/episodes/02-selecting-sorting-data.md b/episodes/02-selecting-sorting-data.md
@@ -41,7 +41,7 @@ In the first query above, we have capitalized the words `SELECT` and `FROM` beca
 
 Example:
 
-```
+```sql
 SELECT Title, Authors, ISSNs, Year
 FROM Articles;
 ```
diff --git a/episodes/04-ordering-commenting.md b/episodes/04-ordering-commenting.md
@@ -72,9 +72,11 @@ their effects as we went along.  For complex queries, this is a good strategy, t
 
 When the queries become more complex, it can be useful to add comments to express to yourself, or to others, what you are doing with your query. Comments help explain the logic of a section and provide context for anyone reading the query. It's essentially a way of making notes within your SQL. In SQL, comments begin using <code class="language-plaintext highlighter-rouge">\--</code> and end at the end of the line. To mark a whole paragraph as a comment, you can enclose it with the characters /\* and \*/. For example, a commented version of the above query can be written as:
 
-```
-/*In this section, even though JOINS (see link below this code block) are not introduced until Episode 6, we want to give an example how to
-join multiple tables becasue they represent a good example of using comments in SQL to explain more complex queries.*/
+```sql
+/*In this section, even though JOINS (see link below this code block)
+are not introduced until Episode 6, we want to give an example how to
+join multiple tables because they represent a good example of using
+comments in SQL to explain more complex queries.*/
 
 -- First we mention all the fields we want to display
 SELECT articles.Title, articles.First_Author, journals.Journal_Title, publishers.Publisher
diff --git a/episodes/06-joins-aliases.md b/episodes/06-joins-aliases.md
@@ -107,7 +107,7 @@ ON publishers.id = journals.PublisherId;
 
 :::::::::::::::::::::::::::::::::::::::  challenge
 
-## Challenge:
+## Challenge
 
 Write a query that returns the `Journal_Title`, `Publisher` name, and number of
 articles published, ordered by number of articles in descending order.
diff --git a/episodes/08-database-design.md b/episodes/08-database-design.md
@@ -76,7 +76,7 @@ Conceptually, we know that a journal has only one publisher but a publisher can
 
 ## More Terminology
 
-The degree of relationship between entities is known as their 'cardinality'. Using the journals-publishers example, the 'publisheres' tble contains a primary key (PK) called 'id'. When the PK is used to create a connection between the original table and a different table, it is called a foreign key (FK) in the other table. To follow the example, we see a field in the 'journal' table called PublisherID that contains the values from the 'id' field in the 'publisher' table, connected the two tables.
+The degree of relationship between entities is known as their 'cardinality'. Using the journals-publishers example, the 'publishers' table contains a primary key (PK) called 'id'. When the PK is used to create a connection between the original table and a different table, it is called a foreign key (FK) in the other table. To follow the example, we see a field in the 'journal' table called PublisherID that contains the values from the 'id' field in the 'publisher' table, connecting the two tables.
 
 There are 4 main types of relationships between tables:
 
diff --git a/episodes/09-create.md b/episodes/09-create.md
@@ -175,7 +175,7 @@ stored in any particular order.)
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
-Adaped from the Software Carpentry Course "Databases and SQL", Chapter 9. 'Creating and Modifying Data'.
+Adapted from the Software Carpentry Course "Databases and SQL", Chapter 9. 'Creating and Modifying Data'.
 <https://swcarpentry.github.io/sql-novice-survey/09-create>
 
 :::::::::::::::::::::::::::::::::::::::: keypoints
diff --git a/index.md b/index.md
@@ -2,4 +2,4 @@
 site: sandpaper::sandpaper_site
 ---
 
-This Library Carpentry lesson introduces librarians to relational database management system using SQLite. At the conclusion of the lesson you will: understand what SQLite does; use SQLite to summarise and link data.
+This Library Carpentry lesson introduces librarians to relational database management system using SQLite. At the conclusion of the lesson you will: understand what SQLite does; use SQLite to summarise and link data.
diff --git a/learners/discuss.md b/learners/discuss.md
@@ -5,7 +5,7 @@ title: Discussion
 There are many ways to discuss Library Carpentry lessons:
 
 - Join our [Gitter discussion forum](https://gitter.im/LibraryCarpentry/).
-- Join our [Slack organisation](https://swc-slack-invite.herokuapp.com/) and #libraries channel.
+- Join our [Slack organisation](https://slack-invite.carpentries.org/) and #libraries channel.
 - Stay in touch with our [Topicbox Group](https://carpentries.topicbox.com/groups/discuss-library-carpentry).
 - Follow updates on [Twitter](https://twitter.com/LibCarpentry).
 - Make a suggestion or correct an error by [raising an Issue](https://github.com/LibraryCarpentry/lc-sql/issues) or [submitting a pull request](https://github.com/LibraryCarpentry/lc-sql/pulls).
diff --git a/learners/reference.md b/learners/reference.md
@@ -8,28 +8,28 @@ title: 'SQL Cheat Sheet'
 
 ### Basic query
 
-```
+```sql
 SELECT column_names
 FROM table_name;
 ```
 
 - selects only the specified columns from a table.
 
-```
+```sql
 SELECT * 
 FROM table_name;
 ```
 
 - select all of the columns in a table.
 
-```
-SELECT DINSTINCT column_name 
+```sql
+SELECT DISTINCT column_name 
 FROM table_name;
 ```
 
 - selects only the unique values from a table.
 
-```
+```sql
 SELECT column_names
 FROM table_name
 WHERE column_name operator value;
@@ -39,15 +39,15 @@ WHERE column_name operator value;
 - you can use operators `=`,`<`,`>`, etc
 - you can also combine tests using `AND`, `OR` in the WHERE clause.
 
-```
+```sql
 SELECT column_names
 FROM table_name
 WHERE column_name IN (value1, value2, value3);
 ```
 
 - selects only the data where column\_name equals to `value1`, `value2`, and so on.
 
-```
+```sql
 SELECT column_names
 FROM table_name
 ORDER BY column_name ASC;
@@ -59,7 +59,7 @@ ORDER BY column_name ASC;
 
 ### Aggregation
 
-```
+```sql
 SELECT aggregate_function(column_name)
 FROM table_name;
 ```
@@ -68,7 +68,7 @@ FROM table_name;
 - E.g. `SELECT COUNT(*) FROM table_name` will display the total number of records.
 - You can use aggregate functions `COUNT`, `SUM`, `MAX`, `MIN`, `AVG`.
 
-```
+```sql
 SELECT column_name, aggregate_function(column_name)
 FROM table_name
 WHERE column_name operator value
@@ -77,7 +77,7 @@ GROUP BY column_name;
 
 - `GROUP BY` tells SQL what field or fields we want to use to aggregate the data. If we want to group by multiple fields, we give `GROUP BY` a comma separated list.
 
-```
+```sql
 SELECT column_name, aggregate_function(column_name)
 FROM table_name
 GROUP BY column_name
@@ -90,7 +90,7 @@ HAVING aggregate_function(column_name) operator value;
 
 ### Joins and aliases
 
-```
+```sql
 SELECT column_names
 FROM table_name1
 JOIN table_name2 
@@ -100,7 +100,7 @@ ON table_name1.column_name = table_name2.column_name;
 - Combine data from two tables where the values of column\_name in the two tables are the same.
 - Instead of `ON`, you can use the `USING` keyword as a shorthand. E.g. `USING (coolumn_name)`.
 
-```
+```sql
 SELECT alias1.column_name1, alias1.column_name2, alias2.column_name3
 FROM table_name1 AS alias1
 JOIN table_name2 AS alias2
@@ -114,7 +114,7 @@ ON alias1.column_name = alias2.column_name;
 
 ### Saving queries
 
-```
+```sql
 CREATE VIEW viewname AS
 SELECT column_names
 FROM table_name;
@@ -126,7 +126,7 @@ FROM table_name;
 
 ### Commenting
 
-```
+```sql
 -- Select all columns
 SELECT * 
 -- From the table_name
diff --git a/learners/setup.md b/learners/setup.md
@@ -15,7 +15,7 @@ Note: on Windows, the PortableApp download is recommended as the regular version
 To import data, you'll need to open DB Browser for SQLite and download a zip file containing the data files for this tutorial.
 
 1. Download the data files doaj-article-sample.zip from
-  [Zenodo](https://doi.org/10.5281/zenodo.2822005).
+  [Zenodo](https://doi.org/10.5281/zenodo.8360812).
 2. Open the zip file with the zip utlity on your machine and save the folder and files to a location where you can easily find them. For example, your Desktop.
 3. Contained in the zip file are two files, doaj-article-sample.db and doaj-article-sample.db.sql. You can either open the database file (less steps) or import the SQL file (more steps).
 
