nbadw-util 0.1.3 → 0.1.4

data/lib/nbadw/util/copy_database_task.rb

@@ -263,19 +263,18 @@ module NBADW
       end
 
       STRING_TO_INT_FIXES = [
-        { :table => "auxuserdbselectedsites", :column => "aquaticsiteuseid" },
-        { :table => "auxuserdbselectedsiteuse", :column => "aquaticsiteuseid" },
-        { :table => "cdtranslation - dfo stock mating", :column => "mating code" },
-        { :table => "del-missing age class in tblfishmeasurement", :column => "fishsampleid" },
-        { :table => "del-missing age class in tblfishmeasurement-robin", :column => "fishsampleid" },
-        { :table => "selections", :column => "selectionid" },
-        { :table => "tblelectrofishingmethoddetail", :column => "aquaticactivitydetailid" },
-        { :table => "tbloldhabitatsurvey", :column => "habitatsurveyid" }
+        { :table => "auxUserDBSelectedSites", :column => "AquaticSiteUseID" },
+        { :table => "auxUserDBSelectedSiteUse", :column => "AquaticSiteUseID" },
+        { :table => "cdTranslation - DFO Stock Mating", :column => "Mating Code" },
+        { :table => "DEL-Missing Age Class in tblFishMeasurement", :column => "FishSampleID" },
+        { :table => "DEL-Missing Age Class in tblFishMeasurement-robin", :column => "FishSampleID" },
+        { :table => "Selections", :column => "SelectionID" },
+        { :table => "tblElectrofishingMethodDetail", :column => "AquaticActivityDetailID" },
+        { :table => "tblOldHabitatSurvey", :column => "HabitatSurveyID" }
       ]
       # not sure what's up here...
       before :create_table, :adapter => :postgres, :for => :destination do |src, dst, args|
-        table = args[:table].to_s.downcase
-        if fix = STRING_TO_INT_FIXES.detect { |fix| fix[:table] == table }
+        if fix = STRING_TO_INT_FIXES.detect { |fix| fix[:table] == args[:table].to_s }
           schema = args[:schema]
           schema = schema.split("\n").collect do |line|
             line = "  Integer :\"#{fix[:column]}\"" if line.match(/#{fix[:column]}/)

data/lib/scratch.rb

@@ -7,10 +7,11 @@ src = 'jdbc:access:////home/colin/master.mdb'
 dst = 'jdbc:mysql://localhost/test?user=developer&password=developer'
 
 NBADW::Util::CopyDatabaseTask.start(src, dst, :verify_data => true, :except => ['EF Data before mm/100'])
-#
+
 #db = Sequel.connect(src)
 #
-#db.tables.each do |t|
+#tables = db.tables
+#tables.each do |t|
 #  puts t
 #end
 #
@@ -19,3 +20,7 @@ NBADW::Util::CopyDatabaseTask.start(src, dst, :verify_data => true, :except => [
 #db.schema(:cdAgency).each do |col_info|
 #  puts "#{col_info[0]}: #{col_info[1].inspect}"
 #end
+#
+#db[:cdAgency].each do |row|
+#  puts row.inspect
+#end

data/lib/sequel/adapters/jdbc/access.rb

@@ -1,12 +1,7 @@
 require 'sequel/adapters/shared/access'
 
 module Sequel
-  module JDBC
-    class Database
-      # Alias the generic JDBC version so it can be called directly later
-      alias jdbc_schema_parse_table schema_parse_table
-    end
-    
+  module JDBC    
     # Database and Dataset instance methods for MSSQL specific
     # support via JDBC.
     module Access
@@ -22,10 +17,24 @@ module Sequel
         end
         
         private                
-        # Call the generic JDBC version instead of MSSQL version,
-        # since the JDBC version handles primary keys.
         def schema_parse_table(table, opts={})
-          jdbc_schema_parse_table(table, opts)
+          m = output_identifier_meth
+          im = input_identifier_meth
+          ds = dataset
+          schema, table = schema_and_table(table)
+          schema ||= opts[:schema]
+          schema = im.call(schema) if schema
+          table = im.call(table)
+          pks, ts = [], []
+          metadata(:getPrimaryKeys, nil, schema, table) do |h|
+            h = downcase_hash_keys(h)
+            pks << h[:column_name]
+          end
+          metadata(:getColumns, nil, schema, table, nil) do |h|
+            h = downcase_hash_keys(h)
+            ts << [m.call(h[:column_name]), {:type=>schema_column_type(h[:type_name]), :db_type=>h[:type_name], :default=>(h[:column_def] == '' ? nil : h[:column_def]), :allow_null=>(h[:nullable] != 0), :primary_key=>pks.include?(h[:column_name]), :column_size=>h[:column_size]}]
+          end
+          ts
         end
         
         # Primary key indexes appear to start with pk__ on MSSQL

data/lib/sequel/adapters/shared/access.rb

@@ -22,34 +22,40 @@ module Sequel
         true
       end
 
+      def tables
+      ts = []
+        m = output_identifier_meth
+        metadata(:getTables, nil, nil, nil, ['TABLE'].to_java(:string)) do |h|
+          h = downcase_hash_keys(h)
+          ts << m.call(h[:table_name])
+        end
+        ts
+      end
+
+      def identifier_input_method_default
+        :to_s
+      end
+
+      # The method to apply to identifiers coming the database by default.
+      # Should be overridden in subclasses for databases that fold unquoted
+      # identifiers to lower case instead of uppercase, such as
+      # MySQL, PostgreSQL, and SQLite.
+      def identifier_output_method_default
+        :to_s
+      end
+
       private
+      def downcase_hash_keys(h)
+        lh = {}
+        h.each { |k,v| lh[k.to_s.downcase.to_sym] = v }
+        lh
+      end
       
-      # MSSQL uses the IDENTITY(1,1) column for autoincrementing columns.
+      # MSSQL uses the COUNTER(1,1) column for autoincrementing columns.
       def auto_increment_sql
         AUTO_INCREMENT
       end
       
-      # MSSQL specific syntax for altering tables.
-      def alter_table_sql(table, op)
-        case op[:op]
-        when :add_column
-          "ALTER TABLE #{quote_schema_table(table)} ADD #{column_definition_sql(op)}"
-        when :rename_column
-          "SP_RENAME #{literal("#{quote_schema_table(table)}.#{quote_identifier(op[:name])}")}, #{literal(op[:new_name].to_s)}, 'COLUMN'"
-        when :set_column_type
-          "ALTER TABLE #{quote_schema_table(table)} ALTER COLUMN #{quote_identifier(op[:name])} #{type_literal(op)}"
-        when :set_column_null
-          sch = schema(table).find{|k,v| k.to_s == op[:name].to_s}.last
-          type = {:type=>sch[:db_type]}
-          type[:size] = sch[:max_chars] if sch[:max_chars]
-          "ALTER TABLE #{quote_schema_table(table)} ALTER COLUMN #{quote_identifier(op[:name])} #{type_literal(type)} #{'NOT ' unless op[:null]}NULL"
-        when :set_column_default
-          "ALTER TABLE #{quote_schema_table(table)} ADD CONSTRAINT #{quote_identifier("sequel_#{table}_#{op[:name]}_def")} DEFAULT #{literal(op[:default])} FOR #{quote_identifier(op[:name])}"
-        else
-          super(table, op)
-        end
-      end
-      
       # SQL to start a new savepoint
       def begin_savepoint_sql(depth)
         SQL_SAVEPOINT % depth
@@ -93,27 +99,6 @@ module Sequel
         SQL_ROLLBACK
       end
       
-      # MSSQL uses the INFORMATION_SCHEMA to hold column information.  This method does
-      # not support the parsing of primary key information.
-      def schema_parse_table(table_name, opts)
-        m = output_identifier_meth
-        m2 = input_identifier_meth
-        ds = metadata_dataset.from(:information_schema__tables___t).
-          join(:information_schema__columns___c, :table_catalog=>:table_catalog,
-          :table_schema => :table_schema, :table_name => :table_name).
-          select(:column_name___column, :data_type___db_type, :character_maximum_length___max_chars, :column_default___default, :is_nullable___allow_null).
-          filter(:c__table_name=>m2.call(table_name.to_s))
-        if schema = opts[:schema] || default_schema
-          ds.filter!(:table_schema=>schema)
-        end
-        ds.map do |row|
-          row[:allow_null] = row[:allow_null] == 'YES' ? true : false
-          row[:default] = nil if blank_object?(row[:default])
-          row[:type] = schema_column_type(row[:db_type])
-          [m.call(row.delete(:column)), row]
-        end
-      end
-      
       # SQL fragment for marking a table as temporary
       def temporary_table_sql
         TEMPORARY
@@ -164,12 +149,13 @@ module Sequel
         meta = result.getMetaData
         cols = []
         i = 0
-        meta.getColumnCount.times{cols << [output_identifier(meta.getColumnLabel(i+=1)).to_s.downcase.to_sym, i]}
+        meta.getColumnCount.times { cols << [output_identifier(meta.getColumnLabel(i+=1)), i] }
         @columns = cols.map{|c| c.at(0)}
         row = {}
         blk = if @convert_types
           lambda{ |n, i|
             begin
+#              puts "#{n}=#{(o = result.getObject(i)).nil? ? 'nil' : o}"
               row[n] = convert_type(result.getObject(i))
             rescue
               # XXX: this is because HXTT driver throws an error here
@@ -276,11 +262,6 @@ module Sequel
         s.select_sql
       end
 
-      # The version of the database server.
-      def server_version
-        db.server_version(@opts[:server])
-      end
-
       # Microsoft SQL Server does not support INTERSECT or EXCEPT
       def supports_intersect_except?
         false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nbadw-util
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Colin Casey