db_schema 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a6dfe3738279a4199344a79ce5bfbbb7e504d50
-  data.tar.gz: 035b90071d29f3447ac99d79cd324b403e4838d2
+  metadata.gz: f262094701b7ff8ff410c8854af2676daff44f4f
+  data.tar.gz: 0ba850facc23b85c344314a7e1e8b567ac762e4a
 SHA512:
-  metadata.gz: a19fa80ca01c4a3fd95983a73e58cc09628a5f453ca49fc290cfa7238e9eb136bf8de25e8ae7f8f179d9c65ff24a3e18418c6d380e9db7f351f8903cfe8d839f
-  data.tar.gz: 1fe00c3cada2070f96d397920aa785b4ef70cc77856e0ac6818eae46f92281cfdf92d9153c3a7db978a2ad1b13919edf1f2b734331501379c133812437ba8242
+  metadata.gz: 6fb1c3a34728124816899da8c6f67d82d70a38a0f40228cb65fca5597db8db9984fa5490554c64f0484e4160f33da94220fc385cc4b78298c6103aad189b9a6e
+  data.tar.gz: daeb82268ecfa4202dee52f97d92c8f4e2c6cd01a0af5c24ebb8391f16128836137a8914b8ed752eef3a4d07a478853dc75a1315358e2bc2b51df447e9d451a1

data/README.md

@@ -53,7 +53,7 @@ But you would lose it even with manual migrations.
 Add this line to your application's Gemfile:
 
 ``` ruby
-gem 'db_schema', '~> 0.1.2'
+gem 'db_schema', '~> 0.1.3'
 ```
 
 And then execute:

data/lib/db_schema/reader.rb

@@ -190,22 +190,28 @@ SELECT extname
 
       private
         def index_expressions_data(indices_data)
-          expressions_stats = indices_data.each_with_object(ids: [], max: 0) do |index_data, stats|
-            expressions_count = index_data[:column_positions].split(' ').count('0')
+          all_positions, max_position = {}, 0
 
-            if expressions_count > 0
-              stats[:ids] << index_data[:index_oid]
-              stats[:max] = [stats[:max], expressions_count].max
+          indices_data.each do |index_data|
+            positions = index_data[:column_positions].split(' ').map(&:to_i)
+            expression_positions = positions.each_index.select { |i| positions[i].zero? }
+
+            if expression_positions.any?
+              all_positions[index_data[:index_oid]] = expression_positions
+              max_position = [max_position, expression_positions.max].max
             end
           end
 
-          if expressions_stats[:max] > 0
+          if all_positions.any?
             DbSchema.connection[
               EXPRESSION_INDICES_QUERY,
-              Sequel.pg_array(expressions_stats[:ids]),
-              Sequel.pg_array((1..expressions_stats[:max]).to_a)
-            ].each_with_object({}) do |index_data, indices_data|
-              indices_data[index_data[:index_id]] = index_data[:definitions]
+              Sequel.pg_array(all_positions.keys),
+              Sequel.pg_array((1..max_position.succ).to_a)
+            ].each_with_object({}) do |index_data, indexes_data|
+              index_id = index_data[:index_id]
+              expressions = all_positions[index_id].map { |pos| index_data[:definitions][pos] }
+
+              indexes_data[index_id] = expressions
             end
           else
             {}

data/lib/db_schema/version.rb

@@ -1,3 +1,3 @@
 module DbSchema
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Vsevolod Romashov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel