fix backwards queries, remove '<' and replace with uglier query

diff --git a/scripts/xml/distribution_install.xml b/scripts/xml/distribution_install.xml
index 34127bc..3b48d7b 100644 (file)
--- a/scripts/xml/distribution_install.xml
+++ b/scripts/xml/distribution_install.xml
@@ -19,14 +19,14 @@
 
  <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.
+<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
+    <message>This package may not be applied to a 4.5+ PostBooks database.
     </message>
   </prerequisite>
 
  <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
-    <query>SELECT TRUE FROM pg_namespace WHERE nspname = 'xm';</query>
+    <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>

diff --git a/scripts/xml/distribution_package.xml b/scripts/xml/distribution_package.xml
index 88c6a99..f798144 100644 (file)
--- a/scripts/xml/distribution_package.xml
+++ b/scripts/xml/distribution_package.xml
@@ -19,14 +19,14 @@
 
  <prerequisite type = "query"
                name = "Checking for bad xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') &lt; '4.5.0';</query>
+<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
     <message>This package may not be applied to a 4.5+ Distribution database.
     </message>
   </prerequisite>
 
  <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
-    <query>SELECT TRUE FROM pg_namespace WHERE nspname = 'xm';</query>
+    <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>

diff --git a/scripts/xml/postbooks_package.xml b/scripts/xml/postbooks_package.xml
index 5f93bc2..54e958f 100644 (file)
--- a/scripts/xml/postbooks_package.xml
+++ b/scripts/xml/postbooks_package.xml
@@ -19,14 +19,14 @@
 
  <prerequisite type = "query"
                name = "Checking for bad xTuple ERP database version" >
-    <query>SELECT fetchMetricText('ServerVersion') &lt; '4.5.0';</query>
+<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
     <message>This package may not be applied to a 4.5+ Postbooks database.
     </message>
   </prerequisite>
 
  <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
-    <query>SELECT TRUE FROM pg_namespace WHERE nspname = 'xm';</query>
+    <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>

diff --git a/scripts/xml/xtmfg_install.xml b/scripts/xml/xtmfg_install.xml
index fb36d4a..68b4dc2 100644 (file)
--- a/scripts/xml/xtmfg_install.xml
+++ b/scripts/xml/xtmfg_install.xml
@@ -6,7 +6,7 @@
 
   <prerequisite type = "query"
                 name = "Checking xTuple Edition" >
-    <query>SELECT fetchMetricText('Application') = 'Standard';</query>
+    <query>SELECT fetchMetricText('Application') = 'PostBooks';</query>
     <message>This package must be applied to a Distribution Edition database.</message>
   </prerequisite>
 
@@ -19,14 +19,14 @@
 
  <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.
+<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
+    <message>This package may not be applied to a 4.5.0+ PostBooks database.
     </message>
   </prerequisite>
 
  <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
-    <query>SELECT TRUE FROM pg_namespace WHERE nspname = 'xm';</query>
+    <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>

diff --git a/scripts/xml/xtmfg_package.xml b/scripts/xml/xtmfg_package.xml
index 3078ba1..ee7a8b5 100644 (file)
--- a/scripts/xml/xtmfg_package.xml
+++ b/scripts/xml/xtmfg_package.xml
@@ -7,7 +7,7 @@
   <prerequisite type = "query"
                 name = "Checking xTuple Edition" >
     <query>SELECT fetchMetricText('Application') = 'Standard';</query>
-    <message>This package must be applied to a Distribution Edition database.</message>
+    <message>This package must be applied to a Manufacturing Edition database.</message>
   </prerequisite>
 
   <prerequisite type="query"
@@ -23,16 +23,17 @@
     </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.
+<prerequisite type = "query"
+               name = "Checking for bad xTuple ERP database version" >
+<query>SELECT NOT fetchMetricText('ServerVersion') > '4.5.0' AND fetchMetricText('ServerVersion')!='4.5.0Beta' AND fetchMetricText('ServerVersion')!='4.5.0RC';</query>
+    <message>This package may not be applied to a 4.5+ Manufacturing database.
     </message>
-  </prerequisite>
+</prerequisite>
+
 
  <prerequisite type = "query"
                name = "Checking for mobile-enabled schemas" >
-    <query>SELECT TRUE FROM pg_namespace WHERE nspname = 'xm';</query>
+    <query>SELECT NOT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = 'xm');</query>
     <message>This package may not be applied to a mobile-enabled database. Please see your system administrator or contact xTuple.
     </message>
   </prerequisite>