data_factory 0.1.2 → 0.1.3

data/lib/data_factory/base_api.rb

@@ -159,7 +159,7 @@ module DataFactory
 
     def generate_value(col)
       if col.nullable?
-        return nil
+        return nil unless self.class.populate_nullable_columns
       end
 
       case col.data_type
@@ -235,7 +235,7 @@ module DataFactory
     def validate_columns(params)
       params.keys.each do |k|
         unless column_details.has_key? k.upcase
-          raise DataFactory::ColumnNotInTable
+          raise DataFactory::ColumnNotInTable, "Column #{k.upcase} is not in #{table_name}"
         end
       end
     end

data/lib/data_factory/base_dsl.rb

@@ -32,7 +32,7 @@ module DataFactory
 
   module BaseDSL
 
-    attr_reader :table_name, :column_details, :column_defaults, :meta_data_loaded
+    attr_reader :table_name, :column_details, :column_defaults, :meta_data_loaded, :populate_nullable_columns
 
     # Pass a database interface object to be used by all DataFactory sub-classes
     # The interface must implement the following two methods:
@@ -67,6 +67,19 @@ module DataFactory
     # all instances of the class, but is not inherited with subclasses.
     def set_table_name(tab)
       @table_name = tab.to_s.upcase
+      @populate_nullable_columns = false
+    end
+
+    # By default, no values will be generated for columns that can be null. By calling this
+    # method in the class defintion, it will set @populate_nullable_columns to true, which will
+    # cause values to be generated for nullable columns in the same way as for not null columns
+    # @example
+    #    class MyTab < DataFactory::Base
+    #      set_table_name 'my_table'
+    #      populate_nullable_columns
+    #    end
+    def set_populate_nullable_columns
+      @populate_nullable_columns = true
     end
 
     # Sets the default value to be used for a column if nothing else is
@@ -105,7 +118,7 @@ module DataFactory
       load_meta_data unless meta_data_loaded
 
       unless @column_details.has_key?(column_name.to_s.upcase)
-        raise DataFactory::ColumnNotInTable
+        raise DataFactory::ColumnNotInTable, "Column #{column_name.to_s.upcase} is not in #{table_name}"
       end
 
       @column_details[column_name.to_s.upcase]
@@ -167,7 +180,7 @@ module DataFactory
 
     def validate_column_default(column_name, column_value)
       unless @column_details.has_key? column_name
-        raise DataFactory::ColumnNotInTable, column_name
+        raise DataFactory::ColumnNotInTable, "Column #{column_name.to_s.upcase} is not in #{table_name}"
       end
     end
 

data/test/base_api_test.rb

@@ -105,6 +105,14 @@ class BaseAPITest < Test::Unit::TestCase
     assert_nil(instance.column_value('COL1'))
   end
 
+  def test_generate_data_generates_nil_if_column_nullable_unless_populate_nullable_columns_is_true
+    @klass.set_populate_nullable_columns
+    instance = @klass.new
+    instance.generate_column_data
+    assert_not_nil(instance.column_value('COL1'))
+  end
+
+
   def test_generate_data_generates_column_data_if_column_not_nullable
     instance = @klass.new
     instance.generate_column_data
@@ -130,6 +138,12 @@ class BaseAPITest < Test::Unit::TestCase
     assert_raises DataFactory::ColumnNotInTable do
       instance.generate_column_data(:notexist => 'OVERRIDE')
     end
+    # Also ensure the error message contains the column name
+    begin
+      instance.generate_column_data(:notexist => 'OVERRIDE')
+    rescue DataFactory::ColumnNotInTable => e
+      assert_match(/NOTEXIST is not in/, e.to_s)
+    end
   end
 
 

data/test/base_dsl_test.rb

@@ -99,11 +99,20 @@ class BaseDSLTest < Test::Unit::TestCase
   def test_column_detail_raises_exception_if_column_does_not_exist
     @klass.set_database_interface(DBInterfaceMock.new)
     @klass.set_table_name(:foobar)
-    assert_raises DataFactory::ColumnNotInTable do
+    assert_raises DataFactory::ColumnNotInTable do |e|
       assert(@klass.column_detail('COLNOTTHERE').is_a?(DataFactory::Column))
     end
   end
 
+  def test_error_message_contains_column_name_when_column_does_not_exist
+    @klass.set_database_interface(DBInterfaceMock.new)
+    @klass.set_table_name(:foobar)
+    begin
+      @klass.column_detail('COLNOTTHERE').is_a?(DataFactory::Column)
+    rescue DataFactory::ColumnNotInTable => e
+      assert_match(/COLNOTTHERE is not/, e.to_s)
+    end
+  end
 
 end
 

data/test/helper.rb

@@ -10,7 +10,7 @@ require 'mocha/setup'
 module TestHelper
 
   DB_USER     = 'sodonnel'
-  DB_PASSWORD = 'sodonnel'
+  DB_PASSWORD = 'sodonnell'
   DB_SERVICE  = 'local11gr2.world'
   DB_HOST     = 'localhost'
   DB_PORT     = '1521'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_factory
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies: []
 description: Generates data to insert into database tables, allowing columns to be
   defaulted or overriden. Intended to be used when testing wide tables where many