@@ -7,7 +7,7 @@ DataMapper will NOT create an auto-incrementing <tt>:id</tt> key for you automatically, so you'll need to either explicitly create one with - property :id, Integer, :serial => true + property :id, Serial You can choose to use a natural key by doing @@ -36,7 +36,7 @@ This is what the Discriminator data-type is for: class Person include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :type, Discriminator ## other shared properties here end FAQ @@ -134,7 +134,11 @@ module DataMapper # TODO: move to dm-more/dm-migrations def property_schema_hash(repository, property) schema = super - schema[:sequence_name] = sequence_name(repository, property) if property.serial? + + if property.serial? + schema.delete(:default) # the sequence will be the default + schema[:sequence_name] = sequence_name(repository, property) + end # TODO: see if TypeMap can be updated to set specific attributes to nil # for different adapters. scale/precision are perfect examples for lib/dm-core/adapters/postgres_adapter.rb @@ -161,7 +161,7 @@ module DataMapper # # Examples: # - # property :id, Integer, :serial => true # auto-incrementing key + # property :id, Serial # auto-incrementing key # property :legacy_pk, String, :key => true # 'natural' key # # This is roughly equivalent to ActiveRecord's <tt>set_primary_key</tt>, lib/dm-core/property.rb @@ -60,7 +60,7 @@ ARExhibit.find_by_sql('SELECT 1') class Exhibit include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :zoo_id, Integer property :notes, Text, :lazy => true script/performance.rb @@ -26,7 +26,7 @@ DataMapper.setup(:default, "mysql://root@localhost/data_mapper_1?socket=#{SOCKET class Exhibit include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :zoo_id, Integer property :notes, Text, :lazy => true script/profile.rb @@ -9,7 +9,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n, :yards @@ -23,7 +23,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String property :rating, Integer property :type, String @@ -38,7 +38,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :sky @@ -51,7 +51,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has 1, :pie @@ -64,7 +64,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n, :slices, :order => [:id.desc] @@ -77,7 +77,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :host @@ -90,7 +90,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n, :children, :class_name => 'Node', :child_key => [ :parent_id ] @@ -235,7 +235,7 @@ if ADAPTER module FlightlessBirds class Ostrich include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :sky # there's something sad about this :'( end @@ -566,7 +566,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n, :cakes, :class_name => 'Sweets::Cake' # has n has n, :recipes, :through => :cakes, :class_name => 'Sweets::Recipe' # has n => has 1 @@ -590,7 +590,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :shop, :class_name => 'Sweets::Shop' has 1, :wife, :class_name => 'Sweets::Wife' @@ -607,7 +607,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :shop_owner, :class_name => 'Sweets::ShopOwner' has 1, :ring, :class_name => 'Sweets::Ring' @@ -619,7 +619,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :wife, :class_name => 'Sweets::Wife' end @@ -629,7 +629,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :wife, :class_name => 'Sweets::Wife' end @@ -639,7 +639,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :shop_owner, :class_name => 'Sweets::ShopOwner' has n, :toys, :class_name => 'Sweets::Toy' @@ -651,7 +651,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :child, :class_name => 'Sweets::Child' end @@ -661,7 +661,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :child, :class_name => 'Sweets::Child' end @@ -671,7 +671,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :shop, :class_name => 'Sweets::Shop' belongs_to :customer, :class_name => 'Sweets::Customer' @@ -688,7 +688,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :cake, :class_name => 'Sweets::Cake' has n, :ingredients, :class_name => 'Sweets::Ingredient' @@ -700,7 +700,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n, :cakes, :class_name => 'Sweets::Cake' end @@ -710,7 +710,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :recipe, :class_name => 'Sweets::Recipe' end @@ -720,7 +720,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :recipe, :class_name => 'Sweets::Recipe' end @@ -730,7 +730,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :size, Integer belongs_to :cake, :class_name => 'Sweets::Cake' has n, :bites, :class_name => 'Sweets::Bite' @@ -742,7 +742,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :slice, :class_name => 'Sweets::Slice' end @@ -752,7 +752,7 @@ if ADAPTER def self.default_repository_name ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String belongs_to :slice, :class_name => 'Sweets::Slice' end @@ -1039,7 +1039,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n..n, :left_items @@ -1052,7 +1052,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n..n, :right_items spec/integration/association_spec.rb @@ -11,7 +11,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :title, String property :voided, Boolean, :default => false @@ -29,7 +29,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :title, String belongs_to :post @@ -42,7 +42,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :title, String has n, :taggings @@ -66,7 +66,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial belongs_to :post belongs_to :related_post, :class_name => "Post" end spec/integration/association_through_spec.rb @@ -8,7 +8,7 @@ describe "ManyToMany" do def self.default_repository_name; ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String has n, :books, :through => Resource spec/integration/associations/many_to_many_spec.rb @@ -18,7 +18,7 @@ TIME_4 = Time.parse(TIME_STRING_4) class EveryType include DataMapper::Resource - property :serial, Integer, :serial => true + property :serial, Serial property :fixnum, Integer, :nullable => false, :default => 1 property :string, String, :nullable => false, :default => 'default' property :empty, String, :nullable => false, :default => '' @@ -41,7 +41,7 @@ end module Publications class ShortStoryCollection include DataMapper::Resource - property :serial, Integer, :serial => true + property :serial, Serial property :date, Date, :nullable => false, :default => TODAY, :index => :date_date_time end end spec/integration/auto_migrations_spec.rb @@ -8,7 +8,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String property :age, Integer property :notes, Text @@ -23,7 +23,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String property :age, Integer property :zebra_id, Integer spec/integration/collection_spec.rb @@ -10,7 +10,7 @@ if HAS_MYSQL class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text property :object, Object spec/integration/mysql_adapter_spec.rb @@ -11,7 +11,7 @@ if HAS_POSTGRES class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end end @@ -22,7 +22,7 @@ if HAS_POSTGRES Sputnik.auto_migrate!(:postgres) @adapter.storage_exists?("sputniks").should be_true @adapter.field_exists?("sputniks", "new_prop").should be_false - Sputnik.property :new_prop, Integer, :serial => true + Sputnik.property :new_prop, DM::Serial @adapter.send(:drop_sequence, repository(:postgres), Sputnik.new_prop) Sputnik.auto_upgrade!(:postgres) @adapter.field_exists?("sputniks", "new_prop").should == true @@ -34,7 +34,7 @@ if HAS_POSTGRES class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end @@ -63,7 +63,7 @@ if HAS_POSTGRES class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end @@ -95,7 +95,7 @@ if HAS_POSTGRES class User include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end @@ -103,7 +103,7 @@ if HAS_POSTGRES include DataMapper::Resource storage_names[:postgres] = 'sattellites.voyagers' - property :id, Integer, :serial => true + property :id, Serial property :age, Integer end @@ -159,7 +159,7 @@ if HAS_POSTGRES class VideoGame include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :object, Object end @@ -352,7 +352,7 @@ if HAS_POSTGRES before :all do class SailBoat include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :port, String end @@ -399,7 +399,7 @@ if HAS_POSTGRES before :all do class SailBoat include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :notes, String, :lazy => [:notes] property :trip_report, String, :lazy => [:notes,:trip] property :miles, Integer, :lazy => [:trip] @@ -444,7 +444,7 @@ if HAS_POSTGRES class SerialFinderSpec include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :sample, String end end @@ -504,14 +504,14 @@ if HAS_POSTGRES class Engine include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String end class Yard include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :engine_id, Integer @@ -593,7 +593,7 @@ if HAS_POSTGRES class Host include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String repository(:postgres) do @@ -604,7 +604,7 @@ if HAS_POSTGRES class Slice include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :host_id, Integer spec/integration/postgres_adapter_spec.rb @@ -10,7 +10,7 @@ if ADAPTER class Actor include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String, :track => :set # :track default is :get for mutable types property :notes, DataMapper::Types::Text property :age, Integer # :track default is :set for mutable types @@ -131,7 +131,7 @@ if ADAPTER before :all do class RowBoat include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :notes, String, :lazy => [:notes] property :trip_report, String, :lazy => [:notes,:trip] property :miles, Integer, :lazy => [:trip] @@ -175,7 +175,7 @@ if ADAPTER before :all do class Catamaran include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String # Boolean spec/integration/property_spec.rb @@ -6,7 +6,7 @@ if ADAPTER before :all do class SailBoat include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :port, String end @@ -98,7 +98,7 @@ if ADAPTER before :all do class Permission include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :user_id, Integer property :resource_id, Integer property :resource_type, String @@ -107,7 +107,7 @@ if ADAPTER class SailBoat include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :port, String property :captain, String @@ -166,7 +166,7 @@ if ADAPTER before :all do class Region include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String def self.default_repository_name @@ -176,7 +176,7 @@ if ADAPTER class Factory include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :region_id, Integer property :name, String @@ -193,7 +193,7 @@ if ADAPTER class Vehicle include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :factory_id, Integer property :name, String @@ -207,7 +207,7 @@ if ADAPTER module Namespace class Region include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String def self.default_repository_name @@ -217,7 +217,7 @@ if ADAPTER class Factory include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :region_id, Integer property :name, String @@ -234,7 +234,7 @@ if ADAPTER class Vehicle include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :factory_id, Integer property :name, String @@ -364,7 +364,7 @@ if ADAPTER it "should behave when using mocks" do class Group include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String end spec/integration/query_spec.rb @@ -6,7 +6,7 @@ if ADAPTER class SerialFinderSpec include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :sample, String auto_migrate!(ADAPTER) spec/integration/repository_spec.rb @@ -19,7 +19,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :color, String, :default => 'green', :nullable => true end @@ -30,7 +30,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String def to_s @@ -79,7 +79,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :name, String property :iq, Integer, :default => 100 property :type, Discriminator @@ -113,7 +113,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :type, Discriminator property :name, String end spec/integration/resource_spec.rb @@ -11,7 +11,7 @@ if HAS_SQLITE3 class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end end @@ -33,7 +33,7 @@ if HAS_SQLITE3 class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end end @@ -79,7 +79,7 @@ if HAS_SQLITE3 class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end end @@ -111,7 +111,7 @@ if HAS_SQLITE3 class User include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end end @@ -156,7 +156,7 @@ if HAS_SQLITE3 class VideoGame include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :object, Object property :notes, Text spec/integration/sqlite3_adapter_spec.rb @@ -16,7 +16,7 @@ if HAS_SQLITE3 class Book include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :title, String, :nullable => false property :isbn, Integer, :nullable => false property :class_type, Discriminator spec/integration/sti_spec.rb @@ -10,7 +10,7 @@ if ADAPTERS.any? class Sputnik include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, DM::Text end spec/integration/transaction_spec.rb @@ -18,7 +18,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :faked, Impostor property :active, Boolean property :note, Text @@ -32,7 +32,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :color, String property :deleted_at, DataMapper::Types::ParanoidDateTime end @@ -44,7 +44,7 @@ if ADAPTER ADAPTER end - property :id, Integer, :serial => true + property :id, Serial property :color, String property :deleted_at, DataMapper::Types::ParanoidBoolean end spec/integration/type_spec.rb @@ -36,7 +36,7 @@ DataMapper::Logger.new(nil, :debug) class Article include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :blog_id, Integer property :created_at, DateTime property :author, String @@ -56,7 +56,7 @@ end class Vehicle include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String class << self @@ -67,7 +67,7 @@ end class Manufacturer include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String class << self @@ -78,7 +78,7 @@ end class Supplier include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String end spec/spec_helper.rb @@ -9,7 +9,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do before :all do class Cheese include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String, :nullable => false property :color, String, :default => 'yellow' property :notes, String, :length => 100, :lazy => true spec/unit/adapters/data_objects_adapter_spec.rb @@ -5,7 +5,7 @@ describe "DataMapper::Hook" do @class = Class.new do include DataMapper::Resource - property :id, Integer, :serial => true + property :id, DM::Serial def a_method end spec/unit/hook_spec.rb @@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) class Icon include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String property :width, Integer, :lazy => true property :height, Integer, :lazy => true @@ -32,7 +32,7 @@ describe DataMapper::PropertySet do end it "#select should find properties" do - @properties.select { |property| property.type == Integer }.should have(3).entries + @properties.select { |property| property.primitive == Integer }.should have(3).entries end it "#[] should find properties by name (Symbol or String)" do spec/unit/property_set_spec.rb @@ -57,14 +57,14 @@ describe "DataMapper::Resource" do class Grain include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String, :default => 'wheat' end class Vegetable include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial property :name, String end @@ -671,7 +671,7 @@ describe 'DataMapper::Resource::ClassMethods' do @class_code = %{ include DataMapper::Resource - property :id, Integer, :serial => true + property :id, Serial } end spec/unit/resource_spec.rb 942af3507cfea47f3fcff15d247674c00e02cec5 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-core/commit/266988a22ce78d466b0f075d44f89a994c7accfb 266988a22ce78d466b0f075d44f89a994c7accfb 2008-06-17T23:51:33-07:00 2008-06-17T23:51:33-07:00 Updated sepcs to use the Serial rather than Integer, :serial => true 88f3c89977b9b8dabd7b4c48847666db5c1aa779 Dan Kubb dan.kubb@autopilotmarketing.com