Switch to constraint expression instead of fn call

Currently bugged: geldata/gel#6699
Expression is a workaround.

Author: CarsonF

dbschema/funding-account.esdl

@@ -5,8 +5,7 @@ module default {
     }
 
     required accountNumber: int16 {
-      constraint min_value(0);
-      constraint max_value(9);
+      constraint expression on (__subject__ >= 0 and __subject__ <= 9);
     }
   }
 }

dbschema/language.esdl

@@ -88,7 +88,7 @@ module default {
   }
 
   scalar type population extending int32 {
-    constraint min_value(0);
+    constraint expression on (__subject__ >= 0);
   }
 }
 

dbschema/migrations/00042.edgeql

@@ -0,0 +1,85 @@
+CREATE MIGRATION m1r3t2ku2jysgjliaq54y7saj4tuxecilnajoxgwa2blsb3p64svzq
+    ONTO m1xhtylawlv6ksvlfkuw6bien5fobo6mtlj3xgr33uya6hnhcnmn7a
+{
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY chapter {
+          CREATE CONSTRAINT std::expression ON (((__subject__ >= 1) AND (__subject__ <= 150)));
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY chapter {
+          DROP CONSTRAINT std::max_value(150);
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY chapter {
+          DROP CONSTRAINT std::min_value(1);
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY verse {
+          CREATE CONSTRAINT std::expression ON (((__subject__ >= 1) AND (__subject__ <= 176)));
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY verse {
+          DROP CONSTRAINT std::max_value(176);
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY verse {
+          DROP CONSTRAINT std::min_value(1);
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY verseId {
+          CREATE CONSTRAINT std::expression ON (((__subject__ >= 0) AND (__subject__ <= 31101)));
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY verseId {
+          DROP CONSTRAINT std::max_value(31101);
+      };
+  };
+  ALTER TYPE Scripture::Verse {
+      ALTER PROPERTY verseId {
+          DROP CONSTRAINT std::min_value(0);
+      };
+  };
+  ALTER TYPE default::FundingAccount {
+      ALTER PROPERTY accountNumber {
+          CREATE CONSTRAINT std::expression ON (((__subject__ >= 0) AND (__subject__ <= 9)));
+      };
+  };
+  ALTER TYPE default::FundingAccount {
+      ALTER PROPERTY accountNumber {
+          DROP CONSTRAINT std::max_value(9);
+      };
+  };
+  ALTER TYPE default::FundingAccount {
+      ALTER PROPERTY accountNumber {
+          DROP CONSTRAINT std::min_value(0);
+      };
+  };
+  ALTER TYPE default::Project {
+      ALTER PROPERTY departmentId {
+          CREATE CONSTRAINT std::expression ON (((__subject__ >= 10000) AND (__subject__ <= 99999)));
+      };
+  };
+  ALTER TYPE default::Project {
+      ALTER PROPERTY departmentId {
+          DROP CONSTRAINT std::max_value(99999);
+      };
+  };
+  ALTER TYPE default::Project {
+      ALTER PROPERTY departmentId {
+          DROP CONSTRAINT std::min_value(10000);
+      };
+  };
+  ALTER SCALAR TYPE default::population {
+      CREATE CONSTRAINT std::expression ON ((__subject__ >= 0));
+  };
+  ALTER SCALAR TYPE default::population {
+      DROP CONSTRAINT std::min_value(0);
+  };
+};

dbschema/project.esdl

@@ -12,8 +12,7 @@ module default {
 
     departmentId: int32 {
       constraint exclusive;
-      constraint min_value(10000);
-      constraint max_value(99999);
+      constraint expression on (__subject__ >= 10000 and __subject__ <= 99999);
 # Temporarily disabled. Upstream fix in progress.
 #       rewrite update using (
 #         if (

dbschema/scripture.esdl

@@ -37,18 +37,15 @@ module Scripture {
     }
     required chapter: int16 {
       readonly := true;
-      constraint min_value(1);
-      constraint max_value(150); # Psalms
+      constraint expression on (__subject__ >= 1 and __subject__ <= 150); # Psalms
     }
     required verse: int16 {
       readonly := true;
-      constraint min_value(1);
-      constraint max_value(176); # Psalms 119
+      constraint expression on (__subject__ >= 1 and __subject__ <= 176); # Psalms 119
     }
     required verseId: int16 {
       readonly := true;
-      constraint min_value(0);
-      constraint max_value(31101);
+      constraint expression on (__subject__ >= 0 and __subject__ <= 31101);
     }
   }
 }