volt-sql 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a834868fd701ac0a4f7b4b35a54e1bcd2f543a2
-  data.tar.gz: 3d5efb82730d25ab1ebd6e13e6176f456e4f3c4e
+  metadata.gz: e7e548ec4a0ab1a1d1a6c20e2f49b1ee265cd9f5
+  data.tar.gz: a608aef5539926f5519b8e490c4a03107c002ad8
 SHA512:
-  metadata.gz: bdea5818bf692546f6e79531e463ab7f9d1ed7cac9024704b083c7cc1de7b2d389dd7d2ea1ec09e70fa9a260bc317e84e340b389d3850516c54839f7b465e1b3
-  data.tar.gz: ab2e2d872e64e381fac7a3cf5848cfbe02444bb2a08efc8f3bf497e014973a9b096729526e265971129e6c4ad0448ced0dae758e9a3f87dc00964489a1052bad
+  metadata.gz: aa240c8a9145fc364d7c3ca8aeecd2366363156d509cd4a46bf6bbdef848d6b1c8c09c225151918bc13693fbc8bc2eb1ed14d2ce359a2ad88ae2a48639900523
+  data.tar.gz: 360549f4778a1efb9a3dd3116ff7c01a7e4470ae36cbeef20ef160018322f3b460989b64555e989d9a301946e951e4e967a153886e16002ff48eb62200934ba2

data/app/sql/lib/field_updater.rb

@@ -37,7 +37,7 @@ module Volt
             sequel_default = sequel_opts.delete(:default)
 
             if db_default != sequel_default
-              up_code << "set_column_default #{table_name.inspect}, #{column_name.inspect}, #{sequel_default.inspect}"
+              up_code << "if column_exists?(#{table_name.inspect}, #{column_name.inspect})\n  set_column_default #{table_name.inspect}, #{column_name.inspect}, #{sequel_default.inspect}\nend"
               down_code << "set_column_default #{table_name.inspect}, #{column_name.inspect}, #{db_default.inspect}"
             end
 
@@ -49,10 +49,10 @@ module Volt
               if db_null != sequel_null
                 # allow null changed
                 if sequel_null
-                  up_code << "set_column_allow_null #{table_name.inspect}, #{column_name.inspect}"
+                  up_code << "if column_exists?(#{table_name.inspect}, #{column_name.inspect})\n  set_column_allow_null #{table_name.inspect}, #{column_name.inspect}\nend"
                   down_code << "set_column_not_null #{table_name.inspect}, #{column_name.inspect}"
                 else
-                  up_code << "set_column_not_null #{table_name.inspect}, #{column_name.inspect}"
+                  up_code << "if column_exists?(#{table_name.inspect}, #{column_name.inspect})\n  set_column_not_null #{table_name.inspect}, #{column_name.inspect}\nend"
                   down_code << "set_column_allow_null #{table_name.inspect}, #{column_name.inspect}"
                 end
 
@@ -63,7 +63,7 @@ module Volt
 
 
             if db_class != sequel_class || db_opts != sequel_opts
-              up_code << "set_column_type #{table_name.inspect}, #{column_name.inspect}, #{sequel_class}, #{sequel_opts.inspect}"
+              up_code << "if column_exists?(#{table_name.inspect}, #{column_name.inspect})\n  set_column_type #{table_name.inspect}, #{column_name.inspect}, #{sequel_class}, #{sequel_opts.inspect}\nend"
               down_code << "set_column_type #{table_name.inspect}, #{column_name.inspect}, #{db_class}, #{db_opts.inspect}"
             end
 
@@ -84,7 +84,7 @@ module Volt
         log("Rename #{from_name} to #{to_name} on table #{table_name}")
 
         name = "rename_#{table_name}_#{from_name}_to_#{to_name}"
-        up_code = "rename_column #{table_name.inspect}, #{from_name.inspect}, #{to_name.inspect}"
+        up_code = "if column_exists?(#{table_name.inspect}, #{from_name.inspect})\n  rename_column #{table_name.inspect}, #{from_name.inspect}, #{to_name.inspect}\nend"
         down_code = "rename_column #{table_name.inspect}, #{to_name.inspect}, #{from_name.inspect}"
         generate_and_run(name, up_code, down_code)
       end
@@ -93,7 +93,7 @@ module Volt
         log("Remove #{column_name} from table #{table_name}")
 
         name = "remove_#{table_name}_#{column_name}"
-        up_code = "drop_column #{table_name.inspect}, #{column_name.inspect}"
+        up_code = "if column_exists?(#{table_name.inspect}, #{column_name.inspect})\n  drop_column #{table_name.inspect}, #{column_name.inspect}\nend"
 
         sequel_class, sequel_options = @table_reconcile.sequel_class_and_opts_from_db(db_field)
         down_code = "add_column #{table_name.inspect}, #{column_name.inspect}, #{sequel_class}, #{sequel_options.inspect}"
@@ -102,6 +102,7 @@ module Volt
 
       # private
       def generate_and_run(name, up_code, down_code)
+        puts "GAR: #{up_code.inspect}"
         path = Volt::Sql::MigrationGenerator.create_migration(name, up_code, down_code)
 
         Volt::MigrationRunner.new(@db).run_migration(path, :up)

data/app/sql/lib/migration.rb

@@ -48,5 +48,17 @@ module Volt
         set_column_default(column_name, default)
       end
     end
+
+    def table_exists?(table_name)
+      @db.tables && @db.tables.include?(table_name)
+    end
+
+    def column_exists?(table_name, column_name)
+      if table_exists?(table_name)
+        @db[table_name].columns.include?(column_name)
+      else
+        false
+      end
+    end
   end
 end

data/app/sql/lib/migration_generator.rb

@@ -33,9 +33,9 @@ module Volt
       def self.indent_string(string, count)
         string.split("\n").map.with_index do |line,index|
           if index == 0
-            string
+            line
           else
-            (' ' * count) + string
+            (' ' * count) + line
           end
         end.join("\n")
       end

data/app/sql/lib/migration_runner.rb

@@ -3,6 +3,17 @@
 
 module Volt
   class MigrationRunner
+    alias_method :__run__, :run
+
+    def run(direction=:up, until_version=nil)
+      # reconcile after run in production
+      # if Volt.env.production?
+      #   Volt.current_app.database.reconcile!
+      # end
+
+      __run__(direction, until_version)
+    end
+
     def raw_db
       @raw_db ||= Volt.current_app.database.raw_db
     end

data/app/sql/lib/reconcile.rb

@@ -22,12 +22,19 @@ module Volt
       # reconcile takes the database from its current state to the state defined
       # in the model classes with the field helper
       def reconcile!
+        table_reconciles = []
+        Volt::RootModels.model_classes.each do |model_class|
+          table_reconciles << TableReconcile.new(@adaptor, @db, model_class)
+        end
+
+        # Make any missing tables
+        table_reconciles.each(&:ensure_table)
+
         # Make sure the migrations are up to date first.
         Volt::MigrationRunner.new(@db).run
 
-        Volt::RootModels.model_classes.each do |model_class|
-          TableReconcile.new(@adaptor, @db, model_class).run
-        end
+        # After the migrations, reconcile tables
+        table_reconciles.each(&:run)
 
         # After the initial reconcile!, we add a listener for any new models
         # created, so we can reconcile them (in specs mostly)

data/app/sql/lib/table_reconcile.rb

@@ -9,20 +9,17 @@ module Volt
     class TableReconcile
       include SqlLogger
 
-      attr_reader :field_updater
+      attr_reader :table_name, :field_updater
 
       def initialize(adaptor, db, model_class)
         @model_class = model_class
         @adaptor = adaptor
         @db = db
-        @field_updater = FieldUpdater.new(@db, self)
+        @table_name = @model_class.collection_name
+        @field_updater ||= FieldUpdater.new(@db, self)
       end
 
       def run
-        table_name = @model_class.collection_name
-
-        ensure_table(table_name)
-
         update_fields(@model_class, table_name)
 
         IndexUpdater.new(@db, @model_class, table_name)
@@ -31,7 +28,7 @@ module Volt
       end
 
       # Create an empty table if one does not exist
-      def ensure_table(table_name)
+      def ensure_table
         # Check if table exists
         if !@db.tables || !@db.tables.include?(table_name)
           log("Creating Table #{table_name}")

data/lib/volt/sql/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Sql
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/postgres/lib/table_reconcile_spec.rb

@@ -108,7 +108,7 @@ describe Volt::Sql::TableReconcile do
     allow(reconcile.field_updater).to receive(:generate_and_run)
     .with(
       "column_change_sample_model3s_some_num",
-      "set_column_type :sample_model3s, :some_num, String, {:allow_null=>true, :text=>true}",
+      "if column_exists?(:sample_model3s, :some_num)\n  set_column_type :sample_model3s, :some_num, String, {:allow_null=>true, :text=>true}\nend",
       "set_column_type :sample_model3s, :some_num, Fixnum, {:allow_null=>true}"
     ).and_return(nil)
 
@@ -138,7 +138,7 @@ describe Volt::Sql::TableReconcile do
     expect(reconcile.field_updater).to receive(:generate_and_run)
     .with(
       "remove_sample_model4s_some_num",
-      "drop_column :sample_model4s, :some_num",
+      "if column_exists?(:sample_model4s, :some_num)\n  drop_column :sample_model4s, :some_num\nend",
       "add_column :sample_model4s, :some_num, Fixnum, {:allow_null=>true}"
     )
 
@@ -169,7 +169,7 @@ describe Volt::Sql::TableReconcile do
     expect(reconcile.field_updater).to receive(:generate_and_run)
     .with(
       "column_change_sample_model5s_some_num",
-      "set_column_not_null :sample_model5s, :some_num",
+      "if column_exists?(:sample_model5s, :some_num)\n  set_column_not_null :sample_model5s, :some_num\nend",
       "set_column_allow_null :sample_model5s, :some_num"
     )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volt-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Stout