chore: pluralize table names (#463)

This commit is contained in:
Colin Adler
2022-03-17 18:10:46 -05:00
committed by GitHub
parent edd8345658
commit 706e60bb3b
21 changed files with 341 additions and 249 deletions
+50 -50
View File
@@ -16,7 +16,7 @@ import (
const acquireProvisionerJob = `-- name: AcquireProvisionerJob :one
UPDATE
provisioner_job
provisioner_jobs
SET
started_at = $1,
updated_at = $1,
@@ -26,7 +26,7 @@ WHERE
SELECT
id
FROM
provisioner_job AS nested
provisioner_jobs AS nested
WHERE
nested.started_at IS NULL
AND nested.cancelled_at IS NULL
@@ -78,7 +78,7 @@ func (q *sqlQuerier) AcquireProvisionerJob(ctx context.Context, arg AcquireProvi
const deleteParameterValueByID = `-- name: DeleteParameterValueByID :exec
DELETE FROM
parameter_value
parameter_values
WHERE
id = $1
`
@@ -126,7 +126,7 @@ const getFileByHash = `-- name: GetFileByHash :one
SELECT
hash, created_at, created_by, mimetype, data
FROM
file
files
WHERE
hash = $1
LIMIT
@@ -286,7 +286,7 @@ const getParameterSchemasByJobID = `-- name: GetParameterSchemasByJobID :many
SELECT
id, created_at, job_id, name, description, default_source_scheme, default_source_value, allow_override_source, default_destination_scheme, allow_override_destination, default_refresh, redisplay_value, validation_error, validation_condition, validation_type_system, validation_value_type
FROM
parameter_schema
parameter_schemas
WHERE
job_id = $1
`
@@ -335,7 +335,7 @@ const getParameterValueByScopeAndName = `-- name: GetParameterValueByScopeAndNam
SELECT
id, created_at, updated_at, scope, scope_id, name, source_scheme, source_value, destination_scheme
FROM
parameter_value
parameter_values
WHERE
scope = $1
AND scope_id = $2
@@ -371,7 +371,7 @@ const getParameterValuesByScope = `-- name: GetParameterValuesByScope :many
SELECT
id, created_at, updated_at, scope, scope_id, name, source_scheme, source_value, destination_scheme
FROM
parameter_value
parameter_values
WHERE
scope = $1
AND scope_id = $2
@@ -419,7 +419,7 @@ const getProjectByID = `-- name: GetProjectByID :one
SELECT
id, created_at, updated_at, organization_id, name, provisioner, active_version_id
FROM
project
projects
WHERE
id = $1
LIMIT
@@ -445,7 +445,7 @@ const getProjectByOrganizationAndName = `-- name: GetProjectByOrganizationAndNam
SELECT
id, created_at, updated_at, organization_id, name, provisioner, active_version_id
FROM
project
projects
WHERE
organization_id = $1
AND LOWER(name) = LOWER($2)
@@ -477,7 +477,7 @@ const getProjectVersionByID = `-- name: GetProjectVersionByID :one
SELECT
id, project_id, organization_id, created_at, updated_at, name, description, job_id
FROM
project_version
project_versions
WHERE
id = $1
`
@@ -502,7 +502,7 @@ const getProjectVersionByProjectIDAndName = `-- name: GetProjectVersionByProject
SELECT
id, project_id, organization_id, created_at, updated_at, name, description, job_id
FROM
project_version
project_versions
WHERE
project_id = $1
AND name = $2
@@ -533,7 +533,7 @@ const getProjectVersionsByProjectID = `-- name: GetProjectVersionsByProjectID :m
SELECT
id, project_id, organization_id, created_at, updated_at, name, description, job_id
FROM
project_version
project_versions
WHERE
project_id = $1 :: uuid
`
@@ -574,7 +574,7 @@ const getProjectsByOrganization = `-- name: GetProjectsByOrganization :many
SELECT
id, created_at, updated_at, organization_id, name, provisioner, active_version_id
FROM
project
projects
WHERE
organization_id = $1
`
@@ -614,7 +614,7 @@ const getProvisionerDaemonByID = `-- name: GetProvisionerDaemonByID :one
SELECT
id, created_at, updated_at, organization_id, name, provisioners
FROM
provisioner_daemon
provisioner_daemons
WHERE
id = $1
`
@@ -637,7 +637,7 @@ const getProvisionerDaemons = `-- name: GetProvisionerDaemons :many
SELECT
id, created_at, updated_at, organization_id, name, provisioners
FROM
provisioner_daemon
provisioner_daemons
`
func (q *sqlQuerier) GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemon, error) {
@@ -674,7 +674,7 @@ const getProvisionerJobByID = `-- name: GetProvisionerJobByID :one
SELECT
id, created_at, updated_at, started_at, cancelled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id
FROM
provisioner_job
provisioner_jobs
WHERE
id = $1
`
@@ -706,7 +706,7 @@ const getProvisionerJobsByIDs = `-- name: GetProvisionerJobsByIDs :many
SELECT
id, created_at, updated_at, started_at, cancelled_at, completed_at, error, organization_id, initiator_id, provisioner, storage_method, storage_source, type, input, worker_id
FROM
provisioner_job
provisioner_jobs
WHERE
id = ANY($1 :: uuid [ ])
`
@@ -754,7 +754,7 @@ const getProvisionerLogsByIDBetween = `-- name: GetProvisionerLogsByIDBetween :m
SELECT
id, job_id, created_at, source, level, output
FROM
provisioner_job_log
provisioner_job_logs
WHERE
job_id = $1
AND (
@@ -901,7 +901,7 @@ const getWorkspaceAgentByAuthToken = `-- name: GetWorkspaceAgentByAuthToken :one
SELECT
id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata
FROM
workspace_agent
workspace_agents
WHERE
auth_token = $1
`
@@ -928,7 +928,7 @@ const getWorkspaceAgentByInstanceID = `-- name: GetWorkspaceAgentByInstanceID :o
SELECT
id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata
FROM
workspace_agent
workspace_agents
WHERE
auth_instance_id = $1 :: text
ORDER BY
@@ -957,7 +957,7 @@ const getWorkspaceAgentByResourceID = `-- name: GetWorkspaceAgentByResourceID :o
SELECT
id, created_at, updated_at, resource_id, auth_token, auth_instance_id, environment_variables, startup_script, instance_metadata, resource_metadata
FROM
workspace_agent
workspace_agents
WHERE
resource_id = $1
`
@@ -984,7 +984,7 @@ const getWorkspaceBuildByID = `-- name: GetWorkspaceBuildByID :one
SELECT
id, created_at, updated_at, workspace_id, project_version_id, name, before_id, after_id, transition, initiator, provisioner_state, job_id
FROM
workspace_build
workspace_builds
WHERE
id = $1
LIMIT
@@ -1015,7 +1015,7 @@ const getWorkspaceBuildByJobID = `-- name: GetWorkspaceBuildByJobID :one
SELECT
id, created_at, updated_at, workspace_id, project_version_id, name, before_id, after_id, transition, initiator, provisioner_state, job_id
FROM
workspace_build
workspace_builds
WHERE
job_id = $1
LIMIT
@@ -1046,7 +1046,7 @@ const getWorkspaceBuildByWorkspaceID = `-- name: GetWorkspaceBuildByWorkspaceID
SELECT
id, created_at, updated_at, workspace_id, project_version_id, name, before_id, after_id, transition, initiator, provisioner_state, job_id
FROM
workspace_build
workspace_builds
WHERE
workspace_id = $1
`
@@ -1091,7 +1091,7 @@ const getWorkspaceBuildByWorkspaceIDAndName = `-- name: GetWorkspaceBuildByWorks
SELECT
id, created_at, updated_at, workspace_id, project_version_id, name, before_id, after_id, transition, initiator, provisioner_state, job_id
FROM
workspace_build
workspace_builds
WHERE
workspace_id = $1
AND name = $2
@@ -1126,7 +1126,7 @@ const getWorkspaceBuildByWorkspaceIDWithoutAfter = `-- name: GetWorkspaceBuildBy
SELECT
id, created_at, updated_at, workspace_id, project_version_id, name, before_id, after_id, transition, initiator, provisioner_state, job_id
FROM
workspace_build
workspace_builds
WHERE
workspace_id = $1
AND after_id IS NULL
@@ -1158,7 +1158,7 @@ const getWorkspaceByID = `-- name: GetWorkspaceByID :one
SELECT
id, created_at, updated_at, owner_id, project_id, name
FROM
workspace
workspaces
WHERE
id = $1
LIMIT
@@ -1183,7 +1183,7 @@ const getWorkspaceByUserIDAndName = `-- name: GetWorkspaceByUserIDAndName :one
SELECT
id, created_at, updated_at, owner_id, project_id, name
FROM
workspace
workspaces
WHERE
owner_id = $1
AND LOWER(name) = LOWER($2)
@@ -1213,7 +1213,7 @@ SELECT
project_id,
COUNT(DISTINCT owner_id)
FROM
workspace
workspaces
WHERE
project_id = ANY($1 :: uuid [ ])
GROUP BY
@@ -1253,7 +1253,7 @@ const getWorkspaceResourceByID = `-- name: GetWorkspaceResourceByID :one
SELECT
id, created_at, job_id, transition, type, name, agent_id
FROM
workspace_resource
workspace_resources
WHERE
id = $1
`
@@ -1277,7 +1277,7 @@ const getWorkspaceResourcesByJobID = `-- name: GetWorkspaceResourcesByJobID :man
SELECT
id, created_at, job_id, transition, type, name, agent_id
FROM
workspace_resource
workspace_resources
WHERE
job_id = $1
`
@@ -1317,7 +1317,7 @@ const getWorkspacesByUserID = `-- name: GetWorkspacesByUserID :many
SELECT
id, created_at, updated_at, owner_id, project_id, name
FROM
workspace
workspaces
WHERE
owner_id = $1
`
@@ -1450,7 +1450,7 @@ func (q *sqlQuerier) InsertAPIKey(ctx context.Context, arg InsertAPIKeyParams) (
const insertFile = `-- name: InsertFile :one
INSERT INTO
file (hash, created_at, created_by, mimetype, data)
files (hash, created_at, created_by, mimetype, data)
VALUES
($1, $2, $3, $4, $5) RETURNING hash, created_at, created_by, mimetype, data
`
@@ -1563,7 +1563,7 @@ func (q *sqlQuerier) InsertOrganizationMember(ctx context.Context, arg InsertOrg
const insertParameterSchema = `-- name: InsertParameterSchema :one
INSERT INTO
parameter_schema (
parameter_schemas (
id,
created_at,
job_id,
@@ -1664,7 +1664,7 @@ func (q *sqlQuerier) InsertParameterSchema(ctx context.Context, arg InsertParame
const insertParameterValue = `-- name: InsertParameterValue :one
INSERT INTO
parameter_value (
parameter_values (
id,
name,
created_at,
@@ -1720,7 +1720,7 @@ func (q *sqlQuerier) InsertParameterValue(ctx context.Context, arg InsertParamet
const insertProject = `-- name: InsertProject :one
INSERT INTO
project (
projects (
id,
created_at,
updated_at,
@@ -1768,7 +1768,7 @@ func (q *sqlQuerier) InsertProject(ctx context.Context, arg InsertProjectParams)
const insertProjectVersion = `-- name: InsertProjectVersion :one
INSERT INTO
project_version (
project_versions (
id,
project_id,
organization_id,
@@ -1820,7 +1820,7 @@ func (q *sqlQuerier) InsertProjectVersion(ctx context.Context, arg InsertProject
const insertProvisionerDaemon = `-- name: InsertProvisionerDaemon :one
INSERT INTO
provisioner_daemon (id, created_at, organization_id, name, provisioners)
provisioner_daemons (id, created_at, organization_id, name, provisioners)
VALUES
($1, $2, $3, $4, $5) RETURNING id, created_at, updated_at, organization_id, name, provisioners
`
@@ -1855,7 +1855,7 @@ func (q *sqlQuerier) InsertProvisionerDaemon(ctx context.Context, arg InsertProv
const insertProvisionerJob = `-- name: InsertProvisionerJob :one
INSERT INTO
provisioner_job (
provisioner_jobs (
id,
created_at,
updated_at,
@@ -1920,7 +1920,7 @@ func (q *sqlQuerier) InsertProvisionerJob(ctx context.Context, arg InsertProvisi
const insertProvisionerJobLogs = `-- name: InsertProvisionerJobLogs :many
INSERT INTO
provisioner_job_log
provisioner_job_logs
SELECT
unnest($1 :: uuid [ ]) AS id,
$2 :: uuid AS job_id,
@@ -2042,7 +2042,7 @@ func (q *sqlQuerier) InsertUser(ctx context.Context, arg InsertUserParams) (User
const insertWorkspace = `-- name: InsertWorkspace :one
INSERT INTO
workspace (
workspaces (
id,
created_at,
updated_at,
@@ -2086,7 +2086,7 @@ func (q *sqlQuerier) InsertWorkspace(ctx context.Context, arg InsertWorkspacePar
const insertWorkspaceAgent = `-- name: InsertWorkspaceAgent :one
INSERT INTO
workspace_agent (
workspace_agents (
id,
created_at,
updated_at,
@@ -2146,7 +2146,7 @@ func (q *sqlQuerier) InsertWorkspaceAgent(ctx context.Context, arg InsertWorkspa
const insertWorkspaceBuild = `-- name: InsertWorkspaceBuild :one
INSERT INTO
workspace_build (
workspace_builds (
id,
created_at,
updated_at,
@@ -2211,7 +2211,7 @@ func (q *sqlQuerier) InsertWorkspaceBuild(ctx context.Context, arg InsertWorkspa
const insertWorkspaceResource = `-- name: InsertWorkspaceResource :one
INSERT INTO
workspace_resource (
workspace_resources (
id,
created_at,
job_id,
@@ -2293,7 +2293,7 @@ func (q *sqlQuerier) UpdateAPIKeyByID(ctx context.Context, arg UpdateAPIKeyByIDP
const updateProjectVersionByID = `-- name: UpdateProjectVersionByID :exec
UPDATE
project_version
project_versions
SET
project_id = $2,
updated_at = $3
@@ -2314,7 +2314,7 @@ func (q *sqlQuerier) UpdateProjectVersionByID(ctx context.Context, arg UpdatePro
const updateProvisionerDaemonByID = `-- name: UpdateProvisionerDaemonByID :exec
UPDATE
provisioner_daemon
provisioner_daemons
SET
updated_at = $2,
provisioners = $3
@@ -2335,7 +2335,7 @@ func (q *sqlQuerier) UpdateProvisionerDaemonByID(ctx context.Context, arg Update
const updateProvisionerJobByID = `-- name: UpdateProvisionerJobByID :exec
UPDATE
provisioner_job
provisioner_jobs
SET
updated_at = $2
WHERE
@@ -2354,7 +2354,7 @@ func (q *sqlQuerier) UpdateProvisionerJobByID(ctx context.Context, arg UpdatePro
const updateProvisionerJobWithCompleteByID = `-- name: UpdateProvisionerJobWithCompleteByID :exec
UPDATE
provisioner_job
provisioner_jobs
SET
updated_at = $2,
completed_at = $3,
@@ -2385,7 +2385,7 @@ func (q *sqlQuerier) UpdateProvisionerJobWithCompleteByID(ctx context.Context, a
const updateWorkspaceAgentByID = `-- name: UpdateWorkspaceAgentByID :exec
UPDATE
workspace_agent
workspace_agents
SET
updated_at = $2
WHERE
@@ -2404,7 +2404,7 @@ func (q *sqlQuerier) UpdateWorkspaceAgentByID(ctx context.Context, arg UpdateWor
const updateWorkspaceBuildByID = `-- name: UpdateWorkspaceBuildByID :exec
UPDATE
workspace_build
workspace_builds
SET
updated_at = $2,
after_id = $3,