knjrbfw 0.0.45 → 0.0.46

data/VERSION

@@ -1 +1 @@
-0.0.45
+0.0.46

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.45"
+  s.version = "0.0.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb

@@ -130,8 +130,14 @@ class KnjDB_mysql::Tables::Table
   end
   
   def drop
-    sql = "DROP TABLE `#{self.name}`"
-    @db.query(sql)
+    raise "Cant drop native table: '#{self.name}'." if self.native?
+    @db.query("DROP TABLE `#{self.name}`")
+  end
+  
+  #Returns true if the table is safe to drop.
+  def native?
+    return true if @db.q("SELECT DATABASE() AS db").fetch[:db] == "mysql"
+    return false
   end
   
   def optimize

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb

@@ -85,6 +85,9 @@ class KnjDB_sqlite3::Columns::Column
       elsif match = @args[:data][:type].match(/^(.+)\((\d+)\)$/)
         @maxlength = match[2]
         type = match[1].to_sym
+      elsif @args[:data].key?(:type) and @args[:data][:type].to_s == ""
+        #A type can actually be empty in SQLite... Wtf?
+        return @args[:data][:type]
       end
       
       if type == :integer
@@ -93,7 +96,7 @@ class KnjDB_sqlite3::Columns::Column
         @type = type
       end
       
-      raise "Still not type?" if @type.to_s.strip.length <= 0
+      raise "Still not type? (#{@args[:data]})" if @type.to_s.strip.length <= 0
     end
     
     return @type

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb

@@ -113,15 +113,27 @@ class KnjDB_sqlite3::Tables::Table
     return @data[:maxlength]
   end
   
+  #Drops the table from the database.
   def drop
-    sql = "DROP TABLE `#{self.name}`"
-    @db.query(sql)
+    raise "Cant drop native table: '#{self.name}'." if self.native?
+    @db.query("DROP TABLE `#{self.name}`")
+  end
+  
+  #Returns true if the table is safe to drop.
+  def native?
+    return true if self.name.to_s == "sqlite_sequence"
+    return false
   end
   
   def optimize
     raise "stub!"
   end
   
+  def rename(newname)
+    self.clone(newname)
+    self.drop
+  end
+  
   def truncate
     @db.query("DELETE FROM `#{self.name}` WHERE 1=1")
     return nil

data/lib/knj/knjdb/dump.rb

@@ -40,6 +40,7 @@ class Knj::Db::Dump
     
     tables.each do |table_obj|
       table_obj = @args[:db].tables[table_obj] if table_obj.is_a?(String) or table_obj.is_a?(Symbol)
+      next if table_obj.native?
       
       #Figure out keys.
       @keys = []

data/lib/knj/process.rb

@@ -127,7 +127,7 @@ class Knj::Process
               @on_rec.call(result_obj)
             rescue SystemExit, Interrupt => e
               raise e
-            rescue => e
+            rescue Exception => e
               #Error was raised - try to forward it to the server.
               result_obj.answer("type" => "process_error", "class" => e.class.name, "msg" => e.message, "backtrace" => e.backtrace)
             end

data/spec/db_spec.rb

@@ -111,7 +111,7 @@ describe "Db" do
     
     #Remove everything in the db.
     db.tables.list do |table|
-      table.drop
+      table.drop unless table.native?
     end
     
     
@@ -127,6 +127,35 @@ describe "Db" do
     raise "Not same amount of tables: #{tables_count}, #{db.tables.list.length}" if tables_count != db.tables.list.length
     
     
+    
+    #Test revision table renaming.
+    Knj::Db::Revision.new.init_db("db" => db, "schema" => {
+      "tables" => {
+        "new_test_table" => {
+          "renames" => ["test_table"]
+        }
+      }
+    })
+    tables = db.tables.list
+    raise "Didnt expect table 'test_table' to exist but it did." if tables.key?("test_table")
+    raise "Expected 'new_test_table' to exist but it didnt." if !tables.key?("new_test_table")
+    
+    
+    #Test revision for column renaming.
+    Knj::Db::Revision.new.init_db("db" => db, "schema" => {
+      "tables" => {
+        "new_test_table" => {
+          "columns" => [
+            {"name" => "new_name", "type" => "varchar", "renames" => ["name"]}
+          ]
+        }
+      }
+    })
+    columns = db.tables["new_test_table"].columns
+    raise "Didnt expect 'name' to exist but it did." if columns.key?("name")
+    raise "Expected 'new_name'-column to exist but it didnt." if !columns.key?("new_name")
+    
+    
     #Delete test-database if everything went well.
     File.unlink(db_path) if File.exists?(db_path)
   end

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -379,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -508709231810571655
+      hash: -3622671606985967169
       segments: 
       - 0
       version: "0"