knjrbfw 0.0.25 → 0.0.26

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/knjrbfw.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   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_columns.rb

@@ -3,7 +3,6 @@ class KnjDB_mysql::Columns
   
   def initialize(args)
     @args = args
-    @db = @args[:db]
   end
   
   def data_sql(data)
@@ -20,11 +19,11 @@ class KnjDB_mysql::Columns
     if data.key?("default_func")
       sql << " DEFAULT #{data["default_func"]}"
     elsif data.key?("default") and data["default"] != false
-      sql << " DEFAULT '#{@db.escape(data["default"])}'"
+      sql << " DEFAULT '#{@args[:db].escape(data["default"])}'"
     end
     
-    sql << " COMMENT '#{@db.escape(data["comment"])}'" if data.key?("comment")
-    sql << " AFTER `#{@db.esc_col(data["after"])}`" if data["after"] and !data["first"]
+    sql << " COMMENT '#{@args[:db].escape(data["comment"])}'" if data.key?("comment")
+    sql << " AFTER `#{@args[:db].esc_col(data["after"])}`" if data["after"] and !data["first"]
     sql << " FIRST" if data["first"]
     
     return sql
@@ -48,7 +47,7 @@ class KnjDB_mysql::Columns::Column
   end
   
   def table
-    return @db.tables[@args[:table_name]]
+    return @args[:db].tables[@args[:table_name]]
   end
   
   def data
@@ -116,12 +115,12 @@ class KnjDB_mysql::Columns::Column
   end
   
   def drop
-    @db.query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
+    @args[:db].query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
   end
   
   def change(data)
-    col_escaped = "#{@db.enc_col}#{@db.esc_col(self.name)}#{@db.enc_col}"
-    table_escape = "#{@db.enc_table}#{@db.esc_table(self.table.name)}#{@db.enc_table}"
+    col_escaped = "#{@args[:db].enc_col}#{@args[:db].esc_col(self.name)}#{@args[:db].enc_col}"
+    table_escape = "#{@args[:db].enc_table}#{@args[:db].esc_table(self.table.name)}#{@args[:db].enc_table}"
     newdata = data.clone
     
     newdata["name"] = self.name if !newdata.key?("name")
@@ -132,6 +131,6 @@ class KnjDB_mysql::Columns::Column
     newdata.delete("primarykey") if newdata.key?("primarykey")
     
     type_s = newdata["type"].to_s
-    @db.query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@db.cols.data_sql(newdata)}")
+    @args[:db].query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@args[:db].cols.data_sql(newdata)}")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15914660 !ruby/object:Gem::Requirement
+  requirement: &17870340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *15914660
+  version_requirements: *17870340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15899460 !ruby/object:Gem::Requirement
+  requirement: &17840100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15899460
+  version_requirements: *17840100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15898920 !ruby/object:Gem::Requirement
+  requirement: &17839360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *15898920
+  version_requirements: *17839360
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15898380 !ruby/object:Gem::Requirement
+  requirement: &17838740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15898380
+  version_requirements: *17838740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15897680 !ruby/object:Gem::Requirement
+  requirement: &17838080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15897680
+  version_requirements: *17838080
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &15897140 !ruby/object:Gem::Requirement
+  requirement: &17837580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15897140
+  version_requirements: *17837580
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -343,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2467646851772567085
+      hash: -3916824919570363953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: