zdm 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ce840e815a4a41f68dbf90830f69f253b5c75f
-  data.tar.gz: 453c0299bbfe3bfe72850c1f644bcd7460ed1d79
+  metadata.gz: 325f45e849c39b9770c22c7ce892a41f153b6a30
+  data.tar.gz: acb9889d53d320c1d9b74d570f2cfdbc18d2828f
 SHA512:
-  metadata.gz: a1fb2a19947baf93d0be201af690a51e22bd5ef05d9766b310ffb194e6ba7f4c6bfed360733b7d3851a77c94cf9ac9632a6cf8a5f5846cec52b00b4b6c4ca43f
-  data.tar.gz: 583007414de8ff16f071760707ec701276aa6fab9c8efcd17e2efe7d6de15c7358b90ee6195f2ed7bf113f4eee369c45fd9de96a81e0760703a2e5c5c2a3929e
+  metadata.gz: 3a6efd42171ebfe5bc3f152cbc238cf06cfe53322e66d6198bd45dcd702ed5ce6b67446aaee5251f21c63c7de32ae3c7493357b5039457ce513fbd8c7040c813
+  data.tar.gz: 6773233f8e943de709541d87ea7517b0a0d2d662564d27d5f235976086410a22ed845c2b723a5a5ab0e758fb1dc9183e95016cf0a7007d9d0aa501f6dda156f2

data/gemfiles/4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    zdm (1.0.6)
+    zdm (1.0.7)
       activerecord (>= 4.0)
 
 GEM

data/gemfiles/4.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    zdm (1.0.6)
+    zdm (1.0.7)
       activerecord (>= 4.0)
 
 GEM

data/gemfiles/5.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    zdm (1.0.6)
+    zdm (1.0.7)
       activerecord (>= 4.0)
 
 GEM

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Zdm
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/zdm.rb

@@ -136,6 +136,34 @@ module Zdm
     def rename_column(old_name, new_name)
       raise "Unsupported: you must first run a migration adding the column `#{new_name}`, deploy the code live, then run another migration at a later time to remove the column `#{old_name}`"
     end
+
+    def add_index(column_names, opts = {})
+      column_names = Array(column_names)
+      index_name = opts[:name] || "index_#{@origin}_on_#{column_names.join('_and_')}"
+      raise ArgumentError, "Index name '#{index_name}' on table #{@origin} is too long" if index_name.length > 64
+      index_type = opts[:type] || (opts[:unique] ? 'UNIQUE' : '')
+      index_using = "USING #{opts[:using] || 'btree'}"
+      index_columns = quoted_columns_for_index(column_names, opts).join(',')
+      ddl("CREATE #{index_type} INDEX `#{index_name}` #{index_using} ON `#{@copy}` (#{index_columns})")
+    end
+
+    def remove_index(index_name)
+      ddl("ALTER TABLE `#{@copy}` DROP INDEX `#{index_name}`")
+    end
+
+    private
+
+    def quoted_columns_for_index(column_names, opts)
+      option_strings = Hash[column_names.map {|name| [name, '']}]
+      length = opts[:length]
+      case length
+      when Hash
+        column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name) && length[name].present?}
+      when Integer
+        column_names.each {|name| option_strings[name] += "(#{length})"}
+      end
+      column_names.map {|name| "`#{name}`#{option_strings[name]}"}
+    end
   end
 
   class Migrator

data/spec/zdm_spec.rb

@@ -36,6 +36,9 @@ describe Zdm do
       m.alter("DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci")
       m.add_column('test', "varchar(32) DEFAULT 'foo'")
       m.change_column('name', 'varchar(99) NOT NULL')
+      m.remove_index('index_people_on_created_at')
+      m.add_index(:code)
+      m.add_index([:created_at, :code], unique: true, name: 'idx_test', length: {code: 191})
     end
 
     conn = ActiveRecord::Base.connection
@@ -50,8 +53,9 @@ describe Zdm do
         `test` varchar(32) COLLATE utf8_unicode_ci DEFAULT 'foo',
         PRIMARY KEY (`id`),
         UNIQUE KEY `index_people_on_name` (`name`) USING BTREE,
+        UNIQUE KEY `idx_test` (`created_at`,`code`(191)) USING BTREE,
         KEY `index_people_on_account_id_and_code` (`account_id`,`code`(191)) USING BTREE,
-        KEY `index_people_on_created_at` (`created_at`) USING BTREE
+        KEY `index_people_on_code` (`code`(191)) USING BTREE
       ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
     EOS
 
@@ -82,10 +86,12 @@ describe Zdm do
           `account_id` int(11) DEFAULT NULL,
           `name` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
           `code` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-          `created_at` datetime DEFAULT NULL, PRIMARY KEY (`id`),
+          `created_at` datetime DEFAULT NULL,
+          PRIMARY KEY (`id`),
           UNIQUE KEY `index_people_on_name` (`name`) USING BTREE,
+          UNIQUE KEY `idx_test` (`created_at`,`code`(191)) USING BTREE,
           KEY `index_people_on_account_id_and_code` (`account_id`,`code`(191)) USING BTREE,
-          KEY `index_people_on_created_at` (`created_at`) USING BTREE
+          KEY `index_people_on_code` (`code`(191)) USING BTREE
         ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
       EOS
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zdm
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - ITRP Institute, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord