data_factory 0.2.0 → 0.3.0

data/README.md

@@ -60,7 +60,9 @@ To use DataFactory, create a class for each table you want to interface with, an
                                    end
     end
 
-In the class definition, use the set_table_name method to map the class to a particular table on the database.
+In the class definition, use the set_table_name method to map the class to a particular table on the database. If the table is not owned by the user you connect to the database as, then prefix the table with the schema name:
+
+    set_table_name "hr.employees"
 
 Optionally, you can specify default values for columns in the table with the set_column_default method, which takes the table name followed by a value for the column, or a block that generates the value each time it is called, as with the email example.
 
@@ -177,4 +179,4 @@ I may make improvements in the future to remove this limitation and improve the
 
 
 
-  
+  

data/lib/data_factory/base_api.rb

@@ -25,6 +25,18 @@ module DataFactory
       self.class.table_name
     end
 
+    def schema_name
+      self.class.schema_name
+    end
+
+    def fully_qualified_table_name
+      if self.class.schema_name
+        "#{schema_name}.#{table_name}"
+      else
+        table_name
+      end
+    end
+
     def column_details # :nodoc:
       self.class.column_details
     end
@@ -98,7 +110,7 @@ module DataFactory
     # variabled are stored in @binds.
     def generate_insert
       @binds = Array.new
-      @insert_statement = "insert into #{table_name} ("
+      @insert_statement = "insert into #{fully_qualified_table_name} ("
       @insert_statement << column_details.keys.sort.map { |k| column_detail(k).column_name }.join(',')
       @insert_statement << ') values ('
       @insert_statement << column_details.keys.sort.map { |k|
@@ -163,17 +175,22 @@ module DataFactory
       end
 
       case col.data_type
-      when 'CHAR', 'VARCHAR2', 'CLOB'
+      when 'VARCHAR2', 'CLOB'
         random_string_upto_length(col.data_length)
+      when 'CHAR'
+        random_string_of_length(col.data_length)
       when 'RAW'
         random_hex_string_upto_length(col.data_length)
-      when 'DATE', 'DATETIME', 'TIMESTAMP'
+      when 'DATE', 'DATETIME', /TIMESTAMP/
         Time.now
       when 'NUMBER', 'INTEGER'
         scale = 2
         if col.data_scale && col.data_scale == 0
-          random_integer(9999)
+          # No point in generating massive numbers (eg 10**38), so limit to 10**10
+          max_precision = col.data_precision < 10 ? col.data_precision : 10
+          random_integer((10**max_precision) - 1)
         else
+          # TODO - generate actual random number obeying presision and scale
           22.23
         end
 
@@ -198,9 +215,6 @@ module DataFactory
       #     max_right = 10**scale - 1
       #     "#{random_integer(max_left)}.#{random_integer(max_right)}".to_f
       #   end
-      when 'NUMBER'
-        23.34
-      when 'INTEGER'
       else
         nil
       end
@@ -210,7 +224,7 @@ module DataFactory
       case col.data_type
       when 'CHAR', 'VARCHAR2', 'CLOB', 'RAW'
         String
-      when 'DATE', 'DATETIME', 'TIMESTAMP'
+      when 'DATE', 'DATETIME', /TIMESTAMP/
         Time
       when 'INTEGER'
         Integer
@@ -237,7 +251,7 @@ module DataFactory
     def validate_columns(params)
       params.keys.each do |k|
         unless column_details.has_key? k.upcase
-          raise DataFactory::ColumnNotInTable, "Column #{k.upcase} is not in #{table_name}"
+          raise DataFactory::ColumnNotInTable, "Column #{k.upcase} is not in #{fully_qualified_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, :populate_nullable_columns
+    attr_reader :table_name, :schema_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:
@@ -65,8 +65,16 @@ module DataFactory
     # Defines the table a subclass of DataFactory interacts with on the database. This
     # method stores the tables in a class instance variable (@table_name) that is shared by
     # all instances of the class, but is not inherited with subclasses.
+    # The table name can optionally be prefixed with the schema - 'schema.table'
     def set_table_name(tab)
-      @table_name = tab.to_s.upcase
+      parts = tab.to_s.upcase.split(/\./)
+      if parts.length == 2
+        @table_name = parts[1]
+        @schema_name = parts[0]
+      else
+        @table_name = parts[0]
+        @schema_name = nil
+      end
       @populate_nullable_columns = false
     end
 
@@ -75,7 +83,7 @@ module DataFactory
     # 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'
+    #      set_table_name 'schema.my_table'
     #      populate_nullable_columns
     #    end
     def set_populate_nullable_columns
@@ -148,8 +156,9 @@ module DataFactory
                                   data_scale,
                                   column_id,
                                   nullable
-                           from user_tab_columns
+                           from all_tab_columns
                            where table_name = ?
+                           and owner = #{@schema_name.nil? ? 'user' : "'#{@schema_name}'"}
                            order by column_id asc"
 
       database_interface.execute_sql(table_details_sql, @table_name).each_array do |r|
@@ -163,6 +172,10 @@ module DataFactory
         c.nullable        = r[6] == 'N' ? false : true
         @column_details[r[0].upcase] = c
       end
+      # If there are no columns, then the table does not exist!
+      if @column_details.keys.length == 0
+        raise DataFactory::TableNotExist, "Table #{schema_name.nil? ? '' : schema_name+'.'}#{table_name} does not exist"
+      end
       @meta_data_loaded = true
       # This is needed here as some column defaults will have been set
       # before the meta_data was loaded and hence will not have been checked
@@ -180,7 +193,7 @@ module DataFactory
 
     def validate_column_default(column_name, column_value)
       unless @column_details.has_key? column_name
-        raise DataFactory::ColumnNotInTable, "Column #{column_name.to_s.upcase} is not in #{table_name}"
+        raise DataFactory::ColumnNotInTable, "Column #{column_name.to_s.upcase} is not in #{schema_name.nil? ? '' : schema_name+'.'}#{table_name}"
       end
     end
 

data/lib/data_factory/exceptions.rb

@@ -2,5 +2,6 @@ module DataFactory
   class TableNotSet < Exception; end
   class DatabaseInterfaceNotSet < Exception; end
   class ColumnNotInTable < Exception; end
-  class NoInsertStatement < Exception; end;
+  class NoInsertStatement < Exception; end
+  class TableNotExist < Exception; end
 end

data/test/base_api_test.rb

@@ -32,6 +32,17 @@ class BaseAPITest < Test::Unit::TestCase
     assert_equal('FOOBAR', instance.table_name)
   end
 
+  def test_fully_qualified_table_name_correct_when_no_schema
+    instance = @klass.new
+    assert_equal('FOOBAR', instance.fully_qualified_table_name)
+  end
+
+  def test_fully_qualified_table_name_correct_when_schema
+    @klass.set_table_name('sch.foobar')
+    instance = @klass.new
+    assert_equal('SCH.FOOBAR', instance.fully_qualified_table_name)
+  end
+  
   def test_column_default_is_retrieved
     @klass.set_column_default('COL1', 'abcd')
     instance = @klass.new
@@ -146,7 +157,29 @@ class BaseAPITest < Test::Unit::TestCase
     end
   end
 
+  def test_generate_data_for_char_field_is_always_full_column_width
+    instance = @klass.new
+    instance.generate_column_data
+    assert_equal(20, instance.column_value('COL14').length)
+  end
+
+  def test_generate_data_for_small_integer_is_correct_precision
+    instance = @klass.new
+    1.upto(15) do
+      instance.generate_column_data
+      assert instance.column_value('COL15') < 10
+    end
+  end
+
+  def test_generate_data_for_bigger_integer_is_correct_precision
+    instance = @klass.new
+    1.upto(30) do
+      instance.generate_column_data
+      assert instance.column_value('COL16') < 9999
+    end
+  end
 
+  
   # TODO - tests for generate insert
   # TODO - tests for
 

data/test/base_dsl_test.rb

@@ -23,6 +23,14 @@ class BaseDSLTest < Test::Unit::TestCase
     assert_equal('FOOBAR', @klass.table_name)
   end
 
+  def test_schema_dot_table_can_be_set_as_a_class_instance_variable
+    @klass.set_table_name('sch.foobar')
+    assert_equal('FOOBAR', @klass.table_name)
+    assert_equal('SCH', @klass.schema_name)
+    assert_equal('FOOBAR', @klass.instance_variable_get('@table_name'))
+    assert_equal('SCH', @klass.instance_variable_get('@schema_name'))
+  end
+
   def test_db_interface_is_set_as_a_class_variable
     dbklass = Class.new
     @klass.set_database_interface(dbklass)

data/test/helper.rb

@@ -43,8 +43,9 @@ module TestHelper
         ['col11','raw',      20, nil, nil, 11,'Y'],
         ['col12','raw',      20, nil, nil, 12,'N'],
         ['col13','char',     20, nil, nil, 13,'Y'],
-        ['col14','char',     20, nil, nil, 14,'N']
-
+        ['col14','char',     20, nil, nil, 14,'N'],
+        ['col15','number',   20, 1,   0,   15,'N'],
+        ['col16','integer',  20, 4,   9,   16,'N']
       ]
       data.each do |d|
         yield d

data/test/sanity.rb

@@ -6,17 +6,17 @@ require 'simple_oracle_jdbc'
 require 'data_factory'
 
 #interface = DataFactory::DBInterface::Oracle.create('sodonnel', 'sodonnel', 'local11gr2')
-interface = SimpleOracleJDBC::Interface.create('sodonnel', 'sodonnel', 'local11gr2.world', 'localhost', '1521')
+interface = SimpleOracleJDBC::Interface.create('sodonnel', 'sodonnel', 'DB12C', '192.168.0.1', '1521')
 
 DataFactory::Base.set_database_interface(interface)
 
 class Foo < DataFactory::Base
-  set_table_name "employees"
-  set_column_default "EMP_NAME", 'john'
+  set_table_name "sodonnel.employee"
+  set_column_default "FIRST_NAME", 'john'
 end
 
 
-f = Foo.create!("emp_id" => 1001)
+f = Foo.create!("id" => 1001, :date_added => Time.now)
 f.column_values.keys.each do |k|
   puts f.column_values[k]
 end

metadata

@@ -1,61 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: data_factory
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
+  prerelease:
 platform: ruby
 authors:
 - Stephen O'Donnell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2015-07-16 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
-  not null columns may need to be populated but are not part of the test
+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 not null columns may need to be populated but are not part of the test
 email: stephen@betteratoracle.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- test/base_api_test.rb
-- test/base_dsl_test.rb
-- test/helper.rb
-- test/sanity.rb
-- test/test_runner.rb
-- lib/data_factory/base.rb
-- lib/data_factory/base_api.rb
-- lib/data_factory/base_dsl.rb
-- lib/data_factory/base_factory.rb
-- lib/data_factory/column.rb
-- lib/data_factory/exceptions.rb
-- lib/data_factory/random.rb
-- lib/data_factory.rb
-- Rakefile.rb
-- README.md
+- !binary |-
+  dGVzdC9iYXNlX2FwaV90ZXN0LnJi
+- !binary |-
+  dGVzdC9iYXNlX2RzbF90ZXN0LnJi
+- !binary |-
+  dGVzdC9oZWxwZXIucmI=
+- !binary |-
+  dGVzdC9zYW5pdHkucmI=
+- !binary |-
+  dGVzdC90ZXN0X3J1bm5lci5yYg==
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS5yYg==
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9iYXNlLnJi
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9iYXNlX2FwaS5yYg==
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9iYXNlX2RzbC5yYg==
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9iYXNlX2ZhY3RvcnkucmI=
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9jb2x1bW4ucmI=
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9leGNlcHRpb25zLnJi
+- !binary |-
+  bGliL2RhdGFfZmFjdG9yeS9yYW5kb20ucmI=
+- !binary |-
+  UmFrZWZpbGUucmI=
+- !binary |-
+  UkVBRE1FLm1k
 homepage: http://betteratoracle.com
 licenses: []
-metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
-signing_key: 
-specification_version: 4
-summary: A gem to generate template insert statements for use when unit testing database
-  code
+rubyforge_project:
+rubygems_version: 1.8.25
+signing_key:
+specification_version: 3
+summary: A gem to generate template insert statements for use when unit testing database code
 test_files: []
+has_rdoc: true

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9e822bc63cfb321de0f6c8c84644c1c34b1cf46e
-  data.tar.gz: 8669da85bf543f5f6cf3c96dbdf035211a973ea8
-SHA512:
-  metadata.gz: be85d1e78d4a80058fdb8b4dc4b81bae88679eafd27a5231cf4f461af621bb8c47a58a334f3b0c18863df1f9fa6a85ef44df976251fe52db463ea8ff2a8881d2
-  data.tar.gz: b30aedf808030b04d31f080a91b33b30f9bbcc297474d82ff193a06aa3f85d5e3c874fa9379b70e2ac8cb8076cfbe2cc6dde170e3aeea0d5fee51ce028b2e725