db_meta 0.4.0 → 0.5.0

data/lib/db_meta/logger.rb

@@ -1,15 +1,12 @@
-require 'logger'
+require "logger"
 
 class Logger
-
   class Formatter
-    Format2 = "%s\t%s\t%s\n"
+    FORMAT2 = "%s\t%s\t%s\n"
 
     def call(severity, time, progname, msg)
-      time_in_string = "#{time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%03d" % (time.usec/1000)}"
-      Format2 % [time_in_string,severity,msg]
+      time_in_string = "#{time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%03d" % (time.usec / 1000)}"
+      FORMAT2 % [time_in_string, severity, msg]
     end
-
   end
-
 end

data/lib/db_meta/oracle/base.rb

@@ -11,35 +11,34 @@ module DbMeta
         TYPES[type] = self
       end
 
-      def self.from_type(args={})
-        type = args['OBJECT_TYPE']
+      def self.from_type(args = {})
+        type = args["OBJECT_TYPE"]
 
         # return instance of known type
-        return TYPES[type].new(args) if TYPES.keys.include?(type)
+        return TYPES[type].new(args) if TYPES.key?(type)
 
         # There is no implementation for this type yet. Let's just use Base
         Log.warn("Don't know how to handle oracle type [#{type}] yet")
         Base.new(args)
       end
 
-      def initialize(args={})
-        @type = args['OBJECT_TYPE']
-        @name = args['OBJECT_NAME']
+      def initialize(args = {})
+        @type = args["OBJECT_TYPE"]
+        @name = args["OBJECT_NAME"]
 
         @status = :unknown
-        @status = args['STATUS'].downcase.to_sym if args['STATUS']
+        @status = args["STATUS"].downcase.to_sym if args["STATUS"]
 
         @extract_type = :default # :default, :embedded, :merged
 
         @system_object = @name =~ /\$/i # true if there is a '$' in the object name
       end
 
-
       def fetch
       end
 
-      def extract(args={})
-        '-- class/method needs to be implemented'
+      def extract(args = {})
+        "-- class/method needs to be implemented"
       end
 
       def ddl_drop
@@ -49,7 +48,6 @@ module DbMeta
       def system_object?
         @system_object
       end
-
     end
   end
 end

data/lib/db_meta/oracle/connection.rb

@@ -1,4 +1,4 @@
-require 'singleton'
+require "singleton"
 
 module DbMeta
   module Oracle
@@ -19,12 +19,12 @@ module DbMeta
       def get
         unless @pool
           # create connection pool
-          @pool = ::OCI8::ConnectionPool.new(2, @worker, 2, @username, @password, @database_instance)
+          @pool = ::OCI8::ConnectionPool.new(1, @worker, 1, @username, @password, @database_instance)
           Log.info("Connected to #{@username}@#{@database_instance}")
         end
 
         # create and return logical connection. It creates physical connection as needed.
-        return ::OCI8.new(@username, @password, @pool)
+        ::OCI8.new(@username, @password, @pool)
       end
 
       def disconnect
@@ -33,7 +33,6 @@ module DbMeta
         Log.info("Logged off from #{@username}@#{@database_instance}")
         @pool = nil
       end
-
     end
   end
 end

data/lib/db_meta/oracle/helper.rb

@@ -1,19 +1,18 @@
 module DbMeta
   module Oracle
     module Helper
-
       def block(title, size = 80)
-        line = '-- ' + ('-' * (size-3))
-        buffer = [line, "-- #{title}", line].join("\n")
+        line = "-- " + ("-" * (size - 3))
+        [line, "-- #{title}", line].join("\n")
       end
 
       def type_sequence(type)
-        return TYPE_SEQUENCE[type] || 99
+        TYPE_SEQUENCE[type] || 99
       end
 
       def write_buffer_to_file(buffer, file)
         buffer = buffer.join("\n") if buffer.is_a?(Array)
-        File.open(file.downcase.gsub(' ', '_'), 'w') do |output|
+        File.open(file.downcase.tr(" ", "_"), "w") do |output|
           output.write(buffer)
         end
       end
@@ -23,15 +22,14 @@ module DbMeta
       end
 
       def create_folder(folder)
-        Dir.mkdir(folder.downcase.gsub(' ', '_'))
+        Dir.mkdir(folder.downcase.tr(" ", "_"))
       rescue
       end
 
-      def pluralize(n, singular, plural=nil)
+      def pluralize(n, singular, plural = nil)
         return singular if n == 1
-        return (plural || (singular + 's'))
+        (plural || (singular + "s"))
       end
-
     end
   end
 end

data/lib/db_meta/oracle/objects.rb

@@ -7,13 +7,13 @@ module DbMeta
       attr_reader :summary_system_object
 
       def initialize
-        @data = Hash.new{ |h, type|  h[type] = {} }
+        @data = Hash.new { |h, type| h[type] = {} }
         @worker_queue = ::Queue.new
         @types_with_object_status_default = []
 
-        @summary = Hash.new{ |h, type| h[type] = 0 }
-        @summary_system_object = Hash.new{ |h, type| h[type] = 0 }
-        @invalids = Hash.new{ |h, type| h[type] = [] }
+        @summary = Hash.new { |h, type| h[type] = 0 }
+        @summary_system_object = Hash.new { |h, type| h[type] = 0 }
+        @invalids = Hash.new { |h, type| h[type] = [] }
       end
 
       def <<(object)
@@ -25,20 +25,18 @@ module DbMeta
         @invalids[object.type] << object if [:invalid, :disabled].include?(object.status)
       end
 
-      def fetch(args={})
+      def fetch(args = {})
         # fetch details in parallel
-        # start as many worker threads as max physical connections
-        worker = (1..Connection.instance.worker).map do
+        # number of threads = physical connections / 2 to prevent application locking
+        worker = (1..Connection.instance.worker / 2).map {
           Thread.new do
-            begin
-              while object = @worker_queue.pop(true)
-                Log.info(" - #{object.type} - #{object.name}")
-                object.fetch
-              end
-            rescue ThreadError
+            while (object = @worker_queue.pop(true))
+              Log.info(" - #{object.type} - #{object.name}")
+              object.fetch
             end
+          rescue ThreadError
           end
-        end
+        }
         worker.map(&:join) # wait until all are done
       end
 
@@ -46,14 +44,14 @@ module DbMeta
         Log.info("Detecting system objects...")
 
         # detect materialized view tables
-        @data['MATERIALZIED VIEW'].values.each do |object|
-          table = @data['TABLE'][object.name]
+        @data["MATERIALZIED VIEW"].values.each do |object|
+          table = @data["TABLE"][object.name]
           next unless table
           table.system_object = true
         end
 
-        @data['QUEUE'].values.each do |object|
-          table = @data['TABLE'][object.queue_table]
+        @data["QUEUE"].values.each do |object|
+          table = @data["TABLE"][object.queue_table]
           next unless table
           table.system_object = true
         end
@@ -61,38 +59,38 @@ module DbMeta
 
       def merge_synonyms
         Log.info("Merging synonyms...")
-        synonym_collection = SynonymCollection.new(type: 'SYNONYM', name: 'ALL')
+        synonym_collection = SynonymCollection.new(type: "SYNONYM", name: "ALL")
 
-        @data['SYNONYM'].values.each do |object|
+        @data["SYNONYM"].values.each do |object|
           synonym_collection << object
         end
 
         return if synonym_collection.empty?
 
         self << synonym_collection
-        @summary['SYNONYM'] -= 1    # no need to count collection object
+        @summary["SYNONYM"] -= 1 # no need to count collection object
       end
 
       def merge_grants
         Log.info("Merging grants...")
-        grant_collection = GrantCollection.new(type: 'GRANT', name: 'ALL')
+        grant_collection = GrantCollection.new(type: "GRANT", name: "ALL")
 
-        @data['GRANT'].values.sort_by{ |o| o.sort_value }.each do |object|
+        @data["GRANT"].values.sort_by { |o| o.sort_value }.each do |object|
           grant_collection << object
         end
 
         return if grant_collection.empty?
 
         self << grant_collection
-        @summary['GRANT'] -= 1    # no need to count collection object
+        @summary["GRANT"] -= 1 # no need to count collection object
       end
 
       def embed_indexes
         Log.info("Embedding indexes...")
 
-        @data['INDEX'].values.each do |object|
-          next unless @data['TABLE'][object.table_name]
-          @data['TABLE'][object.table_name].add_object(object)
+        @data["INDEX"].values.each do |object|
+          next unless @data["TABLE"][object.table_name]
+          @data["TABLE"][object.table_name].add_object(object)
         end
       end
 
@@ -100,8 +98,8 @@ module DbMeta
         Log.info("Embedding constraints...")
 
         @data["CONSTRAINT"].values.each do |constraint|
-          next unless @data['TABLE'][constraint.table_name]
-          @data['TABLE'][constraint.table_name].add_object(constraint)
+          next unless @data["TABLE"][constraint.table_name]
+          @data["TABLE"][constraint.table_name].add_object(constraint)
         end
       end
 
@@ -109,7 +107,7 @@ module DbMeta
         Log.info("Embedding triggers...")
 
         @data["TRIGGER"].values.each do |object|
-          table_object = @data['TABLE'][object.table_name]
+          table_object = @data["TABLE"][object.table_name]
 
           if table_object
             table_object.add_object(object)
@@ -122,9 +120,9 @@ module DbMeta
 
       def merge_constraints
         Log.info("Merging constraints...")
-        constraint_collection = ConstraintCollection.new(type: 'CONSTRAINT', name: 'ALL FOREIGN KEYS')
+        constraint_collection = ConstraintCollection.new(type: "CONSTRAINT", name: "ALL FOREIGN KEYS")
 
-        @data['CONSTRAINT'].values.each do |object|
+        @data["CONSTRAINT"].values.each do |object|
           next unless object.extract_type == :merged
           constraint_collection << object
         end
@@ -132,7 +130,7 @@ module DbMeta
         return if constraint_collection.empty?
 
         self << constraint_collection
-        @summary['CONSTRAINT'] -= 1    # no need to count collection object
+        @summary["CONSTRAINT"] -= 1 # no need to count collection object
       end
 
       def handle_table_data(args)
@@ -142,19 +140,23 @@ module DbMeta
         @include_data = args[:include_data] if args[:include_data]
 
         tables = []
-        @data['TABLE'].values.each do |table|
+        @data["TABLE"].values.each do |table|
           next if table.system_object?
-          next if table.name =~ @exclude_data if @exclude_data
-          next unless table.name =~ @include_data if @include_data
+          if @exclude_data
+            next if table.name&.match?(@exclude_data)
+          end
+          if @include_data
+            next unless table.name&.match?(@include_data)
+          end
           tables << table
         end
 
-        self << TableDataCollection.new(name: 'ALL CORE DATA', type: 'DATA', tables: tables)
-        @summary['DATA'] -= 1 # no need to count DATA object
+        self << TableDataCollection.new(name: "ALL CORE DATA", type: "DATA", tables: tables)
+        @summary["DATA"] -= 1 # no need to count DATA object
       end
 
       def default_each
-        @data.keys.sort_by{ |type| type_sequence(type) }.each do |type|
+        @data.keys.sort_by { |type| type_sequence(type) }.each do |type|
           @data[type].keys.sort.each do |name|
             object = @data[type][name]
             next if object.system_object?
@@ -165,7 +167,7 @@ module DbMeta
       end
 
       def reverse_default_each
-        @data.keys.sort_by{ |type| type_sequence(type) }.reverse_each do |type|
+        @data.keys.sort_by { |type| type_sequence(type) }.reverse_each do |type|
           @data[type].keys.sort.each do |name|
             object = @data[type][name]
             next if object.system_object?
@@ -191,7 +193,6 @@ module DbMeta
         end
       end
 
-
       def self.all
         objects = []
 
@@ -202,12 +203,12 @@ module DbMeta
         cursor = connection.exec(OBJECT_QUERY)
         cursor.fetch_hash do |item|
           items << item
-          types << item['OBJECT_TYPE']
+          types << item["OBJECT_TYPE"]
         end
         cursor.close
 
         # sort items and make an object instance
-        items.sort_by{ |i| [ type_sequence(i['OBJECT_TYPE']), i['OBJECT_NAME']]}.each do |item|
+        items.sort_by { |i| [type_sequence(i["OBJECT_TYPE"]), i["OBJECT_NAME"]] }.each do |item|
           objects << Base.from_type(item)
         end
 
@@ -215,9 +216,8 @@ module DbMeta
 
         objects
       ensure
-        connection.logoff if connection # closes logical connection
+        connection&.logoff # closes logical connection
       end
-
     end
   end
 end

data/lib/db_meta/oracle/oracle.rb

@@ -1,12 +1,14 @@
-require 'oci8'
-require 'fileutils'
+ENV["NLS_LANG"] = "American_America.UTF8"
 
-require_relative 'connection'
-require_relative 'helper'
-require_relative 'base'
-require_relative 'objects'
+require "oci8"
+require "fileutils"
 
-Dir[File.dirname(__FILE__) + '/types/*.rb'].each {|file| require file }
+require_relative "connection"
+require_relative "helper"
+require_relative "base"
+require_relative "objects"
+
+Dir[File.dirname(__FILE__) + "/types/*.rb"].sort.each { |file| require file }
 
 module DbMeta
   module Oracle
@@ -15,7 +17,7 @@ module DbMeta
 
       register_type(:oracle)
 
-      def initialize(args={})
+      def initialize(args = {})
         super(args)
 
         Connection.instance.set(@username, @password, @instance, @worker)
@@ -23,13 +25,17 @@ module DbMeta
         @objects = Objects.new
       end
 
-      def fetch(args={})
+      def fetch(args = {})
         @include_pattern = args[:include]
         @exclude_pattern = args[:exclude]
 
         Objects.all.each do |object|
-          next if @exclude_pattern =~ object.name if @exclude_pattern
-          next unless @include_pattern =~ object.name if @include_pattern
+          if @exclude_pattern
+            next if @exclude_pattern&.match?(object.name)
+          end
+          if @include_pattern
+            next unless @include_pattern&.match?(object.name)
+          end
           @objects << object
         end
 
@@ -39,7 +45,7 @@ module DbMeta
         Connection.instance.disconnect
       end
 
-      def extract(args={})
+      def extract(args = {})
         format = args[:format] || :sql
 
         # validate args
@@ -66,7 +72,7 @@ module DbMeta
           folder = File.join(@base_folder, "#{"%02d" % type_sequence(object.type)}_#{object.type}")
           create_folder(folder)
 
-          filename = File.join(folder, "#{object.name}.#{format.to_s}")
+          filename = File.join(folder, "#{object.name}.#{format}")
           write_buffer_to_file(object.extract(args), filename)
         end
       end
@@ -82,34 +88,34 @@ module DbMeta
         @objects.summary_each do |type, count|
           next if count == 0
           total += count
-          buffer << "#{SUMMARY_COLUMN_FORMAT_NAME % type.upcase.to_s}#{"%5d" % count} #{"(#{@objects.summary_system_object[type]} system #{pluralize(@objects.summary_system_object[type], 'object')})" if @objects.summary_system_object[type] > 0}"
+          buffer << "#{SUMMARY_COLUMN_FORMAT_NAME % type.upcase.to_s}#{"%5d" % count} #{"(#{@objects.summary_system_object[type]} system #{pluralize(@objects.summary_system_object[type], "object")})" if @objects.summary_system_object[type] > 0}"
         end
         buffer << nil
 
-        buffer << "#{SUMMARY_COLUMN_FORMAT_NAME % 'Total Objects'}#{"%5d" % total}"
+        buffer << "#{SUMMARY_COLUMN_FORMAT_NAME % "Total Objects"}#{"%5d" % total}"
         buffer << nil
         buffer << nil
 
         # invalid objects
         if @objects.invalids?
-          buffer << 'Invalid/Disabled Objects'
+          buffer << "Invalid/Disabled Objects"
           @objects.invalid_each do |type, objects|
             buffer << "#{SUMMARY_COLUMN_FORMAT_NAME % type.upcase.to_s}#{"%5d" % objects.size}"
             objects.each do |object|
-              buffer << "#{SUMMARY_COLUMN_FORMAT_NAME_RIGHT % object.name}"
+              buffer << (SUMMARY_COLUMN_FORMAT_NAME_RIGHT % object.name).to_s
             end
             buffer << nil
           end
         else
-          buffer << 'No invalid/disabled objects'
+          buffer << "No invalid/disabled objects"
         end
         buffer << nil
 
-        filename = File.join(@base_folder, "#{"%02d" % type_sequence('SUMMARY')}_summary.txt")
+        filename = File.join(@base_folder, "#{"%02d" % type_sequence("SUMMARY")}_summary.txt")
         write_buffer_to_file(buffer, filename)
       end
 
-      def extract_create_all(args={})
+      def extract_create_all(args = {})
         Log.info("Extracting create all script...")
 
         buffer = [block("#{@username} - CREATE ALL")]
@@ -117,33 +123,32 @@ module DbMeta
         current_type = nil
         @objects.default_each do |object|
           if current_type != object.type
-            buffer << nil;
+            buffer << nil
             buffer << block(object.type, 40)
           end
 
-          folder = "#{'%02d' % type_sequence(object.type)}_#{object.type}"
+          folder = "#{"%02d" % type_sequence(object.type)}_#{object.type}"
           file = "#{object.name}.sql"
-          buffer << "@#{File.join(folder,file).downcase.gsub(' ', '_')}"
+          buffer << "@#{File.join(folder, file).downcase.tr(" ", "_")}"
           current_type = object.type
         end
         buffer << nil
         buffer << compile_invalid_script
         buffer << nil
 
-        filename = File.join(@base_folder,"#{'%02d' % type_sequence('CREATE')}_create_all.sql")
+        filename = File.join(@base_folder, "#{"%02d" % type_sequence("CREATE")}_create_all.sql")
         write_buffer_to_file(buffer, filename)
       end
 
-      def extract_drop_all(args={})
+      def extract_drop_all(args = {})
         Log.info("Extracting drop all script...")
 
         buffer = [block("#{@username} - DROP ALL")]
 
         current_type = nil
         @objects.reverse_default_each do |object|
-
           if current_type != object.type
-            buffer << nil;
+            buffer << nil
             buffer << block(object.type, 40)
           end
 
@@ -152,12 +157,12 @@ module DbMeta
         end
         buffer << nil
 
-        filename = File.join(@base_folder,"#{'%02d' % type_sequence('DROP')}_drop_all.sql")
+        filename = File.join(@base_folder, "#{"%02d" % type_sequence("DROP")}_drop_all.sql")
         write_buffer_to_file(buffer, filename)
       end
 
       def compile_invalid_script
-        buffer = [block('Compile invalid objects if needed', 40)]
+        buffer = [block("Compile invalid objects if needed", 40)]
         buffer << "declare"
         buffer << "begin"
         buffer << "  for rec in (select object_name, object_type from user_objects where status = 'INVALID') loop"
@@ -172,7 +177,6 @@ module DbMeta
         buffer << "/"
         buffer.join("\n")
       end
-
     end
   end
 end