tweak pre-reqs to be more flexible yet more rigid for xtmfg

diff --git a/scripts/xml/distribution_install.xml b/scripts/xml/distribution_install.xml
index b050f76..b580549 100644 (file)
--- a/scripts/xml/distribution_install.xml
+++ b/scripts/xml/distribution_install.xml
@@ -12,8 +12,15 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
-    <message>This package must be applied to a 4.4+ Postbooks database.
+    <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
+    <message>This package must be applied to a 4.4+ Distribution database.
+    </message>
+  </prerequisite>
+
+ <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion') &lt; '4.5.0';</query>
+    <message>This package may not be applied to a 4.5+ Distribution database.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index 3f2a490..70adfa6 100644 (file)
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -12,11 +12,18 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
+    <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
     <message>This package must be applied to a 4.4+ Distribution database.
     </message>
   </prerequisite>
 
+ <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion') &lt; '4.5.0';</query>
+    <message>This package may not be applied to a 4.5+ Distribution database.
+    </message>
+  </prerequisite>
+
   <script file="updates.sql" />
   <script file="inventory_upgrade.sql" />
 

diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index db3e6cc..0e94504 100644 (file)
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -12,11 +12,18 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
+    <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
     <message>This package must be applied to a 4.4+ PostBooks database.
     </message>
   </prerequisite>
 
+ <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion') &lt; '4.5.0';</query>
+    <message>This package may not be applied to a 4.5+ Postbooks database.
+    </message>
+  </prerequisite>
+
   <script file="updates.sql" />
 
 </package>

diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
index 549c254..4cb816b 100644 (file)
--- a/scripts/xml/xtmfg_install.xml
+++ b/scripts/xml/xtmfg_install.xml
@@ -12,8 +12,15 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
-    <message>This package must be applied to a 4.4+ Manufacturing database.
+    <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
+    <message>This package must be applied to a 4.4+ Distribution database.
+    </message>
+  </prerequisite>
+
+ <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion')='4.5.0Beta';</query>
+    <message>This package may not be applied to a 4.5.0Beta Distribution database.
     </message>
   </prerequisite>
 

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index 64940fa..718dd7f 100644 (file)
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -18,11 +18,18 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') ~ '^4.4.';</query>
+    <query>SELECT fetchMetricText('ServerVersion') > '4.4.';</query>
     <message>This package must be applied to a 4.4+ Manufacturing database.
     </message>
   </prerequisite>
 
+ <prerequisite type = "query"
+                name = "Checking for bad xTuple ERP database version" >
+    <query>SELECT fetchMetricText('ServerVersion')='4.5.0Beta';</query>
+    <message>This package may not be applied to a 4.5.0Beta Manufacturing database.
+    </message>
+  </prerequisite>
+
   <script file="manufacturing_upgrade.sql" />
 
 </package>