coder
diff --git a/‎coderd/database/models.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/models.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/querier.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/querier.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 3 additions & 2 deletions b/‎coderd/database/queries.sql.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎coderd/database/queries/roles.sql
Lines changed: 2 additions & 1 deletion b/‎coderd/database/queries/roles.sql
Lines changed: 2 additions & 1 deletion
diff --git a/‎coderd/database/types.go
Lines changed: 2 additions & 6 deletions b/‎coderd/database/types.go
Lines changed: 2 additions & 6 deletions
@@ -9,7 +9,8 @@ WHERE
   -- To do this manually in SQL, you can construct an array and cast it:
   -- cast(ARRAY[('customrole','ece79dac-926e-44ca-9790-2ff7c5eb6e0c')] AS name_organization_pair[])
   AND CASE WHEN array_length(@lookup_roles :: name_organization_pair[], 1) > 0  THEN
-	(name, organization_id) = ANY (@lookup_roles::name_organization_pair[])
+    -- Using 'coalesce' to avoid troubles with null literals being an empty string.
+	(name, coalesce(organization_id, '00000000-0000-0000-0000-000000000000' ::uuid)) = ANY (@lookup_roles::name_organization_pair[])
     ELSE true
   END
   -- This allows fetching all roles, or just site wide roles
 
@@ -160,17 +160,13 @@ func (*NameOrganizationPair) Scan(_ interface{}) error {
 // shell.
 //
 //		SELECT ('customrole'::text,'ece79dac-926e-44ca-9790-2ff7c5eb6e0c'::uuid);
-//	To see 'null' option
-//		SELECT ('customrole',null);
+//	To see 'null' option. Using the nil uuid as null to avoid empty string literals for null.
+//		SELECT ('customrole',00000000-0000-0000-0000-000000000000);
 //
 // This value is usually used as an array, NameOrganizationPair[]. You can see
 // what that literal is as well, with proper quoting.
 //
 //	SELECT ARRAY[('customrole'::text,'ece79dac-926e-44ca-9790-2ff7c5eb6e0c'::uuid)];
 func (a NameOrganizationPair) Value() (driver.Value, error) {
-	if a.OrganizationID == uuid.Nil {
-		return fmt.Sprintf(`('%s',)`, a.Name), nil
-	}
-
 	return fmt.Sprintf(`(%s,%s)`, a.Name, a.OrganizationID.String()), nil
 }