@@ -1,14 +1,19 @@ module ActiveRecord module ConnectionAdapters # :nodoc: module SchemaStatements - def create_versioned_table(table_name, options={}, &block) + + # Pass in ":versioned => false" in the options hash to create a non-versioned table. + def create_content_table(table_name, options={}, &block) #Do the primary table t = TableDefinition.new(self) t.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false - t.integer :version - t.integer :lock_version, :default => 0 + unless options[:versioned] == false + t.integer :version + t.integer :lock_version, :default => 0 + end + yield t # Blocks currently must have a name column, otherwise the UI fails in several places. @@ -21,35 +26,36 @@ module ActiveRecord t.integer :created_by_id t.integer :updated_by_id t.timestamps - create_table_from_definition(table_name, options, t) - #Do the versions table - vt = TableDefinition.new(self) - vt.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false + unless options[:versioned] == false + #Do the versions table + vt = TableDefinition.new(self) + vt.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false - vt.integer "#{table_name.to_s.singularize}_id".to_sym - vt.integer :version - yield vt + vt.integer "#{table_name.to_s.singularize}_id".to_sym + vt.integer :version + yield vt - # Create implicit name column in version table as well. - vt.string :name unless vt[:name] + # Create implicit name column in version table as well. + vt.string :name unless vt[:name] - vt.boolean :published, :default => false - vt.boolean :deleted, :default => false - vt.boolean :archived, :default => false - vt.string :version_comment - vt.integer :created_by_id - vt.integer :updated_by_id - vt.timestamps - + vt.boolean :published, :default => false + vt.boolean :deleted, :default => false + vt.boolean :archived, :default => false + vt.string :version_comment + vt.integer :created_by_id + vt.integer :updated_by_id + vt.timestamps - - create_table_from_definition("#{table_name.to_s.singularize}_versions".to_sym, options, vt) + create_table_from_definition("#{table_name.to_s.singularize}_versions".to_sym, options, vt) + end end + alias :create_versioned_table :create_content_table + def create_table_from_definition(table_name, options, table_definition) if options[:force] && table_exists?(table_name) drop_table(table_name, options) @@ -69,4 +75,4 @@ module ActiveRecord end end -end \ No newline at end of file +end lib/cms/extensions/active_record/connection_adapters/abstract/schema_statements.rb @@ -1,6 +1,6 @@ class <%= migration_name %> < ActiveRecord::Migration def self.up - create_versioned_table :<%= table_name %> do |t| + create_content_table :<%= table_name %> do |t| <% for attribute in attributes -%> <%= case attribute.type @@ -31,6 +31,7 @@ class <%= migration_name %> < ActiveRecord::Migration def self.down ContentType.delete_all(['name = ?', '<%= class_name %>']) CategoryType.all(:conditions => ['name = ?', '<%= class_name.titleize %>']).each(&:destroy) + #If you aren't creating a versioned table, be sure to comment this out. drop_table :<%= table_name.singularize %>_versions drop_table :<%= table_name %> end rails_generators/content_block/templates/migration.rb 3bdd2145900ef5f2405e0e80a62335966e20a508 Daniel Collis-Puro dan@collispuro.net http://github.com/browsermedia/browsercms/commit/abf900165f6ddf64bc9a75f4a3da1b052345bce0 abf900165f6ddf64bc9a75f4a3da1b052345bce0 2009-07-30T13:39:50-07:00 2009-07-30T13:39:50-07:00 Rename the "create_versioned_table" method to "create_content_table", aliasing the old method. Accept a "versioned" option and allow for the creation of non-versioned content_blocks, with the default behavior retained. 317b7abb04a7fb2248ad459d7df2daad4b53cb73 Daniel Collis-Puro dan@collispuro.net