schema_comments 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf787ee52801a9d7e04e182ac66a11d5bd8c2f7
-  data.tar.gz: 888fa0d6e255163ff7173103e6a2091b047baf2e
+  metadata.gz: 21a9d779680d54f251b51ab643ec747878b68924
+  data.tar.gz: 3ffa036c8dab55d4386d442e60bdf66aa6ff770e
 SHA512:
-  metadata.gz: aeb01ef93ce21aa25ffa8e7050a54df0b24603dfdf3167c34e1eda9992031fda408f4f5f5ced2a2c248f37e1909791a4dfbb7784b9d07422f95d59f14c19b0dd
-  data.tar.gz: b58f9028895a5bbf729fc7521b5884ba0be8fad8fe90954d040a354b7dc823fde426fc25082eb96637dfc7ae409bdc62a75761d73a423d33a5963dc5dd9958e5
+  metadata.gz: 6027c604d17578b22dfb68aa5e0b6a42c184629ae539c2cb79b9c1634ab76dbf4d55a82136d075d1a7be53756d68ee7e7ff2b2fbadc2e935d6108956806cb524
+  data.tar.gz: e576b7f6de6a7cf31ea2a73413bce1b3929347ac110a2f81c3a84bceab744854d50cf16f73bab85139a8b9f130a74463c17150aced1f21641be640473fa5346c

data/lib/schema_comments/schema_comment.rb

@@ -106,8 +106,13 @@ module SchemaComments
           io.rewind
           root = YAML.load(io)
         end
-        table_comments = root['table_comments'] || {}
-        column_comments = root['column_comments'] || {}
+        SortedStore.sort_yaml_content!(root)
+        root.to_yaml(@opt)
+      end
+
+      def self.sort_yaml_content!(root)
+        table_comments = (root['table_comments'] ||= {})
+        column_comments = (root['column_comments'] ||= {})
         # 大元は
         # table_comments:
         #   ...
@@ -129,11 +134,13 @@ module SchemaComments
         column_comments.extend(HashKeyOrderable)
         column_comments.key_order = table_names
         # column_comments の各値はテーブルのカラム順
+        conn = ActiveRecord::Base.connection
+        columns_method = conn.respond_to?(:columns_without_schema_comments) ? :columns_without_schema_comments : :columns
         column_comments.each do |table_name, column_hash|
           column_hash ||= {}
           column_names = nil
           begin
-            columns = ActiveRecord::Base.connection.columns_without_schema_comments(table_name)
+            columns = conn.send(columns_method, table_name)
             column_names = columns.map(&:name)
           rescue ActiveRecord::ActiveRecordError
             column_names = column_hash.keys.sort
@@ -143,7 +150,6 @@ module SchemaComments
           column_hash.extend(HashKeyOrderable)
           column_hash.key_order = column_names
         end
-        root.to_yaml(@opt)
       end
     end
 

data/lib/schema_comments/task.rb

@@ -1 +1 @@
-Dir.glob(File.join(File.dirname(__FILE__), '../../tasks/*.rake')){|f| load(f)}
+Dir.glob(File.expand_path('../tasks/*.rake', __FILE__)){|f| load(f)}

data/lib/schema_comments/tasks/alter_comments.rake

@@ -0,0 +1,53 @@
+namespace :db do
+  namespace :schema do
+    namespace :comments do
+
+      desc "update #{SchemaComments.yaml_path} from mysql comments of tables and columns"
+      task :dump => :environment do
+        conn = ActiveRecord::Base.connection
+        db_table_comments = conn.select_all("SHOW TABLE STATUS").each_with_object({}){|row, d| d[row["Name"]] = row["Comment"]}
+        column_comments = {}
+        db_table_comments.keys.each do |t|
+          column_comments[t] = conn.select_all("SHOW FULL COLUMNS FROM #{t}").each_with_object({}){|row, d| d[row["Field"]] = row["Comment"]}
+        end
+        root = {"table_comments" => db_table_comments, "column_comments" => column_comments}
+        SchemaComments::SchemaComment::SortedStore.sort_yaml_content!(root)
+        open(SchemaComments.yaml_path, "w"){|f| f.puts root.to_yaml }
+      end
+
+      desc "load #{SchemaComments.yaml_path} and alter table for mysql comments"
+      task :load => :environment do
+        conn = ActiveRecord::Base.connection
+        creation = ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation.new(conn)
+
+        db_tables = conn.tables
+        db_table_comments = conn.select_all("SHOW TABLE STATUS").each_with_object({}){|row, d| d[row["Name"]] = row["Comment"]}
+        root = YAML.load_file(SchemaComments.yaml_path)
+        column_comments_root = root["column_comments"]
+        root["table_comments"].each do |t, t_comment|
+          unless db_tables.include?(t)
+            $stderr.puts "\e[33mtable #{t.inspect} doesn't exist\e[0m"
+            next
+          end
+          unless t_comment == db_table_comments[t]
+            conn.execute("ALTER TABLE #{t} COMMENT '#{t_comment}'")
+          end
+
+          column_hash = conn.columns(t).each_with_object({}){|c, d| d[c.name] = c}
+          db_column_comments = conn.select_all("SHOW FULL COLUMNS FROM #{t}").each_with_object({}){|row, d| d[row["Field"]] = row["Comment"]}
+          column_comments = column_comments_root[t]
+          column_comments.each do |c, c_comment|
+            unless c_comment == db_column_comments[t]
+              if col = column_hash[c]
+                opts = col.sql_type.dup
+                creation.send(:add_column_options!, opts, column: col, null: col.null, default: col.default, auto_increment: (col.extra == "auto_increment"))
+                conn.execute("ALTER TABLE #{t} MODIFY #{c} #{opts} COMMENT '#{c_comment}'")
+              end
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/schema_comments/version.rb

@@ -1,3 +1,3 @@
 module SchemaComments
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_comments
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - akm
@@ -116,10 +116,11 @@ files:
 - lib/schema_comments/schema_dumper.rb
 - lib/schema_comments/schema_dumper/mysql.rb
 - lib/schema_comments/task.rb
+- lib/schema_comments/tasks/alter_comments.rake
+- lib/schema_comments/tasks/annotate_models_tasks.rake
+- lib/schema_comments/tasks/schema_comments.rake
 - lib/schema_comments/version.rb
 - schema_comments.gemspec
-- tasks/annotate_models_tasks.rake
-- tasks/schema_comments.rake
 homepage: http://github.com/akm/schema_comments
 licenses:
 - MIT