Fix typo in InUseTools view (thanks, Tim)

pull/785/head
Rick Carlino 2018-04-11 14:39:04 -05:00
parent 1c83a9f31f
commit 55a6a2c5fe
3 changed files with 28 additions and 13 deletions

View File

@ -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

View File

@ -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

View File

@ -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';