table_generator 0.1.1 → 0.1.2

data/table/table_generator.rb

@@ -1,32 +1,43 @@
 class TableColumn
-  attr_writer :name, :type, :typeSize
-  attr_reader :name, :type, :typeSize
-  @@types = Array['varchar', 'int', 'datetime', 'float', 'text' ]
-
-  def initialize(name, type, typeSize )
-    @type='varchar'
-    @typeSize = '50' 
-    if (type=='int') : @typeSize = '10' end
-    @name=name
-    if (type != nil) : self.type=type end
-    if (typeSize !=nil) : self.typeSize=typeSize end
+  attr_writer :name, :type, :type_size
+  attr_reader :name, :type, :type_size
+  @@types = ActiveRecord::Base.connection.native_database_types   
+  @@types.delete :primary_key
+  @@type_keys = @@types.keys
+  def initialize(name, type, type_size )
+    self.name=name
+    self.type=type
+    self.type_size=type_size 
   end
 
   def type=(t)
-    t = t.downcase     
-    if (t.match('^b')) 
-       @type='int' 
-       @typeSize = '1'
-    elsif (t.match('^s')) : @type='varchar' 
-    elsif (@@types.include? t) : @type=t
-    else @@types.each{|type|  
-        @type = type if (type[0]==t[0])
-      }
-    end
+    return @type = @@types[:string][:name] if t.nil?
+    t = t.downcase
+    return @type = @@types[t.to_sym][:name] unless @@types[t.to_sym].nil? 
+    @@type_keys.each { |type|
+      return @type = @@types[type][:name] if @@types[type][:name] == t
+     #hold a match on the first character if onne of the above doen't connect.
+   @type=@@types[type][:name] if(@type.nil? && @@types[type][:name][0]==t[0])
+    }
+    return @type || @type = @@types[:string][:name] 
+  end
+
+  def type_size=(ts)
+    return nil unless (self.type==@@types[:integer][:name] ||  
+                      self.type==@@types[:string][:name])
+    return @type_size = ts unless ts.nil?
+    @@type_keys.each { |type|
+      t = @@types[type][:limit].to_s if type == @type 
+      t = @@types[type][:limit].to_s if @@types[type][:name]==@type
+      return @type_size = t unless t.nil?  
+    }
+    return '50'
   end
+
+
   def to_s
        sql = '`'+name+'` '+type
-       sql << '('+typeSize+')' if(type=='int' || type=='varchar')
+       sql << '('+type_size+')' if(type=='int' || type=='varchar')
        sql  
   end 
 end
@@ -43,10 +54,10 @@ class TableGenerator < Rails::Generator::NamedBase
       type = arr[1] if arr.length>1   
       length = arr[2] if arr.length>2
       @columns.push TableColumn.new(name, type, length)
-    }     
-  end
+    } 
 
-  # Removed director logic.
+  end
+  # Removed directory logic.
   # way easier to append namespace at the begining of the tablename.
   def manifest
      record do |m|
@@ -62,11 +73,12 @@ class TableGenerator < Rails::Generator::NamedBase
         tablename = class_path.last + '_' + tablename 
       end
    
-      sql =  createSql(tablename) 
+
 
       if options[:command] == :destroy 
-        sql = dropSql(tablename)
+         dropSql(tablename)
       else
+        sql =  createSql(tablename) 
         # need #{RAILS_ROOT} here for running from FastCGI
         tableSqlFileName = File.join("#{RAILS_ROOT}",'db',"#{tablename}.sql")
         sqlFile = File.open(tableSqlFileName,'w')
@@ -78,7 +90,8 @@ class TableGenerator < Rails::Generator::NamedBase
         end
         logger.debug(class_path.last) 
       end
-      ActiveRecord::Base.connection.execute(sql)
+#      ActiveRecord::Base.connection.execute(sql)
+
       options[:generator] = 'scaffold'
       # name is passed twice to enforce singular controller names.     
       logger.debug(name)
@@ -91,13 +104,21 @@ class TableGenerator < Rails::Generator::NamedBase
   private 
 
   def createSql(name)
+     ActiveRecord::Base.connection.create_table(name)do |t|
+       @columns.each do |col| 
+          col_type = col.type
+          # had to append here since t.column seems to ignore the :limit param
+          col_type = col.type + "(#{col.type_size})" unless col.type_size.nil? 
+          t.column col.name, col_type
+       end
+     end
    'CREATE TABLE `'+name+'` ('+
    '`id` int(10) unsigned zerofill NOT NULL auto_increment,'+
     @columns.join(", ") +', PRIMARY KEY  (`id`) )'
   end 
 
   def dropSql(name)
-   'drop TABLE `'+name+'`'
+    ActiveRecord::Base.connection.drop_table(name)
   end 
 
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: table_generator
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2005-12-07
+  version: 0.1.2
+date: 2005-12-20
 summary: Rails Table Generator
 require_paths: 
   - lib