Jun 6, 2024 · Jun 4, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 org, err := db.InsertOrganization(genCtx, database.InsertOrganizationParams{
 ID:          takeFirst(orig.ID, uuid.New()),
 Name:        takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 DisplayName: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 Description: takeFirst(orig.Description, namesgenerator.GetRandomName(1)),
 CreatedAt:   takeFirst(orig.CreatedAt, dbtime.Now()),
 UpdatedAt:   takeFirst(orig.UpdatedAt, dbtime.Now()),
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 defaultOrg, err := q.InsertOrganization(context.Background(), database.InsertOrganizationParams{
 ID:          uuid.New(),
 Name:        "first-organization",
 DisplayName: "first-organization",
 Description: "Builtin default organization.",
 CreatedAt:   dbtime.Now(),
 UpdatedAt:   dbtime.Now(),
 defer q.mutex.Unlock()

 organization := database.Organization{
 ID:        arg.ID,
 Name:      arg.Name,
 CreatedAt: arg.CreatedAt,
 UpdatedAt: arg.UpdatedAt,
 IsDefault: len(q.organizations) == 0,
 ID:          arg.ID,
 Name:        arg.Name,
 DisplayName: arg.DisplayName,
 Description: arg.Description,
 CreatedAt:   arg.CreatedAt,
 UpdatedAt:   arg.UpdatedAt,
 IsDefault:   len(q.organizations) == 0,
 }
 q.organizations = append(q.organizations, organization)
 return organization, nil
 for i, org := range q.organizations {
 if org.ID == arg.ID {
 org.Name = arg.Name
 org.DisplayName = arg.DisplayName
 org.Description = arg.Description
 q.organizations[i] = org
 return org, nil
 }
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000216_organization_display_name.down.sql b/coderd/database/migrations/000216_organization_display_name.down.sql
 alter table organizations
 drop column display_name;
diff --git a/coderd/database/migrations/000216_organization_display_name.up.sql b/coderd/database/migrations/000216_organization_display_name.up.sql
 -- This default is just a temporary thing to avoid null errors when first creating the column.
 alter table organizations
 add column display_name text not null default '';

 update organizations
 set display_name = name;

 -- We can remove the default now that everything has been copied.
 alter table organizations
 alter column display_name drop default;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/organizations.sql b/coderd/database/queries/organizations.sql

 -- name: InsertOrganization :one
 INSERT INTO
 organizations (id, "name", description, created_at, updated_at, is_default)
 organizations (id, "name",display_name,description, created_at, updated_at, is_default)
 VALUES
 -- If no organizations exist, and this is the first, make it the default.
 ($1, $2, $3, $4, $5, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;
 (@id, @name, @display_name, @description, @created_at, @updated_at, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;

 -- name: UpdateOrganization :one
 UPDATE
 organizations
 SET
 updated_at = @updated_at,
 name = @name
 name = @name,
 display_name = @display_name,
 description = @description
 WHERE
 id = @id
 RETURNING *;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -336,6 +336,7 @@ func Organization(t testing.TB, db database.Store, orig database.Organization) d
		org, err := db.InsertOrganization(genCtx, database.InsertOrganizationParams{
		ID: takeFirst(orig.ID, uuid.New()),
		Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
		DisplayName: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
		Description: takeFirst(orig.Description, namesgenerator.GetRandomName(1)),
		CreatedAt: takeFirst(orig.CreatedAt, dbtime.Now()),
		UpdatedAt: takeFirst(orig.UpdatedAt, dbtime.Now()),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,6 +86,7 @@ func New() database.Store {
		defaultOrg, err := q.InsertOrganization(context.Background(), database.InsertOrganizationParams{
		ID: uuid.New(),
		Name: "first-organization",
		DisplayName: "first-organization",
		Description: "Builtin default organization.",
		CreatedAt: dbtime.Now(),
		UpdatedAt: dbtime.Now(),
Expand DownExpand Up		@@ -6177,11 +6178,13 @@ func (q *FakeQuerier) InsertOrganization(_ context.Context, arg database.InsertO
		defer q.mutex.Unlock()

		organization := database.Organization{
		ID: arg.ID,
		Name: arg.Name,
		CreatedAt: arg.CreatedAt,
		UpdatedAt: arg.UpdatedAt,
		IsDefault: len(q.organizations) == 0,
		ID: arg.ID,
		Name: arg.Name,
		DisplayName: arg.DisplayName,
		Description: arg.Description,
		CreatedAt: arg.CreatedAt,
		UpdatedAt: arg.UpdatedAt,
		IsDefault: len(q.organizations) == 0,
		}
		q.organizations = append(q.organizations, organization)
		return organization, nil
Expand DownExpand Up		@@ -7322,6 +7325,8 @@ func (q *FakeQuerier) UpdateOrganization(_ context.Context, arg database.UpdateO
		for i, org := range q.organizations {
		if org.ID == arg.ID {
		org.Name = arg.Name
		org.DisplayName = arg.DisplayName
		org.Description = arg.Description
		q.organizations[i] = org
		return org, nil
		}
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter table organizations
		drop column display_name;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,10 @@
		-- This default is just a temporary thing to avoid null errors when first creating the column.
		alter table organizations
		add column display_name text not null default '';

		update organizations
		set display_name = name;

		-- We can remove the default now that everything has been copied.
		alter table organizations
		alter column display_name drop default;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,17 +49,19 @@ WHERE

		-- name: InsertOrganization :one
		INSERT INTO
		organizations (id, "name", description, created_at, updated_at, is_default)
		organizations (id, "name",display_name,description, created_at, updated_at, is_default)
		VALUES
		-- If no organizations exist, and this is the first, make it the default.
		($1, $2, $3, $4, $5, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;
		(@id, @name, @display_name, @description, @created_at, @updated_at, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;

		-- name: UpdateOrganization :one
		UPDATE
		organizations
		SET
		updated_at = @updated_at,
		name = @name
		name = @name,
		display_name = @display_name,
		description = @description
		WHERE
		id = @id
		RETURNING *;
Expand Down