knjrbfw 0.0.40 → 0.0.41

data/VERSION

@@ -1 +1 @@
-0.0.40
+0.0.41

data/knjrbfw.gemspec

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

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

@@ -74,7 +74,7 @@ class KnjDB_sqlite3::Columns::Column
     if !@type
       if match = @args[:data][:type].match(/^([A-z]+)$/)
         @maxlength = false
-        type = match[0]
+        type = match[0].to_sym
       elsif match = @args[:data][:type].match(/^decimal\((\d+),(\d+)\)$/)
         @maxlength = "#{match[1]},#{match[2]}"
         type = :decimal
@@ -128,7 +128,6 @@ class KnjDB_sqlite3::Columns::Column
   
   #Returns true if the column is the primary key.
   def primarykey?
-    return true if self.name.to_s == "id"
     return false if @args[:data][:pk].to_i == 0
     return true
   end
@@ -154,7 +153,7 @@ class KnjDB_sqlite3::Columns::Column
     newdata["maxlength"] = self.maxlength if !newdata.key?("maxlength") and self.maxlength
     newdata["null"] = self.null? if !newdata.key?("null")
     newdata["default"] = self.default if !newdata.key?("default")
-    newdata.delete("primarykey") if newdata.key?("primarykey")
+    newdata["primarykey"] = self.primarykey? if !newdata.key?("primarykey")
     
     @type = nil
     @maxlength = nil

data/lib/knj/knjdb/revision.rb

@@ -95,6 +95,11 @@ class Knj::Db::Revision
                   dochange = true
                 end
                 
+                if col_data.has_key?("primarykey") and col_obj.primarykey? != col_data["primarykey"]
+                  print "Primary-key mismatch for #{col_str}: #{col_data["primarykey"]}, #{col_obj.primarykey?}\n" if args["debug"]
+                  dochange = true
+                end
+                
                 if col_data.has_key?("maxlength") and col_obj.maxlength.to_s != col_data["maxlength"].to_s
                   print "Maxlength mismatch on #{col_str}: #{col_data["maxlength"]}, #{col_obj.maxlength}\n" if args["debug"]
                   dochange = true

metadata

@@ -2,7 +2,7 @@
 name: knjrbfw
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -377,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2365172852586319088
+      hash: 632111132898720837
       segments: 
       - 0
       version: "0"