Changeset 2312

Timestamp:

09/23/05 13:29:33 (5 years ago)

Author:

minam

Message:

Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb (modified) (4 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/schema_dumper.rb (added)
• trunk/activerecord/lib/active_record/schema.rb (added)
• trunk/activerecord/test/adapter_test.rb (added)
• trunk/activerecord/test/ar_schema_test.rb (added)
• trunk/activerecord/test/migration_test.rb (modified) (2 diffs)
• trunk/activerecord/test/schema_dumper_test.rb (added)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases.
-
-* Fixed migrations for Windows when using more than 10 [David Naseby]

trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -153 +153 @@
-  module ConnectionAdapters # :nodoc:
-    class Column # :nodoc:
-
+, :null
-      # The name should contain the name of the column, such as "name" in "name varchar(250)"
-      # The default should contain the type-casted default of the column, such as 1 in "count int(11) DEFAULT 1"
-      # The type parameter should either contain :integer, :float, :datetime, :date, :text, or :string
-      # The sql_type is just used for extracting the limit, such as 10 in "varchar(10)"
-
- = name, type_cast(default), simplified_type(sql_type)
+, null = true
+, @null = name, type_cast(default), simplified_type(sql_type), null
-        @limit = extract_limit(sql_type) unless sql_type.nil?
-      end
@@ -276 +276 @@
-      def select_one(sql, name = nil) end
-
+      # Returns an array of table names for the current database.
+      def tables(name = nil) end
+
+      # Returns an array of indexes for the given table.
+      def indexes(table_name, name = nil) end
+
-      # Returns an array of column objects for the table specified by +table_name+.
-      def columns(table_name, name = nil) end
@@ -424 +430 @@
-      end
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-      
@@ -505 +545 @@
-    end
-
+    class IndexDefinition < Struct.new(:table, :name, :unique, :columns)
+    end
+
-    class ColumnDefinition < Struct.new(:base, :name, :type, :limit, :default, :null)
-      def to_sql

trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -103 +103 @@
-      end
-
+      def tables(name = nil)
+        tables = []
+        execute("SHOW TABLES", name).each { |field| tables << field[0] }
+        tables
+      end
+
+      def indexes(table_name, name = nil)
+        indexes = []
+        current_index = nil
+        execute("SHOW KEYS FROM #{table_name}", name).each do |row|
+          if current_index != row[2]
+            next if row[2] == "PRIMARY" # skip the primary key
+            current_index = row[2]
+            indexes << IndexDefinition.new(row[0], row[2], row[1] == "0", [])
+          end
+
+          indexes.last.columns << row[4]
+        end
+        indexes
+      end
+
-      def columns(table_name, name = nil)
-        sql = "SHOW FIELDS FROM #{table_name}"
-        columns = []
-
+, field[2] == "YES"
-        columns
-      end

trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -151 +151 @@
-      def rollback_db_transaction() @connection.rollback    end
-
-
-
-
+
+
+
+
-      end
-
-      def columns(table_name, name = nil)
-        table_structure(table_name).map { |field|
-
+, field['notnull'] == "0"
-        }
+      end
+
+      def indexes(table_name, name = nil)
+        execute("PRAGMA index_list(#{table_name})", name).map do |row|
+          index = IndexDefinition.new(table_name, row['name'])
+          index.unique = row['unique'] != '0'
+          index.columns = execute("PRAGMA index_info(#{index.name})").map { |col| col['name'] }
+          index
+        end
-      end
-
@@ -220 +230 @@
-          returning structure = execute("PRAGMA table_info(#{table_name})") do
-            raise ActiveRecord::StatementInvalid if structure.empty?
-          end
-        end
-        
-        def indexes(table_name)
-          execute("PRAGMA index_list(#{table_name})").map do |index|
-            index_info = execute("PRAGMA index_info(#{index['name']})")
-            {
-              :name    => index['name'],
-              :unique  => index['unique'].to_i == 1,
-              :columns => index_info.map {|info| info['name']}
-            }
-          end
-        end

trunk/activerecord/test/migration_test.rb

@@ -33 +33 @@
-    def test_add_index
-      Person.connection.add_column "people", "last_name", :string        
+      Person.connection.add_column "people", "administrator", :boolean
-      
-      assert_nothing_raised { Person.connection.add_index("people", "last_name") }
@@ -39 +40 @@
-      assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"]) }
-      assert_nothing_raised { Person.connection.remove_index("people", "last_name") }
+
+      assert_nothing_raised { Person.connection.add_index("people", %w(last_name first_name administrator), :name => "named_admin") }
+      assert_nothing_raised { Person.connection.remove_index("people", :name => "named_admin") }
-    end
-