sequel 0.4.4 → 0.4.4.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.4.4.1 (2007-12-19)
+
+* Fixed schema generation code to use fied quoting and support adapter-specific literalization of default values (#108).
+
 === 0.4.4 (2007-12-17)
 
 * Implemented Database#rename_table (#104).

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.4.4"
+VERS = "0.4.4.1"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/adapters/mysql.rb

@@ -146,9 +146,9 @@ module Sequel
       def alter_table_sql(table, op)
         case op[:op]
         when :rename_column
-          "ALTER TABLE #{table} CHANGE COLUMN #{op[:name]} #{op[:new_name]} #{op[:type]}"
+          "ALTER TABLE #{table} CHANGE COLUMN #{literal(op[:name])} #{literal(op[:new_name])} #{op[:type]}"
         when :set_column_type
-          "ALTER TABLE #{table} CHANGE COLUMN #{op[:name]} #{op[:name]} #{op[:type]}"
+          "ALTER TABLE #{table} CHANGE COLUMN #{literal(op[:name])} #{literal(op[:name])} #{op[:type]}"
         when :drop_index
           "DROP INDEX #{default_index_name(table, op[:columns])} ON #{table}"
         else

data/lib/sequel/database.rb

@@ -156,7 +156,7 @@ module Sequel
       true
     end
     
-    include Dataset::SQL
+    # include Dataset::SQL
     include Schema::SQL
     
     # default serial primary key definition. this should be overriden for each adapter.
@@ -173,8 +173,8 @@ module Sequel
     #     index :title
     #   end
     def create_table(name, &block)
-      g = Schema::Generator.new(self, name, &block)
-      create_table_sql_list(*g.create_info).each {|sql| execute(sql)}
+      g = Schema::Generator.new(self, &block)
+      create_table_sql_list(name, *g.create_info).each {|sql| execute(sql)}
     end
     
     # Forcibly creates a table. If the table already exists it is dropped.
@@ -193,7 +193,7 @@ module Sequel
     end
     
     def alter_table(name, &block)
-      g = Schema::AlterTableGenerator.new(self, name, &block)
+      g = Schema::AlterTableGenerator.new(self, &block)
       alter_table_sql_list(name, g.operations).each {|sql| execute(sql)}
     end
     

data/lib/sequel/model/schema.rb

@@ -6,7 +6,7 @@ module Sequel
     # methods.
     def self.set_schema(name = nil, &block)
       name ? set_dataset(db[name]) : name = table_name
-      @schema = Schema::Generator.new(db, name, &block)
+      @schema = Schema::Generator.new(db, &block)
       if @schema.primary_key_name
         set_primary_key @schema.primary_key_name
       end
@@ -29,7 +29,7 @@ module Sequel
     
     # Creates table.
     def self.create_table
-      db.create_table_sql_list(*schema.create_info).each {|s| db << s} 
+      db.create_table_sql_list(table_name, *schema.create_info).each {|s| db << s} 
     end
     
     # Drops table.

data/lib/sequel/schema/schema_generator.rb

@@ -1,9 +1,8 @@
 module Sequel
   module Schema
     class Generator
-      def initialize(db, table_name, &block)
+      def initialize(db, &block)
         @db = db
-        @table_name = table_name
         @columns = []
         @indexes = []
         @primary_key = nil
@@ -59,16 +58,15 @@ module Sequel
         if @primary_key && !has_column?(@primary_key[:name])
           @columns.unshift(@primary_key)
         end
-        [@table_name, @columns, @indexes]
+        [@columns, @indexes]
       end
     end
   
     class AlterTableGenerator
       attr_reader :operations
       
-      def initialize(db, table_name, &block)
+      def initialize(db, &block)
         @db = db
-        @table_name = table_name
         @operations = []
         instance_eval(&block) if block
       end

data/lib/sequel/schema/schema_sql.rb

@@ -30,9 +30,17 @@ module Sequel
 
       TYPES = Hash.new {|h, k| k}
       TYPES[:double] = 'double precision'
+      
+      def schema_utility_dataset
+        @schema_utility_dataset ||= dataset
+      end
+      
+      def literal(v)
+        schema_utility_dataset.literal(v)
+      end
 
       def column_definition_sql(column)
-        sql = "#{column[:name]} #{TYPES[column[:type]]}"
+        sql = "#{literal(column[:name].to_sym)} #{TYPES[column[:type]]}"
         column[:size] ||= 255 if column[:type] == :varchar
         elements = column[:size] || column[:elements]
         sql << "(#{literal(elements)})" if elements
@@ -60,12 +68,11 @@ module Sequel
       end
     
       def index_definition_sql(table_name, index)
-        columns = index[:columns].join(COMMA_SEPARATOR)
         index_name = index[:name] || default_index_name(table_name, index[:columns])
         if index[:unique]
-          "CREATE UNIQUE INDEX #{index_name} ON #{table_name} (#{columns})"
+          "CREATE UNIQUE INDEX #{index_name} ON #{table_name} (#{literal(index[:columns])})"
         else
-          "CREATE INDEX #{index_name} ON #{table_name} (#{columns})"
+          "CREATE INDEX #{index_name} ON #{table_name} (#{literal(index[:columns])})"
         end
       end
     
@@ -98,11 +105,11 @@ module Sequel
         when :add_column
           "ALTER TABLE #{table} ADD COLUMN #{column_definition_sql(op)}"
         when :drop_column
-          "ALTER TABLE #{table} DROP COLUMN #{op[:name]}"
+          "ALTER TABLE #{table} DROP COLUMN #{literal(op[:name])}"
         when :rename_column
-          "ALTER TABLE #{table} RENAME COLUMN #{op[:name]} TO #{op[:new_name]}"
+          "ALTER TABLE #{table} RENAME COLUMN #{literal(op[:name])} TO #{literal(op[:new_name])}"
         when :set_column_type
-          "ALTER TABLE #{table} ALTER COLUMN #{op[:name]} TYPE #{op[:type]}"
+          "ALTER TABLE #{table} ALTER COLUMN #{literal(op[:name])} TYPE #{op[:type]}"
         when :add_index
           index_definition_sql(table, op)
         when :drop_index

data/spec/adapters/mysql_spec.rb

@@ -311,3 +311,20 @@ context "A MySQL database" do
     @db.drop_index :test2, :value
   end
 end  
+
+context "A MySQL database" do
+  setup do
+    @db = MYSQL_DB
+  end
+  
+  specify "should support defaults for boolean columns" do
+    g = Sequel::Schema::Generator.new(@db) do
+      boolean :active1, :default => true
+      boolean :active2, :default => false
+    end
+    statements = @db.create_table_sql_list(:items, *g.create_info)
+    statements.should == [
+      "CREATE TABLE items (`active1` boolean DEFAULT 1, `active2` boolean DEFAULT 0)"
+    ]
+  end
+end  

data/spec/schema_generator_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Sequel::Schema::Generator do
   before :all do
-    @generator = Sequel::Schema::Generator.new(SchemaDummyDatabase.new, :items) do
+    @generator = Sequel::Schema::Generator.new(SchemaDummyDatabase.new) do
       string :title
       column :body, :text
       foreign_key :parent_id
@@ -10,7 +10,7 @@ describe Sequel::Schema::Generator do
       index :title
       index [:title, :body]
     end
-    @table_name, @columns, @indexes = @generator.create_info
+    @columns, @indexes = @generator.create_info
   end
   
   {:name => :id, :primary_key => true}.each do |column, expected|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.4.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-17 00:00:00 +02:00
+date: 2007-12-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency