Merge branch 'main' of github.com:sizzldev/ctrlplane into revert-exis…

…t-stuff
ctrlplanedev · Dec 4, 2024 · 3f91d5a · 3f91d5a
2 parents 272dc3f + eaf1098
commit 3f91d5a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 22 deletions.
diff --git a/packages/db/src/schema/job.ts b/packages/db/src/schema/job.ts
@@ -158,7 +158,8 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
         .from(jobMetadata)
         .where(
           and(eq(jobMetadata.jobId, job.id), eq(jobMetadata.key, cond.key)),
-        ),
+        )
+        .limit(1),
     );
 
   if (cond.operator === MetadataOperator.Regex)
@@ -172,7 +173,8 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
             eq(jobMetadata.key, cond.key),
             sql`${jobMetadata.value} ~ ${cond.value}`,
           ),
-        ),
+        )
+        .limit(1),
     );
 
   if (cond.operator === MetadataOperator.Like)
@@ -186,7 +188,8 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
             eq(jobMetadata.key, cond.key),
             like(jobMetadata.value, cond.value),
           ),
-        ),
+        )
+        .limit(1),
     );
 
   return exists(
@@ -199,7 +202,8 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
           eq(jobMetadata.key, cond.key),
           eq(jobMetadata.value, cond.value),
         ),
-      ),
+      )
+      .limit(1),
   );
 };
 
@@ -223,7 +227,6 @@ const buildVersionCondition = (cond: VersionCondition): SQL => {
     return ilike(release.version, `%${cond.value}%`);
   return sql`${release.version} ~ ${cond.value}`;
 };
-
 const buildCondition = (tx: Tx, cond: JobCondition): SQL => {
   if (cond.type === FilterType.Metadata)
     return buildMetadataCondition(tx, cond);

diff --git a/packages/db/src/schema/release.ts b/packages/db/src/schema/release.ts
@@ -217,60 +217,63 @@ export const releaseJobTriggerRelations = relations(
     }),
   }),
 );
-
 const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
   if (cond.operator === MetadataOperator.Null)
     return notExists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(releaseMetadata)
         .where(
           and(
             eq(releaseMetadata.releaseId, release.id),
             eq(releaseMetadata.key, cond.key),
           ),
-        ),
+        )
+        .limit(1),
     );
 
   if (cond.operator === MetadataOperator.Regex)
     return exists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(releaseMetadata)
         .where(
           and(
             eq(releaseMetadata.releaseId, release.id),
             eq(releaseMetadata.key, cond.key),
             sql`${releaseMetadata.value} ~ ${cond.value}`,
           ),
-        ),
+        )
+        .limit(1),
     );
 
   if (cond.operator === MetadataOperator.Like)
     return exists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(releaseMetadata)
         .where(
           and(
             eq(releaseMetadata.releaseId, release.id),
             eq(releaseMetadata.key, cond.key),
             like(releaseMetadata.value, cond.value),
           ),
-        ),
+        )
+        .limit(1),
     );
 
   return exists(
     tx
-      .select()
+      .select({ value: sql<number>`1` })
       .from(releaseMetadata)
       .where(
         and(
           eq(releaseMetadata.releaseId, release.id),
           eq(releaseMetadata.key, cond.key),
           eq(releaseMetadata.value, cond.value),
         ),
-      ),
+      )
+      .limit(1),
   );
 };
 

diff --git a/packages/db/src/schema/resource.ts b/packages/db/src/schema/resource.ts
@@ -173,56 +173,60 @@ const buildMetadataCondition = (tx: Tx, cond: MetadataCondition): SQL => {
   if (cond.operator === MetadataOperator.Null)
     return notExists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(resourceMetadata)
         .where(
           and(
             eq(resourceMetadata.resourceId, resource.id),
             eq(resourceMetadata.key, cond.key),
           ),
-        ),
+        )
+        .limit(1),
     );
 
   if (cond.operator === MetadataOperator.Regex)
     return exists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(resourceMetadata)
         .where(
           and(
             eq(resourceMetadata.resourceId, resource.id),
             eq(resourceMetadata.key, cond.key),
             sql`${resourceMetadata.value} ~ ${cond.value}`,
           ),
-        ),
+        )
+        .limit(1),
     );
 
   if (cond.operator === MetadataOperator.Like)
     return exists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(resourceMetadata)
         .where(
           and(
             eq(resourceMetadata.resourceId, resource.id),
             eq(resourceMetadata.key, cond.key),
             like(resourceMetadata.value, cond.value),
           ),
-        ),
+        )
+        .limit(1),
     );
 
   if ("value" in cond)
     return exists(
       tx
-        .select()
+        .select({ value: sql<number>`1` })
         .from(resourceMetadata)
         .where(
           and(
             eq(resourceMetadata.resourceId, resource.id),
             eq(resourceMetadata.key, cond.key),
             eq(resourceMetadata.value, cond.value),
           ),
-        ),
+        )
+        .limit(1),
     );
 
   throw Error("invalid metadata conditions");