usesguid_migrations 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,10 @@
+= 1.0.2 2010 01-26
+
+* Added SQLite support
+* Changed add_column now recognizes :guid and :guid_fk, the later automatically adding an _id to the 
+  column name, if not already done
+
+
 = 1.0.1 2009-12-20
 
 * Added add_column override that recognizes the :guid type

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/usesguid_migrations/active_record_extensions/connection_adapters/mysql_adapter.rb

@@ -1,46 +1,93 @@
-module UsesguidMigrations
-  module ActiveRecordExtensions
-    module ConnectionAdapters
-      module MysqlAdapter
-
-        def primary_key_name( table_name, name=nil )
-          results = execute( "SHOW CREATE TABLE `#{table_name}`", name )
-          keys = []
-          primary_key = nil
-
-          results.each do |row|
-            row[1].each do |line|
-              keys << $1 if line =~ /^  [`"](.+?)[`"] varchar\(22\) character set latin1 collate latin1_bin NOT NULL?,?$/
-              primary_key = $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\)$/
-              primary_key = $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\),$/
-              primary_key = $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\), $/
-            end
-          end
-
-          return keys.include?( primary_key ) ? primary_key : nil
+module UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters
+  module MysqlAdapter
+
+    def primary_key_name( table_name, name=nil )
+      results = execute( "SHOW CREATE TABLE `#{table_name}`", name )
+      keys = []
+      primary_key = nil
+
+      results.each do |row|
+        row[1].each do |line|
+          keys << $1 if line =~ /^  [`"](.+?)[`"] varchar\(22\) character set latin1 collate latin1_bin NOT NULL?,?$/
+          primary_key = $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\)$/
+          primary_key = $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\),$/
+          primary_key = $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\), $/
         end
+      end
 
-        def foreign_keys( table_name, name=nil )
-          results = execute( "SHOW CREATE TABLE `#{table_name}`", name )
+      return keys.include?( primary_key ) ? primary_key : nil
+    end
 
-          null_foreign_keys = []
-          not_null_foreign_keys = []
-          primary_keys = []
+    def foreign_keys( table_name, name=nil )
+      results = execute( "SHOW CREATE TABLE `#{table_name}`", name )
 
-          results.each do |row|
-            row[1].each do |line|
-              null_foreign_keys << $1 if line =~ /^  [`"](.+?)[`"] varchar\(22\) character set latin1 collate latin1_bin default NULL?,?$/
-              not_null_foreign_keys << $1 if line =~ /^  [`"](.+?)[`"] varchar\(22\) character set latin1 collate latin1_bin NOT NULL?,?$/
-              primary_keys << $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\)$/
-              primary_keys << $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\),$/
-            end
-          end
+      null_foreign_keys = []
+      not_null_foreign_keys = []
+      primary_keys = []
 
+      results.each do |row|
+        row[1].each do |line|
+          null_foreign_keys << $1 if line =~ /^  [`"](.+?)[`"] varchar\(22\) character set latin1 collate latin1_bin default NULL?,?$/
+          not_null_foreign_keys << $1 if line =~ /^  [`"](.+?)[`"] varchar\(22\) character set latin1 collate latin1_bin NOT NULL?,?$/
+          primary_keys << $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\)$/
+          primary_keys << $1 if line =~ /^  PRIMARY KEY  \([`"](.+?)[`"]\),$/
+        end
+      end
 
-          return null_foreign_keys - primary_keys, not_null_foreign_keys - primary_keys
+      return null_foreign_keys - primary_keys, not_null_foreign_keys - primary_keys
+    end
+
+    def usesguid_create_table( table_name, table_definition, options )
+      execute usesuid_create_table_statement( table_name, table_definition, options )
+
+      unless table_name == "schema_migrations"
+        unless options[:id] == false || options[:guid] == false
+          execute usesguid_alter_column_statement( table_name, table_definition.primary_key_name, :null => false )
+          execute usesguid_make_column_primary_key( table_name, table_definition.primary_key_name )
+        end
+
+        return if table_definition.associative_keys.nil?
+
+        table_definition.associative_keys.each do |assoc|
+          execute usesguid_alter_column_statement( table_name, assoc.name, assoc.options )
         end
-      
       end
     end
+
+    def uses_guid_add_column( table_name, column_name, type, options={} )
+      column = ActiveRecord::ConnectionAdapters::ColumnDefinition.new( self, column_name, :string )
+      if options[:limit]
+        column.limit = options[:limit]
+        #elsif native[type.to_sym].is_a?( Hash )
+        #  column.limit = native[type.to_sym][:limit]
+      end
+      column.precision = options[:precision]
+      column.scale = options[:scale]
+      column.default = options[:default]
+      column.null = options[:null]
+
+      execute usesguid_add_column_statement( table_name, column )
+    end
+
+    def usesuid_create_table_statement( table_name, table_definition, options )
+      create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
+      create_sql << "#{quote_table_name( table_name )} ("
+      create_sql << table_definition.to_sql
+      create_sql << ") #{options[:options]}"
+      create_sql
+    end
+
+    def usesguid_alter_column_statement( table_name, pk_name, options={} )
+      "ALTER TABLE `#{table_name}` MODIFY COLUMN `#{pk_name}` VARCHAR(#{options[:limit] || 22}) BINARY CHARACTER SET latin1 COLLATE latin1_bin#{options[:null] == true ? '' : ' NOT NULL'};"
+    end
+
+    def usesguid_make_column_primary_key( table_name, pk_name )
+      "ALTER TABLE `#{table_name}` ADD PRIMARY KEY (#{pk_name})"
+    end
+
+    def usesguid_add_column_statement( table_name, column_def )
+      "ALTER TABLE #{quote_table_name( table_name )} ADD #{quote_column_name( column_def.name )} VARCHAR(#{column_def.limit || 22}) BINARY CHARACTER SET latin1 COLLATE latin1_bin"
+    end
+
   end
 end

data/lib/usesguid_migrations/active_record_extensions/connection_adapters/schema_statements.rb

@@ -1,68 +1,33 @@
-module UsesguidMigrations
-  module ActiveRecordExtensions
-    module ConnectionAdapters
-      module SchemaStatements
-      
-        def self.included( base )
-          base.module_eval do
-            alias_method_chain :create_table, :lfe_usesguid_migrations
-            alias_method_chain :add_column, :lfe_usesguid_migrations
-          end
-        end
-
-        def create_table_with_lfe_usesguid_migrations( table_name, options={} )
-          table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new( self )
-          #table_definition = TableDefinition.new( self )
-
-          if options[:guid] == false
-            table_definition.primary_key( options[:primary_key] || ActiveRecord::Base.get_primary_key( table_name ) ) unless options[:id] == false
-          else
-            table_definition.guid_primary_key( options[:primary_key] || ActiveRecord::Base.get_primary_key( table_name ) ) unless options[:id] == false
-          end
+module UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters
+  module SchemaStatements
 
-          yield table_definition
-
-          if options[:force] && table_exists?( table_name )
-            drop_table( table_name, options )
-          end
-
-          create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
-          create_sql << "#{quote_table_name( table_name )} ("
-          create_sql << table_definition.to_sql
-          create_sql << ") #{options[:options]}"
-          execute create_sql
+    def self.included( base )
+      base.module_eval do
+        alias_method_chain :create_table, :lfe_usesguid_migrations
+        alias_method_chain :add_column, :lfe_usesguid_migrations
+      end
+    end
 
-          # TODO this needs to be different for each adapter
-          unless table_name == "schema_migrations"
-            unless options[:id] == false || options[:guid] == false
-              execute "ALTER TABLE `#{table_name}` MODIFY COLUMN `#{table_definition.primary_key_name}` VARCHAR(22) BINARY CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;"
-              execute "ALTER TABLE `#{table_name}` ADD PRIMARY KEY (#{table_definition.primary_key_name})"
-            end
+    def create_table_with_lfe_usesguid_migrations( table_name, options={} )
+      table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new( self )
 
-            return if table_definition.associative_keys.nil?
+      if options[:guid] == false
+        table_definition.primary_key( options[:primary_key] || ActiveRecord::Base.get_primary_key( table_name ) ) unless options[:id] == false
+      else
+        table_definition.guid_primary_key( options[:primary_key] || ActiveRecord::Base.get_primary_key( table_name ) ) unless options[:id] == false
+      end
 
-            table_definition.associative_keys.each do |assoc|
-              key = assoc.name
-              opts = assoc.options
-              sql = "ALTER TABLE `#{table_name}` MODIFY COLUMN `#{key}` VARCHAR(#{opts[:limit] || 22}) BINARY CHARACTER SET latin1 COLLATE latin1_bin"
-              if opts[:null] == false || opts[:null].nil?
-                sql << " NOT NULL;"
-              else
-                sql << ";"
-              end
-              execute( sql )
-            end
-          end
-        end
+      yield table_definition
 
-        def add_column_with_lfe_usesguid_migrations( table_name, column_name, type, options={} )
-          return add_column_without_lfe_usesguid_migrations( table_name, column_name, type, options ) unless type.to_s == 'guid'
+      drop_table( table_name, options ) if options[:force] && table_exists?( table_name )
+      usesguid_create_table( table_name, table_definition, options )
+    end
 
-          add_column_sql = "ALTER TABLE #{quote_table_name( table_name )} ADD #{quote_column_name( column_name )} VARCHAR(#{options[:limit] || 22}) BINARY CHARACTER SET latin1 COLLATE latin1_bin"
-          add_column_options!( add_column_sql, options )
-          execute( add_column_sql )
-        end
-      end
+    def add_column_with_lfe_usesguid_migrations( table_name, column_name, type, options={} )
+      return add_column_without_lfe_usesguid_migrations( table_name, column_name, type, options ) unless %w(guid guid_fk).include?( type.to_s )
+      
+      column_name = (type.to_s == 'guid_fk' && column_name) ? "#{column_name}_id" : column_name
+      uses_guid_add_column( table_name, column_name, type, options )
     end
   end
 end

data/lib/usesguid_migrations/active_record_extensions/connection_adapters/sqlite_adapter.rb

@@ -0,0 +1,70 @@
+module UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters
+  module SqliteAdapter
+
+    def usesguid_create_table( table_name, table_definition, options )
+      begin
+        sql = usesuid_create_table_statement( table_name, table_definition, options )
+        sql.sub!( '"id" blob(22) NOT NULL', '"id" blob(22) PRIMARY KEY NOT NULL' )
+        execute( sql )
+      rescue SQLite3::MisuseException; end
+
+      unless table_name == "schema_migrations"
+        unless options[:id] == false || options[:guid] == false
+          sql = usesguid_alter_column_statement( table_name, table_definition.primary_key_name, :null => false )
+          execute( sql ) unless sql.nil? || sql.empty?
+          sql = usesguid_make_column_primary_key( table_name, table_definition.primary_key_name )
+          execute( sql ) unless sql.nil? || sql.empty?
+        end
+
+        return if table_definition.associative_keys.nil?
+
+        table_definition.associative_keys.each do |assoc|
+          begin
+            sql = usesguid_alter_column_statement( table_name, assoc.name, assoc.options )
+            execute( sql ) unless sql.nil? || sql.empty?
+          rescue SQLite3::MisuseException; end
+        end
+      end
+    end
+
+    def uses_guid_add_column( table_name, column_name, type, options={} )
+      column = ActiveRecord::ConnectionAdapters::ColumnDefinition.new( self, column_name, :text )
+      if options[:limit]
+        column.limit = options[:limit]
+        #elsif native[type.to_sym].is_a?( Hash )
+        #  column.limit = native[type.to_sym][:limit]
+      end
+      column.precision = options[:precision]
+      column.scale = options[:scale]
+      column.default = options[:default]
+      column.null = options[:null]
+
+      add_column_sql = usesguid_add_column_statement( table_name, column )
+
+      begin
+        execute( add_column_sql )
+      rescue SQLite3::MisuseException; end
+    end
+
+    def usesuid_create_table_statement( table_name, table_definition, options )
+      create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
+      create_sql << "#{quote_table_name( table_name )} ("
+      create_sql << table_definition.to_sql
+      create_sql << ") #{options[:options]}"
+      create_sql
+    end
+
+    def usesguid_alter_column_statement( table_name, pk_name, options={} )
+      ''
+    end
+
+    def usesguid_make_column_primary_key( table_name, pk_name )
+      ''
+    end
+
+    def usesguid_add_column_statement( table_name, column_def )
+      "ALTER TABLE #{quote_table_name( table_name )} ADD COLUMN #{column_def.to_sql} DEFAULT('')"
+    end
+
+  end
+end

data/lib/usesguid_migrations/active_record_extensions/connection_adapters/table_definition.rb

@@ -1,38 +1,35 @@
-module UsesguidMigrations
-  module ActiveRecordExtensions
-    module ConnectionAdapters
-      module TableDefinition
-      
-        def self.included( base )
-          base.class_eval do
-            include InstanceMethods
-            attr_accessor :primary_key_name
-            attr_accessor :associative_keys
-          end
-        end
+module UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters
+  module TableDefinition
 
-        module InstanceMethods
-          def guid_primary_key( name )
-            @primary_key_name = name
-            column( name, :binary, :limit => 22, :null => false )
-          end
+    def self.included( base )
+      base.class_eval do
+        include InstanceMethods
+        attr_accessor :primary_key_name
+        attr_accessor :associative_keys
+      end
+    end
+
+    module InstanceMethods
+      def guid_primary_key( name )
+        @primary_key_name = name
+        column( name, :binary, :limit => 22, :null => false )
+      end
 
-          def references_with_guid( name, options={} )
-            name = name.to_s
-            name = "#{name}_id" unless name.end_with?( "_id" )
-            guid( name, options )
-          end
+      def references_with_guid( name, options={} )
+        name = name.to_s
+        name = "#{name}_id" unless name.end_with?( "_id" )
+        guid( name, options )
+      end
 
-          def guid( name, options={} )
-            @associative_keys = [] if @associative_keys.nil?
-            options.merge!( :limit => 22 )
-            options.merge!( :null => false ) unless options[:null] == true # make not nullable the default for a guid column as it is likely a foreign key
-            @associative_keys << OpenStruct.new( :name => name, :options => options )
-            column( name, :binary, options )
-          end
-        end
-      
+      def guid( name, options={} )
+        @associative_keys = [] if @associative_keys.nil?
+        options.merge!( :limit => 22 )
+        # make not nullable the default for a guid column as it is likely a foreign key
+        options.merge!( :null => false ) unless options[:null] == true
+        @associative_keys << OpenStruct.new( :name => name, :options => options )
+        column( name, :binary, options )
       end
     end
+
   end
 end

data/lib/usesguid_migrations.rb

@@ -6,12 +6,16 @@ require 'usesguid_migrations/active_record_extensions/schema'
 require 'usesguid_migrations/active_record_extensions/schema_dumper'
 require 'usesguid_migrations/active_record_extensions/connection_adapters/mysql_adapter'
 require 'usesguid_migrations/active_record_extensions/connection_adapters/schema_statements'
+require 'usesguid_migrations/active_record_extensions/connection_adapters/sqlite_adapter'
 require 'usesguid_migrations/active_record_extensions/connection_adapters/table_definition'
   
 module UsesguidMigrations
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end
 
+processor, platform, *rest = RUBY_PLATFORM.split("-")
+is_windows = platform == 'mswin32'
+
 ActiveRecord::Base.send( :include, UsesguidMigrations::ActiveRecordExtensions::Base ) if defined?( ActiveRecord::Base )
 ActiveRecord::Schema.send( :include, UsesguidMigrations::ActiveRecordExtensions::Schema ) if defined?( ActiveRecord::Schema )
 ActiveRecord::SchemaDumper.send( :include, UsesguidMigrations::ActiveRecordExtensions::SchemaDumper ) if defined?( ActiveRecord::SchemaDumper )
@@ -23,4 +27,11 @@ if defined?( ActiveRecord::ConnectionAdapters::TableDefinition )
 end
 if defined?( ActiveRecord::ConnectionAdapters::MysqlAdapter )
   ActiveRecord::ConnectionAdapters::MysqlAdapter.send( :include, UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters::MysqlAdapter )
+end
+if defined?( ActiveRecord::ConnectionAdapters::SQLiteAdapter )
+  ActiveRecord::ConnectionAdapters::SQLiteAdapter.send( :include, UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters::SqliteAdapter )
+end
+
+if is_windows
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.send( :include, UsesguidMigrations::ActiveRecordExtensions::ConnectionAdapters::SqliteAdapter )
 end

data/usesguid_migrations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{usesguid_migrations}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Harrelson"]
-  s.date = %q{2009-12-20}
+  s.date = %q{2010-01-26}
   s.description = %q{Makes your migrations work with usesguid plugin without explicitly defining the primary key id or foreign keys in migrations.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/usesguid_migrations/active_record_extensions/base.rb",
      "lib/usesguid_migrations/active_record_extensions/connection_adapters/mysql_adapter.rb",
      "lib/usesguid_migrations/active_record_extensions/connection_adapters/schema_statements.rb",
+     "lib/usesguid_migrations/active_record_extensions/connection_adapters/sqlite_adapter.rb",
      "lib/usesguid_migrations/active_record_extensions/connection_adapters/table_definition.rb",
      "lib/usesguid_migrations/active_record_extensions/schema.rb",
      "lib/usesguid_migrations/active_record_extensions/schema_dumper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: usesguid_migrations
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jason Harrelson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-20 00:00:00 -06:00
+date: 2010-01-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,7 @@ files:
 - lib/usesguid_migrations/active_record_extensions/base.rb
 - lib/usesguid_migrations/active_record_extensions/connection_adapters/mysql_adapter.rb
 - lib/usesguid_migrations/active_record_extensions/connection_adapters/schema_statements.rb
+- lib/usesguid_migrations/active_record_extensions/connection_adapters/sqlite_adapter.rb
 - lib/usesguid_migrations/active_record_extensions/connection_adapters/table_definition.rb
 - lib/usesguid_migrations/active_record_extensions/schema.rb
 - lib/usesguid_migrations/active_record_extensions/schema_dumper.rb