vizzuality-sequel-rails 0.3.4 → 0.3.5

data/lib/sequel-rails/railties/database.rake

@@ -1,4 +1,7 @@
 # TODO: DRY these up
+######################################################
+# BEWARE: Regular Expressions of DOOOOOOOOOOOOOOOOOM #
+######################################################
 namespace :db do
   namespace :schema do
     desc "Create a db/schema.rb file that can be portably used against any DB supported by Sequel"
@@ -6,7 +9,25 @@ namespace :db do
       Sequel.extension :schema_dumper
       db = Sequel.connect(::Rails::Sequel.configuration.environment_for(Rails.env))
       File.open(ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb", "w") do |file|
-        file.write db.dump_schema_migration(same_db: true)
+        database = db.dump_schema_migration(same_db: true)
+        # 0. Add schema_migrations info (mucho importante!)
+        filenames = db[:schema_migrations].map{|x| x[:filename]}
+        statements = filenames.map do |f|
+          "self[:schema_migrations].insert(:filename => \"#{f}\")"
+        end
+
+        inserts = statements.map do |s|
+          "    #{s}"
+        end.join("\n")
+
+        database.gsub!(/(create_table\(:schema_migrations\) do.+?end)/m, '\1'+"\n\n#{inserts}\n")
+
+        # 1. Fuck arbitrary whitespaces.
+        database.gsub!(/\s+$/,"\n")
+
+        # 2. Add new line at end of file
+        database += "\n"
+        file.write database
       end
       Rake::Task["db:schema:dump"].reenable
     end
@@ -19,6 +40,7 @@ namespace :db do
       file = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
       if File.exists?(file)
         load(file)
+        Sequel::Migration.descendants.first.apply(::Sequel::Model.db, :up)
       else
         abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/boot.rb to limit the frameworks that will be loaded}
       end
@@ -129,7 +151,7 @@ namespace :db do
   end
   
   desc 'Create the database, load the schema, and initialize with the seed data'
-  task :setup => [ 'db:create', 'db:migrate', 'db:seed' ]
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
   
   desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
   task :reset => [ 'db:drop', 'db:setup' ]

data/lib/sequel-rails/setup.rb

@@ -16,7 +16,6 @@ module Rails
 
     def self.setup(environment = nil)
       environment ||= Rails.env
-      puts "[sequel-blat] Setting up the #{environment.inspect} environment:"
 
       @@connections ||= {}
       @@connections[environment] ||= ::Sequel.connect({:logger => configuration.logger}.merge(::Rails::Sequel.configuration.environment_for(environment.to_s)))

data/lib/sequel-rails/storage.rb

@@ -141,7 +141,7 @@ module Rails
         def execute(statement)
           commands = ["mysql"]
           commands << "--user" << username unless username.blank?
-          commands << "--password" << password unless password.blank?
+          commands << "--password=#{password}" unless password.blank?
           commands << "--host" << host unless host.blank?
           commands << "-e" << statement
           system(*commands)

data/lib/sequel-rails/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sequel
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vizzuality-sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -205,4 +205,3 @@ test_files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: