pg_objects 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 785a95765bb30734a49ecab2a2e2c757015849ce52a86cf02d9f7a81664c6910
-  data.tar.gz: f8835b55ff9bfef06706953710bbf09fa0de63e128a54cf52d55c36efaeaf8ef
+  metadata.gz: 1440d84714eee23457350728cd639e7e3a61e789290a6919090664f21a9d02dd
+  data.tar.gz: 6d2be5ba86e02703bb30c64d2a83ba02fc30b4b436ec940527ca96fe95d8edc2
 SHA512:
-  metadata.gz: 6f6183aa49329e67e94e835d182888a1506821bbdd04eaae069dac571302a5b1d5505d32cc2008ffd0d294328bf2ebd96b7d5cbd2c9d66cc3fc6346745a345f2
-  data.tar.gz: ccd6cc5112f0f9d1b88f34cd388dbd0cdeab3d624410951e08063630b467229856ea5b85fbc9e2f7574748c7ab159f116171735ea8bdba5300bbb95cf6c809ff
+  metadata.gz: 33fc09874bfe6313dd5fabd916cd41151a2ebe89ab6319fd93ccea96bedaae80fab7b7c2d150dcf2b9a31e3bcf0ce96f58f0b205d56cdc4d6e54112a06fd5fa7
+  data.tar.gz: f50fa9789f8d44891ebbe4a6f5d9a351a1407f2268b0d1b7a2e1df97ff6739b45be64d81adf88324f10105e4d5788c55982e02d7c27641f4059cb3559dbd8ec5

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.3.8
   - 2.4.5
   - 2.5.3
+  - 2.6.0
 before_install: gem install bundler -v 1.16.2
 script:
  - bundle exec rspec spec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_objects (0.4.2)
+    pg_objects (0.4.3)
       activerecord (>= 4, < 6)
       pg_query (~> 1)
       railties (>= 4, < 6)
@@ -10,26 +10,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -38,21 +38,21 @@ GEM
     ast (2.4.0)
     builder (3.2.3)
     byebug (10.0.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     crass (1.0.4)
     diff-lcs (1.3)
-    erubi (1.7.1)
-    i18n (1.1.1)
+    erubi (1.8.0)
+    i18n (1.3.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.1)
-    mini_portile2 (2.3.0)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
     parser (2.5.3.0)
       ast (~> 2.4.0)
@@ -66,14 +66,14 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (12.3.2)
     rake-hooks (1.2.3)
       rake
     rspec (3.8.0)
@@ -89,7 +89,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.60.0)
+    rubocop (0.61.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -100,11 +100,11 @@ GEM
     rubocop-rspec (1.30.1)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
 
 PLATFORMS
   ruby
@@ -119,4 +119,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/pg_objects.svg)](https://badge.fury.io/rb/pg_objects)
 [![Build Status](https://travis-ci.org/marinazzio/pg_objects.svg?branch=master)](https://travis-ci.org/marinazzio/pg_objects)
 [![Maintainability](https://api.codeclimate.com/v1/badges/935cd23d8f899b6d8057/maintainability)](https://codeclimate.com/github/marinazzio/pg_objects/maintainability)
 

data/lib/pg_objects/db_object.rb

@@ -16,14 +16,9 @@ module PgObjects
 
       directives = Parser.fetch_directives @sql_query
       @dependencies = directives[:depends_on]
-      @multistatement = directives[:multistatement]
       @object_name = Parser.fetch_object_name @sql_query
 
       @status = :pending
     end
-
-    def multistatement?
-      @multistatement
-    end
   end
 end

data/lib/pg_objects/manager.rb

@@ -48,16 +48,11 @@ module PgObjects
       create_dependencies(obj.dependencies)
 
       log.write("creating #{obj.name}")
-      execute_query(obj)
+      ActiveRecord::Base.connection.execute obj.sql_query
 
       obj.status = :done
     end
 
-    def execute_query(obj)
-      exec_method = obj.multistatement? ? :execute : :exec_query
-      ActiveRecord::Base.connection.send exec_method, obj.sql_query
-    end
-
     def create_dependencies(dependencies)
       dependencies.each { |dep_name| create_object find_object(dep_name) }
     end

data/lib/pg_objects/parser.rb

@@ -8,9 +8,6 @@ module PgObjects
   #
   # name_of_dependency: short or full name of object as well as object_name
   #
-  #    --!multistatement
-  #
-  # use when there are more than one SQL command in object file
   class Parser
     ROUTES = [
       ['DefineStmt', 'defnames', 0, 'String', 'str'],
@@ -27,8 +24,7 @@ module PgObjects
     class << self
       def fetch_directives(text)
         {
-          depends_on: fetch_dependencies(text),
-          multistatement: fetch_multistatement(text)
+          depends_on: fetch_dependencies(text)
         }
       end
 
@@ -44,10 +40,6 @@ module PgObjects
       def fetch_dependencies(text)
         text.split("\n").select { |ln| ln =~ /^(--|#)!/ }.map { |ln| ln.split(' ')[1] if ln =~ /!depends_on/ }.compact
       end
-
-      def fetch_multistatement(text)
-        text.split("\n").select { |ln| ln =~ /^(--|#)!/ }.select { |ln| ln =~ /!multistatement/ }.present?
-      end
     end
   end
 end

data/lib/pg_objects/version.rb

@@ -1,3 +1,3 @@
 module PgObjects
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_objects
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Denis Kiselyov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord