volt-sql 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918bb2e8b15738d1e2d2b80cba4c09cfa24f26a8
-  data.tar.gz: a52245cae20149dec9fa0033c92ca382ef800eb9
+  metadata.gz: 5b04ceed71a848a60ef9725efe1347ee8f9c51de
+  data.tar.gz: fca4338445f775418f3734f4b8e147a4e665f0a5
 SHA512:
-  metadata.gz: 1383480587bfd8b8eed8ebcde8c56ebd68163366622fe9fb63c7d61afa52cea5bad104c6f0ff217bcaaecbd7782f7b5dbcdc77b9b10af66f46f981df6b1d182d
-  data.tar.gz: e52a71cfb0f1a3941fbd67f9ae62ba01e934b90a27f98440c57c27655dbdb95212af6f99764254f4d776aac4e11cbfb88a59bb1863939becb6e81f85e46b32c8
+  metadata.gz: fe9bca98cc32a62cdac847ed4ad9d3e6927230e3bf859e4eff8c31b6686202788a6097646d8b0ec5123a9502fb363dbd7bc71ccf3f0aefe316a6058291510039
+  data.tar.gz: 5993391dfc9ea07dbdd04d1f0754b0797e81d1649d3ae18044ca65fce6ab6d80e8740ad773ff6527addc7b9de21ef38790cb13f81852177ea71edeb43cdb9fcf

data/app/sql/lib/field_updater.rb

@@ -32,6 +32,15 @@ module Volt
             up_code = []
             down_code = []
 
+            # First remove the default values
+            db_default = db_opts.delete(:default)
+            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}"
+              down_code << "set_column_default #{table_name.inspect}, #{column_name.inspect}, #{db_default.inspect}"
+            end
+
             if db_opts != sequel_opts
               # Fetch allow_null, keeping in mind it defaults to true
               db_null = db_opts.fetch(:allow_null, true)

data/app/sql/lib/migration.rb

@@ -2,7 +2,7 @@
 module Volt
   class Migration
     def initialize(db=nil)
-      @db = db || Volt.current_app.database.db
+      @db ||= Volt.current_app.database.raw_db
     end
 
     def add_column(table_name, column_name, klasses, options={})

data/app/sql/lib/migration_runner.rb

@@ -0,0 +1,35 @@
+# We can't use Volt::Model until after the reconcile step has happened, so
+# these methods work directly with the database.
+
+module Volt
+  class MigrationRunner
+    def raw_db
+      @raw_db ||= Volt.current_app.database.raw_db
+    end
+
+    def ensure_migration_versions_table
+      if !raw_db.tables || !raw_db.tables.include?(:migration_versions)
+        raw_db.create_table(:migration_versions) do
+          primary_key :id
+          Fixnum :version, unique: true
+        end
+      end
+    end
+
+    def add_version(version)
+      raw_db[:migration_versions].insert(version: version)
+    end
+
+    def has_version?(version)
+      raw_db.from(:migration_versions).where(version: version).count > 0
+    end
+
+    def remove_version(version)
+      raw_db.from(:migration_versions).where(version: version).delete
+    end
+
+    def all_versions
+      raw_db.from(:migration_versions).all.map {|v| v[:version] }
+    end
+  end
+end

data/app/sql/lib/reconcile.rb

@@ -22,6 +22,9 @@ module Volt
       # reconcile takes the database from its current state to the state defined
       # in the model classes with the field helper
       def reconcile!
+        # 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

data/app/sql/lib/sql_adaptor_server.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'thread'
 require 'sql/lib/migration'
 require 'sql/lib/migration_generator'
+require 'sql/lib/migration_runner'
 require 'sql/lib/reconcile'
 require 'sql/lib/sql_logger'
 require 'sql/lib/helper'
@@ -16,7 +17,7 @@ module Volt
     class SqlAdaptorServer < BaseAdaptorServer
       include Volt::Sql::SqlLogger
 
-      attr_reader :db, :sql_db, :adaptor_name
+      attr_reader :sql_db, :adaptor_name
 
       # :reconcile_complete is set to true after the initial load and reconcile.
       # Any models created after this point will attempt to be auto-reconciled.
@@ -127,6 +128,11 @@ module Volt
         @db
       end
 
+      # Raw access to the sequel connection without auto-migrating.
+      def raw_db
+        @db
+      end
+
       # @param - a string URI, or a Hash of options
       # @param - the adaptor name
       def connect_uri_or_options
@@ -249,7 +255,7 @@ module Volt
       end
 
       def query(collection, query)
-        allowed_methods = %w(where where_with_block offset limit count)
+        allowed_methods = %w(where where_with_block offset order limit count)
 
         result = db.from(collection.to_sym)
 
@@ -279,6 +285,21 @@ module Volt
             result = result.where(*args) do |ident|
               Sql::WhereCall.new(ident).call(block_ast)
             end
+          elsif method_name == :order
+            op = args[0]
+            unless op.is_a?(Hash)
+              raise ".order(..) should be passed a hash of field: :desc or field: :asc"
+            end
+
+            ops = op.map do |field, asc_desc|
+              if asc_desc == :asc
+                field
+              else
+                Sequel.desc(field)
+              end
+            end
+
+            result = result.order(*ops)
           else
             args = self.class.move_to_db_types(args)
             result = result.send(method_name, *args)
@@ -313,7 +334,7 @@ module Volt
         RootModels.clear_temporary
 
         # Drop all tables
-        db(true).drop_table(*db.tables)
+        raw_db.drop_table(*db.tables)
 
         RootModels.model_classes.each do |model_klass|
           model_klass.reconciled = false

data/app/sql/lib/table_reconcile.rb

@@ -85,7 +85,7 @@ module Volt
           if (orphan_fields.size == 1 && new_fields.size == 1)
             from_name = orphan_fields[0]
             to_name = new_fields[0]
-            auto_migrate_field_rename(table_name, from_name, to_name)
+            @field_updater.auto_migrate_field_rename(table_name, from_name, to_name)
 
             # Move in start fields
             db_fields[to_name] = db_fields.delete(from_name)

data/lib/volt/sql/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Sql
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-sql
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -72,6 +72,7 @@ files:
 - app/sql/lib/index_updater.rb
 - app/sql/lib/migration.rb
 - app/sql/lib/migration_generator.rb
+- app/sql/lib/migration_runner.rb
 - app/sql/lib/reconcile.rb
 - app/sql/lib/sql_adaptor_client.rb
 - app/sql/lib/sql_adaptor_server.rb