From: Linda Nichols <lynnaloo@gmail.com>
Date: Mon, 22 Sep 2014 16:12:13 +0000 (-0400)
Subject: Merge pull request #1859 from shackbarth/1855
X-Git-Tag: v4.7.0-beta.2~8
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=748ee3cee95e6bf5840d1458529f26ace34a0893;hp=4a2e5942da221cf8b1bceb7c9a5af65fb862b786;p=xtuple

Merge pull request #1859 from shackbarth/1855

display barcode misfires
---

diff --git a/enyo-client/database/source/update_version.sql b/enyo-client/database/source/update_version.sql
index a23ed9412..9d6b744ae 100644
--- a/enyo-client/database/source/update_version.sql
+++ b/enyo-client/database/source/update_version.sql
@@ -1 +1 @@
-UPDATE pkghead SET pkghead_version = '4.7.0Beta' WHERE pkghead_name = 'xt';
+UPDATE pkghead SET pkghead_version = '4.7.0' WHERE pkghead_name = 'xt';
diff --git a/enyo-client/database/source/wipe_views.sql b/enyo-client/database/source/wipe_views.sql
index b92157597..2116aecf2 100644
--- a/enyo-client/database/source/wipe_views.sql
+++ b/enyo-client/database/source/wipe_views.sql
@@ -4,7 +4,7 @@ do $$
 declare
   sqlstring text;
 begin
-  select string_agg('drop view ' || t.oid::regclass || ';', ' ') into sqlstring
+  select string_agg('drop view if exists ' || t.oid::regclass || ' cascade;', ' ') into sqlstring
     from pg_class t
     join pg_namespace n on n.oid = relnamespace
    where relkind = 'v'
diff --git a/foundation-database/public/tables/metric.sql b/foundation-database/public/tables/metric.sql
index 21c86154f..f7ac35a11 100644
--- a/foundation-database/public/tables/metric.sql
+++ b/foundation-database/public/tables/metric.sql
@@ -2,3 +2,4 @@
 insert into metric (metric_name, metric_value)
 select 'UnifiedBuild', 'true'
 where not exists (select c.metric_id from metric c where c.metric_name = 'UnifiedBuild');
+
diff --git a/foundation-database/public/tables/setVersion.sql b/foundation-database/public/tables/setVersion.sql
index bf8d03a00..e66a56bfa 100644
--- a/foundation-database/public/tables/setVersion.sql
+++ b/foundation-database/public/tables/setVersion.sql
@@ -1 +1 @@
-SELECT setMetric('ServerVersion', '4.7.0Beta');
+SELECT setMetric('ServerVersion', '4.7.0');
diff --git a/package.json b/package.json
index 88d940fdc..eebc2ec20 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "xTuple <dev@xtuple.com>",
   "name": "xtuple",
   "description": "xTuple Enterprise Resource Planning Mobile-Web client",
-  "version": "4.7.0-beta",
+  "version": "4.7.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/xtuple/xtuple.git"