fossil 0.3.45 → 0.3.46

data/VERSION

@@ -1 +1 @@
-0.3.45
+0.3.46

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.45"
+  s.version = "0.3.46"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2010-04-25}
+  s.date = %q{2010-04-29}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [
@@ -121,10 +121,12 @@ Gem::Specification.new do |s|
      "lib/sequel/fos_dates.rb",
      "lib/sequel/metaprogramming.rb",
      "lib/sequel/model_patch.rb",
+     "lib/sequel/mysql_pervasive_adapter.rb",
      "lib/sequel/pervasive_adapter.rb",
      "lib/sequel/serializer/json_serializer.rb",
      "lib/sequel/serializer/serializer.rb",
      "lib/sequel/serializer/xml_serializer.rb",
+     "lib/sequel/sqlite_pervasive_adapter.rb",
      "lib/serial_number.rb",
      "spec/be_model_with_values_matcher.rb",
      "spec/be_model_with_values_matcher_spec.rb",

data/lib/models/trip_leg.rb

@@ -18,9 +18,7 @@ class TripLeg < Sequel::Model(:'trip legs')
   n_to_o :catering, :class=>:AirportService,  :prefix=>'catering'
   n_to_o :crew_limo, :class=>:AirportService, :prefix=>'crewlimo'
   n_to_o :arrival_fbo, :class=>:AirportFbo, :prefix=>'fbo'
-#  alias :arrival_fbo :airport_fbo # TODO replace assoc name airport_fbo with arrival_fbo
   n_to_o :departure_fbo, :class=>:AirportFbo, :prefix=>'fueler'
-#  alias :departure_fbo :fueler  # TODO replace assoc name fueler with departure_fbo
   n_to_o :leg_rate, :class=>:AircraftRate, :prefix=>'leg rate'
   n_to_o :leg_requestor, :class=>:Passenger, :prefix=>'leg req'
   n_to_o :pax_limo, :class=>:AirportService, :prefix=>'limo'

data/lib/sequel/mysql_pervasive_adapter.rb

@@ -0,0 +1,62 @@
+module MySql
+  module Pervasive
+    module DatabaseMethods
+
+      def dataset(opts = nil)
+        ds = super
+        ds.extend(DatasetMethods)
+        ds
+      end
+
+      def select_fields(table, *fields)
+        dataset.select_fields(table, *fields)
+      end
+
+      # if its not windows/linux where pervasive db is running in tests
+      # modify the pervasive adapter to act more like mysql for certain things
+      def auto_increment_sql;"AUTO_INCREMENT"; end
+      def begin_transaction_sql; "BEGIN" end
+      def commit_transaction_sql; "COMMIT" end
+      def rollback_transaction_sql; "ROLLBACK" end
+
+      def get_column_type(column_name)
+        if model and model.respond_to?(:datatypes) and model.datatypes and model.datatypes[column_name]
+          return model.datatypes[column_name][:type]
+        end
+        nil
+      end
+
+    end
+
+    module DatasetMethods
+
+      def select_clause_methods
+        super
+      end
+
+      def select_limit_sql(sql)
+        super(sql)
+      end
+
+      def quoted_identifier(name, convert=true)
+        convert ? "`#{convert_aliased_col_to_real_col(name)}`" : "`#{name}`"
+      end
+
+      def convert_aliased_col_to_real_col(col_name)
+        if respond_to?(:model) and model.respond_to?(:aliases) and model.aliases
+          sym_name = col_name.to_s.downcase.to_sym
+          col_name = model.aliases[sym_name].to_s.upcase if model.aliases.include? sym_name
+        end
+        col_name
+      end
+
+      def convert_aliased_col_to_real_col_with_model(col_name, model)
+        if model.respond_to?(:aliases) and model.aliases
+          sym_name = col_name.to_s.downcase.to_sym
+          col_name = model.aliases[sym_name].to_s.upcase if model.aliases.include? sym_name
+        end
+        col_name
+      end
+    end
+  end
+end

data/lib/sequel/sqlite_pervasive_adapter.rb

@@ -0,0 +1,106 @@
+module Sqlite
+  module Pervasive
+    module DatabaseMethods
+
+      def dataset(opts = nil)
+        ds = super
+        ds.extend(DatasetMethods)
+        ds
+      end
+
+      def select_fields(table, *fields)
+        dataset.select_fields(table, *fields)
+      end
+
+    end
+
+    module DatasetMethods
+
+      def get_column_type(column_name)
+        if model and model.respond_to?(:datatypes) and model.datatypes and model.datatypes[column_name]
+          return model.datatypes[column_name][:type]
+        end
+        nil
+      end
+
+      def quoted_identifier(name, convert=true)
+        convert ? "\"#{convert_aliased_col_to_real_col(name)}\"" : "\"#{name}\""
+      end
+
+      # Take a table name and write out the field names for that table in this style:
+      # "`DUDES`.`KID - DATE`".lit    where the table name is :dudes,
+      # and fields are [:kid_date]
+      def select_fields(hash)
+        new_hash = Hash.new{|k, v| k[v]= {}}
+
+        hash.each do |association, fields|
+          new_hash[association][:fields] = fields
+
+          if association == :self
+            new_hash[association][:model] = self.model
+            new_hash[association][:association_name] = self.model.table_name
+          elsif association.to_s.match /(\w+)__(\w+)/  # crew_legs__position_code
+            # not an assocation on the current model .. but another one
+            new_hash[association][:association_name] = $2.to_s.upcase
+            new_hash[association][:model] = model.association_reflection($1.to_sym)[:class].association_reflection($2.to_sym)[:class]
+          else
+            raise(Sequel::Error, "Invalid #{model} association: #{association}") unless model.association_reflection(association)
+            new_hash[association][:association_name] = association.to_s.upcase
+            new_hash[association][:model] = model.association_reflection(association)[:class]
+          end
+          fields = fields + new_hash[association][:model].primary_key unless fields[0] == :*
+          new_hash[association][:fields] = fields
+        end
+
+        s = []
+        new_hash.each do |association, hash|
+          if hash[:fields].size == 1 and hash[:fields][0] == :*
+            s << "#{quoted_identifier(hash[:association_name], false)}.*".lit
+          else
+            s << hash[:fields].collect do |field|
+              raw_field_name = convert_aliased_col_to_real_col_with_model(field, hash[:model])
+              as_alias = ''
+              raw_field_name
+
+              if association != :self and ( hash[:model].primary_key.include? field or field_duplicate(new_hash, association, field) )
+                as_field_name = "#{hash[:association_name]}_#{raw_field_name}"
+                as_alias = "AS #{quoted_identifier(as_field_name, false)}"
+              end
+              "#{quoted_identifier(hash[:association_name], false)}.#{quoted_identifier(raw_field_name, false)} #{as_alias}".lit
+            end
+          end
+        end
+
+        clone(:select => s.flatten)
+      end
+
+      private
+
+      # is the field name found in the fields of any other association besides the one you passed in
+      def field_duplicate(hash, association, field)
+        hash.each do |association_key, hash_values|
+          next if association_key == association
+          return true if hash_values[:fields].include? field
+        end
+        return false
+      end
+
+      def convert_aliased_col_to_real_col(col_name)
+        if respond_to?(:model) and model.respond_to?(:aliases) and model.aliases
+          sym_name = col_name.to_s.downcase.to_sym
+          col_name = model.aliases[sym_name].to_s.upcase if model.aliases.include? sym_name
+        end
+        col_name
+      end
+
+      def convert_aliased_col_to_real_col_with_model(col_name, model)
+        if model.respond_to?(:aliases) and model.aliases
+          sym_name = col_name.to_s.downcase.to_sym
+          col_name = model.aliases[sym_name].to_s.upcase if model.aliases.include? sym_name
+        end
+        col_name
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.45
+  version: 0.3.46
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -07:00
+date: 2010-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -159,10 +159,12 @@ files:
 - lib/sequel/fos_dates.rb
 - lib/sequel/metaprogramming.rb
 - lib/sequel/model_patch.rb
+- lib/sequel/mysql_pervasive_adapter.rb
 - lib/sequel/pervasive_adapter.rb
 - lib/sequel/serializer/json_serializer.rb
 - lib/sequel/serializer/serializer.rb
 - lib/sequel/serializer/xml_serializer.rb
+- lib/sequel/sqlite_pervasive_adapter.rb
 - lib/serial_number.rb
 - spec/be_model_with_values_matcher.rb
 - spec/be_model_with_values_matcher_spec.rb