enum_table 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.2.1 2013-07-16
+
+ * Fix SQL escaping.
+
 == 0.2.0 2013-05-14
 
  * Memoize enum_table list. Your logs are now less noisy.

data/Gemfile

@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
 gemspec

data/lib/enum_table/record.rb

@@ -61,7 +61,7 @@ module EnumTable
           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 #{table_name}").each do |row|
+          connection.execute("SELECT id, value FROM #{connection.quote_table_name table_name}").each do |row|
             map[row[1]] = row[0]
           end
           map

data/lib/enum_table/schema_dumper.rb

@@ -13,7 +13,7 @@ module EnumTable
       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 #{table_name} ORDER BY id").each do |row|
+        @connection.execute("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"

data/lib/enum_table/schema_statements.rb

@@ -13,7 +13,7 @@ module EnumTable
 
     def drop_enum_table(table_name)
       drop_table table_name
-      execute "DELETE FROM enum_tables WHERE table_name = '#{table_name}'"
+      execute "DELETE FROM enum_tables WHERE table_name = #{quote table_name}"
       enum_tables_updated
     end
 
@@ -49,7 +49,7 @@ module EnumTable
             t.string :table_name, null: false, limit: 255
           end
         end
-        @connection.execute "INSERT INTO enum_tables(table_name) VALUES('#{@name}')"
+        @connection.execute "INSERT INTO enum_tables(table_name) VALUES(#{@connection.quote @name})"
         table = Table.new(@connection, @name, 0)
         @adds.each { |args| table.add(*args) }
       end
@@ -67,17 +67,17 @@ module EnumTable
       def initialize(connection, name, max_id=nil)
         @connection = connection
         @name = name
-        @max_id = @connection.execute("SELECT max(id) FROM #{@name}").to_a[0][0] || 0
+        @max_id = @connection.execute("SELECT max(id) FROM #{@connection.quote_table_name @name}").to_a[0][0] || 0
       end
 
       def add(value, id=nil)
         id ||= @max_id + 1
         @max_id = id if id > @max_id
-        @connection.execute "INSERT INTO #{@name}(id, value) VALUES(#{id}, '#{value}')"
+        @connection.execute "INSERT INTO #{@connection.quote_table_name @name}(id, value) VALUES(#{id}, #{@connection.quote value})"
       end
 
       def remove(value)
-        @connection.execute "DELETE FROM #{@name} WHERE value = '#{value}'"
+        @connection.execute "DELETE FROM #{@connection.quote_table_name @name} WHERE value = #{@connection.quote value}"
       end
     end
   end

data/lib/enum_table/version.rb

@@ -1,5 +1,5 @@
 module EnumTable
-  VERSION = [0, 2, 0]
+  VERSION = [0, 2, 1]
 
   class << VERSION
     include Comparable

data/test/database.yml

@@ -9,7 +9,7 @@ mysql2:
   password:
   database: enum_table_test
 postgresql:
-  username: postgres
+  username: g
   password:
   database: enum_table_test
   min_messages: warning

data/test/enum_table/test_record.rb

@@ -31,6 +31,18 @@ describe EnumTable do
       reflection.name.must_equal :gender
     end
 
+    it "performs the necessary SQL-escaping when reading the table" do
+      connection.create_table("a'b") { |t| t.string :value }
+      connection.execute "INSERT INTO `a'b`(id, value) VALUES (1, 'c''d')"
+      Object.const_set :AB, Class.new(ActiveRecord::Base) { self.table_name = "a'b" }
+      begin
+        AB.enum :e, table: "a'b"
+        AB.enums[:e].value(1).must_equal(:"c'd")
+      ensure
+        Object.send :remove_const, :AB
+      end
+    end
+
     it "accepts the :table name as a string" do
       connection.create_table(:custom_table) { |t| t.string :value }
       connection.execute "INSERT INTO custom_table(id, value) VALUES (1, 'male'), (2, 'female')"

data/test/enum_table/test_schema_dumper.rb

@@ -37,12 +37,26 @@ describe EnumTable::SchemaDumper do
 
       it "dumps custom value column attributes" do
         connection.create_enum_table :user_genders do |t|
-          t.value type: :binary, limit: 20, null: true
+          t.value type: :integer, limit: 2, null: true
         end
         ActiveRecord::SchemaDumper.dump(connection, stream)
         stream.string.must_include(<<-EOS.gsub(/^ *\|/, ''))
           |  create_enum_table "user_genders", force: true do |t|
-          |    t.value type: :binary, limit: 20, null: true
+          |    t.value type: :integer, limit: 2, null: true
+          |  end
+        EOS
+      end
+
+      it "performs the necessary SQL-escaping when reading tables" do
+        connection.instance_eval do
+          create_enum_table "a'b" do |t|
+            t.add "c'd", 1
+          end
+        end
+        ActiveRecord::SchemaDumper.dump(connection, stream)
+        stream.string.must_include(<<-EOS.gsub(/^ *\|/, ''))
+          |  create_enum_table "a'b", force: true do |t|
+          |    t.add "c'd", 1
           |  end
         EOS
       end

data/test/enum_table/test_schema_statements.rb

@@ -30,11 +30,11 @@ describe EnumTable::SchemaStatements do
 
     it "allows configuring the type column in the block" do
       connection.create_enum_table :genders do |t|
-        t.value type: :binary, limit: 20
+        t.value type: :integer, limit: 2
       end
       column = connection.columns(:genders).find { |c| c.name == 'value' }
-      column.type.must_equal :binary
-      column.limit.must_equal 20
+      column.type.must_equal :integer
+      column.limit.must_equal 2
     end
 
     it "records the enum_table" do
@@ -55,6 +55,13 @@ describe EnumTable::SchemaStatements do
       end
       read_table('genders').must_equal [[1, 'female'], [2, 'male']]
     end
+
+    it "performs the necessary SQL escaping in value names" do
+      connection.create_enum_table "a'b" do |t|
+        t.add "c'd", 1
+      end
+      read_table("a'b").must_equal [[1, "c'd"]]
+    end
   end
 
   describe "#change_enum_table" do
@@ -83,6 +90,18 @@ describe EnumTable::SchemaStatements do
       end
       read_table('genders').must_equal [[1, 'female']]
     end
+
+    it "performs the necessary SQL escaping in value names" do
+      connection.create_enum_table "a'b" do |t|
+        t.add "c'd", 1
+      end
+
+      connection.change_enum_table "a'b" do |t|
+        t.remove "c'd"
+        t.add "e'f", 1
+      end
+      read_table("a'b").must_equal [[1, "e'f"]]
+    end
   end
 
   describe "#drop_enum_table" do
@@ -129,7 +148,7 @@ describe EnumTable::SchemaStatements do
 
   def read_table(name)
     rows = []
-    connection.execute("SELECT id, value FROM #{name} ORDER BY id").each do |row|
+    connection.execute("SELECT id, value FROM #{connection.quote_table_name name} ORDER BY id").each do |row|
       rows << [row[0], row[1]]
     end
     rows

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enum_table
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -82,15 +82,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -950106288231480747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -950106288231480747
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Enumeration tables for ActiveRecord
@@ -101,4 +107,3 @@ test_files:
 - test/enum_table/test_schema_dumper.rb
 - test/enum_table/test_schema_statements.rb
 - test/test_helper.rb
-has_rdoc: