Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

chore: remove raw sql from env relationship

peaklabs-dev3af456cd3566
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 2eab8df209..59b46f7e72 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -845,15 +845,7 @@ class Application extends BaseModel
public function environment_variables()
{
return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->where('is_preview', false)
- ->orderByRaw("
- CASE
- WHEN is_required = true THEN 1
- WHEN LOWER(key) LIKE 'service_%' THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ ->where('is_preview', false);
}
public function runtime_environment_variables()
diff --git a/app/Models/Service.php b/app/Models/Service.php
index f28b7b6353..93f2742414 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -1458,15 +1458,7 @@ class Service extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN is_required = true THEN 1
- WHEN LOWER(key) LIKE 'service_%' THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
public function workdir()
diff --git a/app/Models/StandaloneClickhouse.php b/app/Models/StandaloneClickhouse.php
index ee8a271621..86323db8c7 100644
--- a/app/Models/StandaloneClickhouse.php
+++ b/app/Models/StandaloneClickhouse.php
@@ -295,15 +295,7 @@ class StandaloneClickhouse extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
public function runtime_environment_variables()
diff --git a/app/Models/StandaloneDragonfly.php b/app/Models/StandaloneDragonfly.php
index 051a95a806..4db7866b75 100644
--- a/app/Models/StandaloneDragonfly.php
+++ b/app/Models/StandaloneDragonfly.php
@@ -324,14 +324,6 @@ class StandaloneDragonfly extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
}
diff --git a/app/Models/StandaloneKeydb.php b/app/Models/StandaloneKeydb.php
index 6cd51edce1..f234996083 100644
--- a/app/Models/StandaloneKeydb.php
+++ b/app/Models/StandaloneKeydb.php
@@ -324,14 +324,6 @@ class StandaloneKeydb extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
}
diff --git a/app/Models/StandaloneMariadb.php b/app/Models/StandaloneMariadb.php
index f312473be5..e7ba75b672 100644
--- a/app/Models/StandaloneMariadb.php
+++ b/app/Models/StandaloneMariadb.php
@@ -289,15 +289,7 @@ class StandaloneMariadb extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
public function runtime_environment_variables()
diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php
index d2d8fef129..d6de5874c7 100644
--- a/app/Models/StandaloneMongodb.php
+++ b/app/Models/StandaloneMongodb.php
@@ -349,14 +349,6 @@ class StandaloneMongodb extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
}
diff --git a/app/Models/StandaloneMysql.php b/app/Models/StandaloneMysql.php
index c27b2a6791..98a5cab779 100644
--- a/app/Models/StandaloneMysql.php
+++ b/app/Models/StandaloneMysql.php
@@ -328,14 +328,6 @@ class StandaloneMysql extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
}
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 73b00742ac..be86438fe0 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -323,15 +323,7 @@ class StandalonePostgresql extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
public function isBackupSolutionAvailable()
diff --git a/app/Models/StandaloneRedis.php b/app/Models/StandaloneRedis.php
index 46e8da4343..e906bbb819 100644
--- a/app/Models/StandaloneRedis.php
+++ b/app/Models/StandaloneRedis.php
@@ -374,14 +374,6 @@ class StandaloneRedis extends BaseModel
public function environment_variables()
{
- return $this->morphMany(EnvironmentVariable::class, 'resourceable')
- ->orderByRaw("
- CASE
- WHEN LOWER(key) LIKE 'service_%' THEN 1
- WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
- ELSE 3
- END,
- LOWER(key) ASC
- ");
+ return $this->morphMany(EnvironmentVariable::class, 'resourceable');
}
}