From 55a6a2c5fef9746d584c24696c2e51863803ce5a Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Wed, 11 Apr 2018 14:39:04 -0500
Subject: [PATCH] Fix typo in InUseTools view (thanks, Tim)

---
 ...175813_update_in_use_tools_to_version_2.rb |  5 ++++
 db/schema.rb                                  | 26 +++++++++----------
 db/views/in_use_tools_v02.sql                 | 10 +++++++
 3 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 db/migrate/20180411175813_update_in_use_tools_to_version_2.rb
 create mode 100644 db/views/in_use_tools_v02.sql

diff --git a/db/migrate/20180411175813_update_in_use_tools_to_version_2.rb b/db/migrate/20180411175813_update_in_use_tools_to_version_2.rb
new file mode 100644
index 000000000..92060e05b
--- /dev/null
+++ b/db/migrate/20180411175813_update_in_use_tools_to_version_2.rb
@@ -0,0 +1,5 @@
+class UpdateInUseToolsToVersion2 < ActiveRecord::Migration[5.1]
+  def change
+    update_view :in_use_tools, version: 2, revert_to_version: 1
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 082544b1d..e9eb3e15c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180411122627) do
+ActiveRecord::Schema.define(version: 20180411175813) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -485,18 +485,6 @@ ActiveRecord::Schema.define(version: 20180411122627) do
   add_foreign_key "sensors", "devices"
   add_foreign_key "token_issuances", "devices"
 
-  create_view "in_use_tools",  sql_definition: <<-SQL
-      SELECT tools.id AS tool_id,
-      tools.name AS tool_name,
-      sequences.name AS sequence_name,
-      sequences.id AS sequence_id,
-      sequences.device_id
-     FROM ((edge_nodes
-       JOIN sequences ON ((sequences.id = sequences.id)))
-       JOIN tools ON (((edge_nodes.value)::integer = tools.id)))
-    WHERE ((edge_nodes.kind)::text = 'tool_id'::text);
-  SQL
-
   create_view "in_use_points",  sql_definition: <<-SQL
       SELECT points.x,
       points.y,
@@ -513,4 +501,16 @@ ActiveRecord::Schema.define(version: 20180411122627) do
     WHERE ((edge_nodes.kind)::text = 'pointer_id'::text);
   SQL
 
+  create_view "in_use_tools",  sql_definition: <<-SQL
+      SELECT tools.id AS tool_id,
+      tools.name AS tool_name,
+      sequences.name AS sequence_name,
+      sequences.id AS sequence_id,
+      sequences.device_id
+     FROM ((edge_nodes
+       JOIN sequences ON ((edge_nodes.sequence_id = sequences.id)))
+       JOIN tools ON (((edge_nodes.value)::integer = tools.id)))
+    WHERE ((edge_nodes.kind)::text = 'tool_id'::text);
+  SQL
+
 end
diff --git a/db/views/in_use_tools_v02.sql b/db/views/in_use_tools_v02.sql
new file mode 100644
index 000000000..302dcc62c
--- /dev/null
+++ b/db/views/in_use_tools_v02.sql
@@ -0,0 +1,10 @@
+SELECT
+  tools.id               AS tool_id,
+  tools.name             AS tool_name,
+  sequences.name         AS sequence_name,
+  sequences.id           AS sequence_id,
+  sequences.device_id    AS device_id
+FROM "edge_nodes"
+  INNER JOIN "sequences" ON edge_nodes.sequence_id=sequences.id
+  INNER JOIN "tools"     ON (edge_nodes.value)::int=tools.id
+WHERE "edge_nodes"."kind" = 'tool_id';