refactor: make Junction non-recursive

[steve-chavez]

While working on #1794, I noticed that we can have recursive Junctions:

postgrest/src/PostgREST/DbStructure/Relation.hs

Lines 43 to 53 in 4b46c4e

	data Link
	= Constraint
	{ constName :: ConstraintName }
	| Junction
	{ junTable :: Table
	, junLink1 :: Link
	, junCols1 :: [Column]
	, junLink2 :: Link
	, junCols2 :: [Column]
	}
	deriving (Eq, Generic, JSON.ToJSON)

Which didn't seem right, as discussed in 5223082#r49568150.

This PR fixes that, also Cardinality now contains the constraint or junction that defines it:

data Cardinality
  = O2M ConstraintName -- ^ one-to-many cardinality
  | M2O ConstraintName -- ^ many-to-one cardinality
  | M2M Junction       -- ^ many-to-many cardinality
  deriving (Eq, Generic, JSON.ToJSON)

That makes sense IMO, it clears up the code in some parts.

[wolfgangwalther]

The new typing is much better than a revert would have been. And also better than all my suggestions before. This also avoids to have a Junction with O2M or something like that. Nice!

I'm not seeing any codecov reports here, yet. Probably because CircleCI was running with your fork when you first uploaded without a PR, @steve-chavez. But didn't you add the codecov token or something like that in your own fork's CircleCI settings to avoid that? I remember we discussed that, at least. Anyway, I will trigger a re-run of the pipeline and then we will see whether how code coverage is with those new types.

[wolfgangwalther]

Anyway, I will trigger a re-run of the pipeline and then we will see whether how code coverage is with those new types.

Only... that I can't seem to do that. Can't find a way to trigger a build for a PR, that doesn't have one, yet. And I can't rerun the pipeline because it's in your workspace, not postgrest.

[wolfgangwalther]

I'm not seeing any codecov reports here, yet. Probably because CircleCI was running with your fork when you first uploaded without a PR, @steve-chavez. But didn't you add the codecov token or something like that in your own fork's CircleCI settings to avoid that? I remember we discussed that, at least. Anyway, I will trigger a re-run of the pipeline and then we will see whether how code coverage is with those new types.

What might have happenend is that Codecov has reverted the token you have set up in your own CircleCI, as a consequence of the security incident.

[wolfgangwalther]

Just had a look at the uncovered lines.

[steve-chavez]

cachix push failed: https://app.circleci.com/pipelines/github/PostgREST/postgrest/917/workflows/e3706800-a3aa-4fac-8a55-2573faf1d726/jobs/8771.

Hm, circle is missing the cachix auth token right?

[wolfgangwalther]

It says:

Binary cache doesn't exist or it's a private cache and you don't have access. Please check the name for typos or provide an auth token.

I remember @monacoremo suggesting to switch from signing key to token or something? In CircleCI there still seems to be signing key, not a token? Do we only need to change the environment variable - or do we need to change the CI script, too?

[steve-chavez]

Do we only need to change the environment variable - or do we need to change the CI script, too?

Ah, yes, I think so. What puzzled me is that the previous commit was green: https://github.com/PostgREST/postgrest/tree/1f206a560bedf0d7971e9db5e475c37ec311acda.

in CircleCI there still seems to be signing key, not a token?

True, I'll check that out.

[wolfgangwalther]

Ah, yes, I think so. What puzzled me is that the previous commit was green: https://github.com/PostgREST/postgrest/tree/1f206a560bedf0d7971e9db5e475c37ec311acda.

Yeah, that didn't touch any code, so didn't have to upload to cachix.

[monacoremo]

We'll need to add a line before we push:

cachix authtoken "$CACHIX_AUTH_TOKEN"

@steve-chavez can you set the env variable up with a separate CI auth token? Happy to fix the CI then

[steve-chavez]

@monacoremo Done! I set up the CACHIX_AUTH_TOKEN under the cachix context.

Note: the cachix context is already setup at

postgrest/.circleci/config.yml

Lines 239 to 240 in 698bfe6

	context:
	- cachix

[monacoremo]

@steve-chavez perfect, thank you! Just added #1821