db_schema 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3851833bd5308ba174d2d70c217b6fc73c7d583b
-  data.tar.gz: 95071a258ce6202862e38a64d0d57fee8a0cfea9
+  metadata.gz: 1d4608edc6072606f0aaaa72a11f1ba7a25814ea
+  data.tar.gz: 3c8b040331ea7dcbea8b89aa72c1712150517e20
 SHA512:
-  metadata.gz: 424334e2045a9cf08bdf6fedddbc8710c05f1d101ac2bd22350191e71e8dccc201118bb3511590ff56d67610c80494e6c7aed98d2d2e263b582343f910179567
-  data.tar.gz: cac4af5351c520d8610a98c54e57d7c93a884bcc0f0b33e953eedb45291e43e9cfd5fccfef47ee791e3ab07dcde72a546c6c3f0d22959c3acdf8f9b24fe1f1c6
+  metadata.gz: f6050054f09f58c312fc744b1e6ca5cb6ddbc4d52b2908b63d0ba48b2720309e4a85bcaf0399451ccd97e01c4404c0215ee181dede439f98c40bda290c5e9068
+  data.tar.gz: c98ce906a1bca09e5a3d17a8aa9d0283978246bfa2756bc5eec8e57c89792d6b32a57296e73747a0a6a8883bee11615ecccc7e75ef158bf48a5615700082284f

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.2.0'
+gem 'db_schema', '~> 0.2.1'
 ```
 
 And then execute:

data/lib/db_schema/normalizer.rb

@@ -4,6 +4,43 @@ module DbSchema
   class Normalizer
     attr_reader :table
 
+    class << self
+      def normalize_tables(schema)
+        DbSchema.connection.transaction do
+          create_extensions!(schema.extensions)
+          create_enums!(schema.enums)
+
+          schema.tables = schema.tables.map do |table|
+            if table.has_expressions?
+              new(table).normalized_table
+            else
+              table
+            end
+          end
+
+          raise Sequel::Rollback
+        end
+      end
+
+    private
+      def create_extensions!(extensions)
+        (extensions - DbSchema::Reader.read_extensions).each do |extension|
+          operation = DbSchema::Changes::CreateExtension.new(extension.name)
+          DbSchema::Runner.new([operation]).run!
+        end
+      end
+
+      def create_enums!(enums)
+        existing_enums_names = DbSchema::Reader.read_enums.map(&:name)
+        enums.each do |enum|
+          next if existing_enums_names.include?(enum.name)
+
+          operation = DbSchema::Changes::CreateEnum.new(enum.name, enum.values)
+          DbSchema::Runner.new([operation]).run!
+        end
+      end
+    end
+
     def initialize(table)
       @table = table
     end
@@ -11,8 +48,6 @@ module DbSchema
     def normalized_table
       create_temporary_table!
       read_temporary_table
-    ensure
-      cleanup!
     end
 
   private
@@ -39,10 +74,6 @@ module DbSchema
       )
     end
 
-    def cleanup!
-      DbSchema.connection.drop_table(temporary_table_name, if_exists: true)
-    end
-
     def rename_indices(indices)
       indices.map do |index|
         Definitions::Index.new(

data/lib/db_schema/reader.rb

@@ -1,13 +1,9 @@
 module DbSchema
   module Reader
     class << self
-      def read_schema
-        adapter.read_schema
-      end
+      extend Forwardable
 
-      def read_table(table_name)
-        adapter.read_table(table_name)
-      end
+      def_delegators :adapter, :read_schema, :read_table, :read_enums, :read_extensions
 
       def adapter
         adapter_name = DbSchema.configuration.adapter
@@ -120,19 +116,11 @@ SELECT extname
 
       class << self
         def read_schema
-          tables = DbSchema.connection.tables.map do |table_name|
-            read_table(table_name)
-          end
-
-          enums = DbSchema.connection[ENUMS_QUERY].map do |enum_data|
-            Definitions::Enum.new(enum_data[:name].to_sym, enum_data[:values].map(&:to_sym))
-          end
-
-          extensions = DbSchema.connection[EXTENSIONS_QUERY].map do |extension_data|
-            Definitions::Extension.new(extension_data[:extname].to_sym)
-          end
-
-          Definitions::Schema.new(tables: tables, enums: enums, extensions: extensions)
+          Definitions::Schema.new(
+            tables:     read_tables,
+            enums:      read_enums,
+            extensions: read_extensions
+          )
         end
 
         def read_table(table_name)
@@ -208,6 +196,24 @@ SELECT extname
           end
         end
 
+        def read_tables
+          DbSchema.connection.tables.map do |table_name|
+            read_table(table_name)
+          end
+        end
+
+        def read_enums
+          DbSchema.connection[ENUMS_QUERY].map do |enum_data|
+            Definitions::Enum.new(enum_data[:name].to_sym, enum_data[:values].map(&:to_sym))
+          end
+        end
+
+        def read_extensions
+          DbSchema.connection[EXTENSIONS_QUERY].map do |extension_data|
+            Definitions::Extension.new(extension_data[:extname].to_sym)
+          end
+        end
+
       private
         def index_expressions_data(indices_data)
           all_positions, max_position = {}, 0

data/lib/db_schema/version.rb

@@ -1,3 +1,3 @@
 module DbSchema
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

data/lib/db_schema.rb

@@ -18,7 +18,7 @@ module DbSchema
     def describe(&block)
       desired_schema = DSL.new(block).schema
       validate(desired_schema)
-      normalize(desired_schema)
+      Normalizer.normalize_tables(desired_schema)
 
       actual_schema = Reader.read_schema
       changes = Changes.between(desired_schema, actual_schema)
@@ -90,18 +90,6 @@ module DbSchema
       end
     end
 
-    def normalize(schema)
-      normalized_tables = schema.tables.map do |table|
-        if table.has_expressions?
-          Normalizer.new(table).normalized_table
-        else
-          table
-        end
-      end
-
-      schema.tables = normalized_tables
-    end
-
     def log_changes(changes)
       return if changes.empty?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_schema
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Vsevolod Romashov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel