duck_duck_duck 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96a0a5d2eea0741dc957719b4ca89504145caad
-  data.tar.gz: b7f15f5d7eb81dbcf02288a6ca7391190d4db9ca
+  metadata.gz: eb33bc9a033282d066dd12a980c0a41ecfcfeca5
+  data.tar.gz: 95a6f37f30a099bafcf45db109d14a06d7b91a5e
 SHA512:
-  metadata.gz: 480a90259c5b62964b52ef0a0230d8d5783c98c8401fb5da21fbb33cc5dbdad800189075a84cd2227cbbd740f21f9ab26e23f06ec5be01d47461964d94adda30
-  data.tar.gz: 9343ed12b6b96549e2da6ce57818e7c070a15bcee006c4497cae57a530d9112036703f10af275f8656cb2daf48c73c2575548da102abb5f9ccb4a00abee79a0b
+  metadata.gz: eeedc977caa49085b38ef18f7d40a07ae2024e526187d40cbe64b033facc7b9c2d7ca0393355fc8020e30de3b30cb3258f20774e4da0af5e170637a1e7b37063
+  data.tar.gz: 05893d31a983d6130e8aacdb311ae88a603ad14a42550532520242f479ca9ca4e2c8ed4758105cf7f61822ecf331d50cdb39bbb10f6ce8cc8762145cbf795d6f

data/README.md

@@ -1,12 +1,12 @@
 
-duck_duck_duck
+duck\_duck\_duck
 ==============
 You won't find this useful.
 
 However, if you are still curious:
 
 * If you like to break up apps into smaller apps,
-  and you want them to use the smae db, but
+  and you want them to use the same db, but
   different tables, duck\_duck\_duck
   lets you migrate those mini-apps
   to the same db.
@@ -17,3 +17,28 @@ Previously...
 Originally, this was a node module.
 The node module is no longer maintained. It is now
 a Ruby gem.
+
+Commands
+=========
+
+```bash
+  cd /my/model/dir
+  duck_duck_duck   up       MODEL_NAME
+  duck_duck_duck   down     MODEL_NAME
+  duck_duck_duck   create   MODEL_NAME  postfix
+```
+
+Sample .sql file:
+
+```sql
+  SELECT 1;
+  -- DOWN
+  SELECT 2
+
+  -- UP:
+  -- colons ":' are optional
+  SELECT 3;
+
+  -- DOWN:
+  SELECT 4;
+```

data/VERSION

@@ -1 +1 @@
-3.1.1
+4.0.0

data/lib/duck_duck_duck.rb

@@ -19,8 +19,8 @@ class Duck_Duck_Duck
     def migrate_schema
       DB << <<-EOF
         CREATE TABLE IF NOT EXISTS #{SCHEMA_TABLE} (
-          name      varchar(255) NOT NULL PRIMARY KEY ,
-          version   smallint     NOT NULL DEFAULT 0
+          name              varchar(255) NOT NULL PRIMARY KEY,
+          version           smallint     NOT NULL DEFAULT 0
         )
       EOF
     end
@@ -69,7 +69,12 @@ class Duck_Duck_Duck
     if !@name
       fail ArgumentError, "Name required."
     end
-    @files = Dir.glob("#{name}/migrates/*.sql")
+
+    @files = `find . -iregex ".+/#{name}/migrates/.+\.sql"`
+    .strip
+    .split("\n")
+    .grep(/\/\d+\-/)
+    .sort
   end
 
   def file_to_ver str
@@ -81,15 +86,25 @@ class Duck_Duck_Duck
     up
   end
 
-  def up
-    rec = DB.fetch("SELECT version FROM #{SCHEMA_TABLE} WHERE name = :name",  :name=>name).all.first
+  def init_model_in_schema
+    rec = DB.fetch(
+      "SELECT version FROM #{SCHEMA_TABLE} WHERE name = upper( :name )",
+      :name=>name
+    ).all.first
 
     if !rec
-      ds = DB["INSERT INTO #{SCHEMA_TABLE} (name, version) VALUES (?, ?)", name, 0]
-      ds.insert
-      rec = {:version=>0}
+      rec = DB.fetch(
+        "INSERT INTO #{SCHEMA_TABLE} (name, version) VALUES (upper(:name), :version) RETURNING *",
+        :name=>name, :version=>0
+      ).all.first
     end
 
+    {:version=>rec[:version]}
+  end
+
+  def up
+    rec = init_model_in_schema
+
     if rec[:version] < 0
       puts "#{name} has an invalid version: #{rec[:version]}\n"
       exit 1
@@ -106,7 +121,7 @@ class Duck_Duck_Duck
       ver = pair.first
       sql = pair[1]
       DB << sql
-      DB[" UPDATE #{SCHEMA_TABLE.inspect} SET version = ? WHERE name = ? ", ver, name].update
+      DB[" UPDATE #{SCHEMA_TABLE.inspect} SET version = ? WHERE name = upper( ? ); ", ver, name].update
       puts "#{name} schema is now : #{ver}"
     }
 
@@ -116,13 +131,7 @@ class Duck_Duck_Duck
   end # === def up
 
   def down
-    rec = DB.fetch("SELECT version FROM #{SCHEMA_TABLE} WHERE name = :name",  :name=>name).all.first
-
-    if !rec
-      ds = DB["INSERT INTO #{SCHEMA_TABLE} (name, version) VALUES (?, ?)", name, 0]
-      ds.insert
-      rec = {:version=>0}
-    end
+    rec = init_model_in_schema
 
     if rec[:version] == 0
       puts "#{name} is already the latest: #{rec[:version]}\n"
@@ -151,7 +160,7 @@ class Duck_Duck_Duck
       ver = prev_pair.first.to_i
       sql = pair[1]
       DB << sql
-      DB[" UPDATE #{SCHEMA_TABLE} SET version = ? WHERE name = ? ", ver, name].update
+      DB[" UPDATE #{SCHEMA_TABLE} SET version = ? WHERE name = upper( ? )", ver, name].update
       puts "#{name} schema is now : #{ver}"
     }
 
@@ -160,14 +169,12 @@ class Duck_Duck_Duck
   def create
     `mkdir -p #{name}/migrates`
 
-    files = Dir.glob("#{name}/migrates/*.sql").grep(/\/\d+\-/).sort
-
     size = 3
     next_ver = begin
-                 (files.last || '')[/\/(\d+)[^\/]+\z/]
+                 (@files.last || '')[/\/(\d+)[^\/]+\z/]
                  v = if $1
                        size = $1.size
-                       $1 
+                       $1
                       else
                         '0'
                       end

data/specs/duck_duck_duck.rb

@@ -112,12 +112,18 @@ describe 'up model' do
   it 'does not run migrations from previous versions' do
     Exit_0("duck_duck_duck migrate_schema")
     DB << File.read("0010_model/migrates/0010-table.sql").split('-- DOWN').first
-    DB << "INSERT INTO #{schema.inspect} VALUES ('0010_model', '20');"
+    DB << "INSERT INTO #{schema.inspect} VALUES (upper('0010_model'), '20');"
     Exit_0("duck_duck_duck up 0010_model")
     get('SELECT * FROM "0010_model"', :title).
       should == ['record 30', 'record 40', 'record 50']
   end
 
+  it "ignores case of model" do
+    Exit_0("duck_duck_duck up 0010_mOdEl")
+    get('SELECT * FROM _test_schema').
+      first[:version].should == versions('0010_model').last
+  end # === it
+
 end # === describe up model
 
 describe 'down model' do
@@ -127,7 +133,7 @@ describe 'down model' do
   it 'leaves version to 0' do
     Exit_0("duck_duck_duck up 0010_model")
     Exit_0("duck_duck_duck down 0010_model")
-    get(%^SELECT * FROM #{schema.inspect} WHERE name = '0010_model'^, :version).last.
+    get(%^SELECT * FROM #{schema.inspect} WHERE name = upper('0010_model');^, :version).last.
       should == 0
   end
 
@@ -141,13 +147,20 @@ describe 'down model' do
   it 'does not run down migrates from later versions' do
     Exit_0("duck_duck_duck migrate_schema")
     DB << File.read("0020_model/migrates/0010-table.sql").split('-- DOWN').first
-    DB << "INSERT INTO #{schema.inspect} VALUES ('0020_model', '20');"
+    DB << "INSERT INTO #{schema.inspect} VALUES (upper('0020_model'), '20');"
     DB << "UPDATE #{schema} SET version = '20' WHERE name = '0020_model';"
     Exit_0("duck_duck_duck down 0020_model")
-    get('SELECT * FROM "0020_model"', :title).
+    get('SELECT title FROM "0020_model"', :title).
       should == ['DROP record 20', 'DROP 0020_model']
   end
 
+  it 'ignores case of model' do
+    Exit_0("duck_duck_duck up 0010_model")
+    Exit_0("duck_duck_duck down 0010_MoDeL")
+    get(%^SELECT * FROM #{schema.inspect} WHERE name = upper('0010_model');^, :version).last.
+      should == 0
+  end
+
 end # === describe down model
 
 describe '-- UP/-- DOWN model' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_duck_duck
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry