From 63199215ed59656bae0f816b1b563f166ac18c0a Mon Sep 17 00:00:00 2001 From: Pierpaolo Frasa Date: Sun, 28 Sep 2014 22:18:19 +0200 Subject: [PATCH 1/3] use select_values instead of execute --- lib/enum_table/schema_statements.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/enum_table/schema_statements.rb b/lib/enum_table/schema_statements.rb index 7cd434d..4038ca7 100644 --- a/lib/enum_table/schema_statements.rb +++ b/lib/enum_table/schema_statements.rb @@ -19,8 +19,7 @@ def drop_enum_table(table_name) def enum_tables return [] if !table_exists?('enum_tables') - @enum_tables ||= execute("SELECT table_name FROM enum_tables"). - map { |row| row[0] }.sort + @enum_tables ||= select_values("SELECT table_name FROM enum_tables").sort end def enum_tables_updated From cb95a014db93256c439e0cdbfc5ec85f4665acd3 Mon Sep 17 00:00:00 2001 From: Pierpaolo Frasa Date: Sun, 28 Sep 2014 22:31:40 +0200 Subject: [PATCH 2/3] fix another occurrence of execute with select_rows --- lib/enum_table/schema_dumper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/enum_table/schema_dumper.rb b/lib/enum_table/schema_dumper.rb index b01158f..5592b4f 100644 --- a/lib/enum_table/schema_dumper.rb +++ b/lib/enum_table/schema_dumper.rb @@ -13,7 +13,7 @@ def tables_with_enum_table(stream) table_names.each do |table_name| stream.puts " create_enum_table #{table_name.inspect}, force: true do |t|" enum_table_column(stream, table_name, 'value', SchemaStatements::DEFAULT_VALUE_ATTRIBUTES) - @connection.execute("SELECT id, value FROM #{@connection.quote_table_name table_name} ORDER BY id").each do |row| + @connection.select_rows("SELECT id, value FROM #{@connection.quote_table_name table_name} ORDER BY id").each do |row| stream.puts " t.add #{row[1].to_s.inspect}, #{row[0]}" end stream.puts " end" From f7a754509122f2aee735a43bb22bfa251bad947b Mon Sep 17 00:00:00 2001 From: Pierpaolo Frasa Date: Sun, 28 Sep 2014 23:00:10 +0200 Subject: [PATCH 3/3] do two more replacements --- lib/enum_table/record.rb | 2 +- lib/enum_table/schema_statements.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/enum_table/record.rb b/lib/enum_table/record.rb index e2a7ba3..5e1ee88 100644 --- a/lib/enum_table/record.rb +++ b/lib/enum_table/record.rb @@ -63,7 +63,7 @@ def enum_map(name, options) map = {} table_name = table || "#{self.table_name.singularize}_#{name.to_s.pluralize}" return {} if EnumTable.missing_tables_allowed? && !connection.tables.include?(table_name) - connection.execute("SELECT id, value FROM #{connection.quote_table_name table_name}").each do |row| + connection.select_rows("SELECT id, value FROM #{connection.quote_table_name table_name}").each do |row| map[row[1]] = row[0] end map diff --git a/lib/enum_table/schema_statements.rb b/lib/enum_table/schema_statements.rb index 4038ca7..9064e48 100644 --- a/lib/enum_table/schema_statements.rb +++ b/lib/enum_table/schema_statements.rb @@ -66,7 +66,7 @@ class Table def initialize(connection, name, max_id=nil) @connection = connection @name = name - @max_id = @connection.execute("SELECT max(id) FROM #{@connection.quote_table_name @name}").to_a[0][0] || 0 + @max_id = @connection.select_rows("SELECT max(id) FROM #{@connection.quote_table_name @name}").to_a[0][0] || 0 end def add(value, id=nil)