Skip to content

Commit

Permalink
chore: drop primer-rel8 and PostgreSQL support (#1102)
Browse files Browse the repository at this point in the history
  • Loading branch information
dhess committed Aug 1, 2023
2 parents 12202af + bff2fa3 commit 2234d98
Show file tree
Hide file tree
Showing 37 changed files with 49 additions and 3,392 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ body:
- primer
- primer-api
- primer-service
- primer-rel8
- primer-selda
- primer-benchmark
- Primer language prelude
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ targets = build configure check test bench generate-fixtures docs clean realclea
$(targets):
$(MAKE) -C primer $@
$(MAKE) -C primer-api $@
$(MAKE) -C primer-rel8 $@
$(MAKE) -C primer-selda $@
$(MAKE) -C primer-service $@
$(MAKE) -C primer-benchmark $@
Expand Down
22 changes: 0 additions & 22 deletions bugreport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -244,26 +244,4 @@ else
fi
echo ""

PSQL_COMMAND="$(command -v psql)"
echo "PostgreSQL:"
if ! [ -x "$PSQL_COMMAND" ]; then
echo "psql is not in the PATH."
else
echo "psql path is: " "$PSQL_COMMAND"
PSQL_VERSION=$(psql --version)
echo "psql version is: " "$PSQL_VERSION"
fi
echo ""

COLIMA_COMMAND="$(command -v colima)"
echo "Colima:"
if ! [ -x "$COLIMA_COMMAND" ]; then
echo "colima is not in the PATH."
else
echo "colima path is: " "$COLIMA_COMMAND"
COLIMA_VERSION=$(colima version)
echo "colima version is: " "$COLIMA_VERSION"
fi


exit 0
1 change: 0 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ index-state: 2023-05-20T00:00:00Z
packages:
primer
primer-api
primer-rel8
primer-selda
primer-service
primer-benchmark
Expand Down
20 changes: 3 additions & 17 deletions docs/database.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
# Database ops

We use [Sqitch](https://sqitch.org/about/) to manage our database
schemas, both for PostgreSQL and SQLite. Because these database
engines are quite different, we require separate schemas for each. For
general help on how to use Sqitch and a bit about how it works, see
[the `sqitch` PostgreSQL
tutorial](https://sqitch.org/docs/manual/sqitchtutorial/).

Note: we do not use Sqitch for any PostgreSQL user or group
permissions, nor any database-wide security settings in general. The
reason for this is because we assume that for some
PostgreSQL-compatible cloud database offerings, user provisioning and
security settings may be managed out of band using the cloud
provider's own APIs. Therefore, our Sqitch scripts assume that the
PostgreSQL user who's running the scripts has all the permissions
required to perform any operations included in those scripts, and that
a [secure schema usage
pattern](https://www.postgresql.org/docs/current/ddl-schemas.html#DDL-SCHEMAS-PATTERNS)
has been configured out-of-band.
schemas. For general help on how to use Sqitch and a bit about how it
works, see [the `sqitch` SQLite
tutorial](https://sqitch.org/docs/manual/sqitchtutorial-sqlite/).

The following guide assumes you're running `sqitch` and the
`primer-sqitch` helper script from the `nix develop` shell.
Expand Down
9 changes: 0 additions & 9 deletions docs/developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,3 @@ yourself. `primer-service` doesn't know how to deploy or migrate the
database on its own. See the
[`primer-service-entrypoint.sh`](../nix/pkgs/scripts/primer-service-entrypoint.sh)
shell script for the commands that the Docker entrypoint runs.

## Local development with PostgreSQL

In addition to SQLite, `primer-service` also supports PostgreSQL for
its program store. Though we recommend using SQLite for local
development due to its much simpler setup, we do provide a collection
of Nix-based tooling to make local PostgreSQL development as easy as
we can. See the [PostgreSQL development documentation](postgresql.md)
for details.
1 change: 0 additions & 1 deletion docs/development-guide-toc.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@ the various packages' Haddocks.
## Advanced or specialized topics

* [Primitives](primitives.md)
* [Developing Primer with PostgreSQL](postgresql.md)
* [Database ops](database.md)
* [Benchmarking](benchmarking.md)
183 changes: 0 additions & 183 deletions docs/postgresql.md

This file was deleted.

6 changes: 2 additions & 4 deletions docs/project-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,8 @@ together implement a Primer language service:
the two evaluators, and an API that exposes these features to other
Haskell programs.

* `primer-rel8` and `primer-selda` implement, respectively,
[PostgreSQL](https://www.postgresql.org) and
[SQLite](https://www.sqlite.org/) database bindings for the Primer
language server's program store.
* `primer-selda` implements [SQLite](https://www.sqlite.org/) database
bindings for the Primer language server's program store.

* `primer-service` adapts the `primer` Haskell API to an HTTP API
(actually, [two different HTTP API's](http-apis.md)), so that it can
Expand Down
Loading

0 comments on commit 2234d98

Please sign in to comment.