Changeset 7972

Timestamp:

10/19/07 01:52:50 (9 months ago)

Author:

nzkoz

Message:

Move all Schema creation into schema.rb for Mysql. Closes #9899 [mikong, lawrence]

Files:

• trunk/activerecord/Rakefile (modified) (1 diff)
• trunk/activerecord/test/aaa_create_tables_test.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/db_definitions/mysql.drop.sql (deleted)
• trunk/activerecord/test/fixtures/db_definitions/mysql.sql (deleted)
• trunk/activerecord/test/fixtures/db_definitions/mysql2.drop.sql (deleted)
• trunk/activerecord/test/fixtures/db_definitions/mysql2.sql (deleted)
• trunk/activerecord/test/fixtures/db_definitions/schema.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures/db_definitions/schema2.rb (added)

trunk/activerecord/Rakefile

@@ -51 +51 @@
-    %x( mysql -e "grant all on activerecord_unittest.* to rails@localhost" )
-    %x( mysql -e "grant all on activerecord_unittest2.* to rails@localhost" )
-    %x( mysql  activerecord_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
-    %x( mysql  activerecord_unittest2 < #{File.join(SCHEMA_PATH, 'mysql2.sql')} )
-  end
-

trunk/activerecord/test/aaa_create_tables_test.rb

@@ -24 +24 @@
-  
-  def test_drop_and_create_courses_table
-
+
+
+
+
-    assert true
-  end
@@ -30 +33 @@
-  private
-    def use_migrations?
-
-
+
+
+
+
+
+
+
-    end
-

trunk/activerecord/test/fixtures/db_definitions/schema.rb

@@ -1 +1 @@
-ActiveRecord::Schema.define do
+
+  # adapter name is checked because we are under a transition of
+  # moving the sql files under activerecord/test/fixtures/db_definitions
+  # to this file, schema.rb.
+  if adapter_name == "MySQL"
+    
+    # Please keep these create table statements in alphabetical order
+    # unless the ordering matters.  In which case, define them below
+    create_table :accounts, :force => true do |t|
+      t.integer :firm_id
+      t.integer :credit_limit
+    end
+
+    create_table :authors, :force => true do |t|
+      t.string :name, :null => false
+    end
+
+    create_table :auto_id_tests, :force => true, :id => false do |t|
+      t.primary_key :auto_id
+      t.integer     :value
+    end
+    
+    create_table :binaries, :force => true do |t|
+      t.binary :data
+    end
+
+    create_table :booleantests, :force => true do |t|
+      t.integer :value
+    end
+
+    create_table :categories, :force => true do |t|
+      t.string :name, :null => false
+      t.string :type
+    end
+
+    create_table :categories_posts, :force => true, :id => false do |t|
+      t.integer :category_id, :null => false
+      t.integer :post_id, :null => false
+    end
+
+    create_table :colnametests, :force => true do |t|
+      t.integer :references, :null => false
+    end
+    
+    create_table :comments, :force => true do |t|
+      t.integer :post_id, :null => false
+      t.text    :body, :null => false
+      t.string  :type
+    end
+
+    create_table :companies, :force => true do |t|
+      t.string  :type
+      t.string  :ruby_type
+      t.integer :firm_id
+      t.string  :name
+      t.integer :client_of
+      t.integer :rating, :default => 1
+    end
+    
+    create_table :computers, :force => true do |t|
+      t.integer :developer, :null => false
+      t.integer :extendedWarranty, :null => false
+    end
+    
+
+    create_table :customers, :force => true do |t|
+      t.string  :name
+      t.integer :balance, :default => 0
+      t.string  :address_street
+      t.string  :address_city
+      t.string  :address_country
+      t.string  :gps_location
+    end
+
+    create_table :developers, :force => true do |t|
+      t.string   :name
+      t.integer  :salary, :default => 70000
+      t.datetime :created_at
+      t.datetime :updated_at
+    end
+
+    create_table :developers_projects, :force => true, :id => false do |t|
+      t.integer :developer_id, :null => false
+      t.integer :project_id, :null => false
+      t.date    :joined_on
+      t.integer :access_level, :default => 1
+    end
+
+    create_table :entrants, :force => true do |t|
+      t.string  :name, :null => false
+      t.integer :course_id, :null => false
+    end
+
+    create_table :funny_jokes, :force => true do |t|
+      t.string :name
+    end
+    
+    create_table :keyboards, :force => true, :id  => false do |t|
+      t.primary_key :key_number
+      t.string      :name
+    end
+    
+    create_table :legacy_things, :force => true do |t|
+      t.integer :tps_report_number
+      t.integer :version, :null => false, :default => 0
+    end
+    
+    create_table :minimalistics, :force => true do |t|
+    end
+    
+    create_table :mixed_case_monkeys, :force => true, :id => false do |t|
+      t.primary_key :monkeyID
+      t.integer     :fleaCount
+    end
+    
+    create_table :mixins, :force => true do |t|
+      t.integer  :parent_id
+      t.integer  :pos
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.integer  :lft
+      t.integer  :rgt
+      t.integer  :root_id
+      t.string   :type
+    end
+    
+    create_table :movies, :force => true, :id => false do |t|
+      t.primary_key :movieid
+      t.string      :name
+    end
+    
+    create_table :numeric_data, :force => true do |t|
+      t.decimal :bank_balance, :precision => 10, :scale => 2
+      t.decimal :big_bank_balance, :precision => 15, :scale => 2
+      t.decimal :world_population, :precision => 10, :scale => 0
+      t.decimal :my_house_population, :precision => 2, :scale => 0
+      t.decimal :decimal_number_with_default, :precision => 3, :scale => 2, :default => 2.78
+    end
+    
+    create_table :orders, :force => true do |t|
+      t.string  :name
+      t.integer :billing_customer_id
+      t.integer :shipping_customer_id
+    end
+
+    create_table :people, :force => true do |t|
+      t.string  :first_name, :null => false
+      t.integer :lock_version, :null => false, :default => 0
+    end
+    
+    create_table :posts, :force => true do |t|
+      t.integer :author_id
+      t.string  :title, :null => false
+      t.text    :body, :null => false
+      t.string  :type
+    end
+
+    create_table :projects, :force => true do |t|
+      t.string :name
+      t.string :type
+    end
+    
+    create_table :readers, :force => true do |t|
+      t.integer :post_id, :null => false
+      t.integer :person_id, :null => false
+    end
+    
+    create_table :subscribers, :force => true, :id => false do |t|
+      t.string :nick, :null => false
+      t.string :name
+    end
+    add_index :subscribers, :nick, :unique => true
+
+    create_table :tasks, :force => true do |t|
+      t.datetime :starting
+      t.datetime :ending
+    end
+
+    create_table :topics, :force => true do |t|
+      t.string   :title
+      t.string   :author_name
+      t.string   :author_email_address
+      t.datetime :written_on
+      t.time     :bonus_time
+      t.date     :last_read
+      t.text     :content
+      t.boolean  :approved, :default => true
+      t.integer  :replies_count, :default => 0
+      t.integer  :parent_id
+      t.string   :type
+    end
+
+
+
+    ### These tables are created last as the order is significant
+
+    # fk_test_has_fk should be before fk_test_has_pk
+    create_table :fk_test_has_fk, :force => true do |t|
+      t.integer :fk_id, :null => false
+    end
+
+    create_table :fk_test_has_pk, :force => true do |t|
+    end
+
+    execute 'alter table fk_test_has_fk
+               add FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`)'
+
+
+  end
-
-  # For Firebird, set the sequence values 10000 when create_table is called;