amalgalite 0.7.7-x86-mswin32-60 → 0.8.0-x86-mswin32-60

data/HISTORY

@@ -1,4 +1,13 @@
 = Amalgalite Changelog
+== Version 0.8.0 - 2009-03-23
+
+== Enhancements
+
+* Add in support for obtaining limited schema information on temporary tables
+  and indexes
+* Add support for returning the primary key columns of a table
+* Other miscellaneous items to support the ActiveRecord adapter
+
 == Version 0.7.7 - 2009-03-03
 
 === Bug Fixes

data/lib/amalgalite/column.rb

@@ -38,15 +38,6 @@ module Amalgalite
     # the collation sequence name of the column
     attr_accessor :collation_sequence_name
 
-    # true if the column has a NOT NULL constraint, false otherwise
-    attr_accessor :not_null_constraint
-
-    # true if the column is part of a primary key, false otherwise
-    attr_accessor :primary_key
-
-    # true if the column is AUTO INCREMENT, false otherwise
-    attr_accessor :auto_increment
-
     # The index (starting with 0) of this column in the table definition
     # or result set
     attr_accessor :order
@@ -70,22 +61,37 @@ module Amalgalite
 
     # true if the column may have a NULL value
     def nullable?
-      not_null_constraint == false
+      @not_null_constraint == false
+    end
+
+    # set whether or not the column has a not null constraint
+    def not_null_constraint=( other )
+      @not_null_constraint = Boolean.to_bool( other )
     end
 
     # true if the column as a NOT NULL constraint
     def not_null_constraint?
-      not_null_constraint
+      @not_null_constraint
+    end
+
+    # set whether or not the column is a primary key column
+    def primary_key=( other )
+      @primary_key = Boolean.to_bool( other )
     end
 
     # true if the column is a primary key column
     def primary_key?
-      primary_key
+      @primary_key
+    end
+
+    # set whether or not the column is auto increment
+    def auto_increment=( other )
+      @auto_increment = Boolean.to_bool( other )
     end
 
     # true if the column is auto increment
     def auto_increment?
-      auto_increment
+      @auto_increment
     end
   end
 end

data/lib/amalgalite/schema.rb

@@ -55,7 +55,8 @@ module Amalgalite
     # load all the tables
     #
     def load_tables
-      @db.execute("SELECT tbl_name FROM sqlite_master WHERE type = 'table'") do |table_info|
+      @tables = {}
+      @db.execute("SELECT tbl_name FROM sqlite_master WHERE type = 'table' AND name != 'sqlite_sequence'") do |table_info|
         table = load_table( table_info['tbl_name'] )
         table.indexes = load_indexes( table )
         @tables[table.name] = table
@@ -74,8 +75,18 @@ module Amalgalite
         table.columns = load_columns( table )
         table.schema = self
         table.indexes = load_indexes( table )
+        @tables[table.name] = table 
+      else
+        # might be a temporary table
+        table = Amalgalite::Table.new( table_name, nil )
+        cols = load_columns( table )
+        if cols.size > 0 then
+          table.columns = cols
+          table.schema = self
+          table.indexes = load_indexes( table )
+          @tables[table.name] = table
+        end
       end
-      @tables[table.name] = table
       return table
     end
 
@@ -94,6 +105,12 @@ module Amalgalite
       @db.execute("PRAGMA index_list( #{@db.quote(table.name)} );") do |idx_list|
         idx = indexes[idx_list['name']]
 
+        # temporary indexes do not show up in the previous list
+        if idx.nil? then
+          idx = Amalgalite::Index.new( idx_list['name'], nil, table )
+          indexes[idx_list['name']] = idx
+        end
+
         idx.sequence_number = idx_list['seq']
         idx.unique          = Boolean.to_bool( idx_list['unique'] )
 
@@ -113,9 +130,26 @@ module Amalgalite
       @db.execute("PRAGMA table_info(#{@db.quote(table.name)})") do |row|
         col = Amalgalite::Column.new( "main", table.name, row['name'], row['cid'])
 
-        col.default_value = row['dflt_value']
-        @db.api.table_column_metadata( "main", table.name, col.name ).each_pair do |key, value|
-          col.send("#{key}=", value)
+        col.default_value       = row['dflt_value']
+
+        col.declared_data_type  = row['type']
+        col.not_null_constraint = row['notnull']
+        col.primary_key         = row['pk']
+
+        # need to remove leading and trailing ' or " from the default value
+        if col.default_value and col.default_value.kind_of?( String ) and ( col.default_value.length >= 2 ) then
+          fc = col.default_value[0].chr
+          lc = col.default_value[-1].chr
+          if fc == lc and ( fc == "'" || fc == '"' ) then
+            col.default_value = col.default_value[1..-2]
+          end
+        end
+
+        unless table.temporary? then
+          # get more exact information
+          @db.api.table_column_metadata( "main", table.name, col.name ).each_pair do |key, value|
+            col.send("#{key}=", value)
+          end
         end
         col.schema = self
         cols[col.name] = col

data/lib/amalgalite/statement.rb

@@ -158,11 +158,11 @@ module Amalgalite
       check_parameter_count!( params.size )
       params.each_pair do | param, value |
         position = param_position_of( param )
-      if position > 0 then
-        bind_parameter_to( position, value )
-      else
-        raise Amalgalite::Error, "Unable to find parameter '#{param}' in SQL statement [#{sql}]"
-      end
+        if position > 0 then
+          bind_parameter_to( position, value )
+        else
+          raise Amalgalite::Error, "Unable to find parameter '#{param}' in SQL statement [#{sql}]"
+        end
       end
     end
 
@@ -280,7 +280,7 @@ module Amalgalite
                                                                            col.schema.table,
                                                                            col.schema.name,
                                                                            @stmt_api.column_int64( @rowid_index ),
-                                                                          "r"),
+                                                                           "r"),
                                             :column => col.schema)
             else
               value = Amalgalite::Blob.new( :string => @stmt_api.column_blob( idx ), :column => col.schema )
@@ -406,7 +406,7 @@ module Amalgalite
     # has been closed.
     #
     def close
-      if open?
+      if open? then
         @stmt_api.close
         @open = false
       end

data/lib/amalgalite/table.rb

@@ -2,7 +2,7 @@
 # Copyright (c) 2008 Jeremy Hinegardner
 # All rights reserved.  See LICENSE and/or COPYING for details.
 #++
-
+require 'set'
 module Amalgalite
   #
   # a class representing the meta information about an SQLite table 
@@ -25,13 +25,19 @@ module Amalgalite
     # in this table.  keys are the column names
     attr_accessor :columns
 
-    def initialize( name, sql ) 
+    def initialize( name, sql = nil ) 
       @name    = name
       @sql     = sql
       @indexes = {}
       @columns = {}
     end
 
+    # Is the table a temporary table or not
+    def temporary?
+      !sql
+    end
+
+
     # the Columns in original definition order
     def columns_in_order
       @columns.values.sort_by { |c| c.order }
@@ -41,6 +47,44 @@ module Amalgalite
     def column_names
       columns_in_order.map { |c| c.name }
     end
+
+    # the columns that make up the primary key
+    def primary_key_columns
+      @columns.values.find_all { |c| c.primary_key? }
+    end
+
+    # the array of colmuns that make up the primary key of the table
+    # since a primary key has an index, we loop over all the indexes for the
+    # table and pick the first one that is unique, and all the columns in the
+    # index have primary_key? as true.
+    #
+    # we do this instead of just looking for the columns where primary key is
+    # true because we want the columns in primary key order
+    def primary_key
+      unless @primary_key
+        pk_column_names = Set.new( primary_key_columns.collect { |c| c.name } )
+        unique_indexes  = indexes.values.find_all { |i| i.unique? }
+
+        pk_result = []
+
+        unique_indexes.each do |idx|
+          idx_column_names = Set.new( idx.columns.collect { |c| c.name } )
+          r = idx_column_names ^ pk_column_names
+          if r.size == 0 then
+            pk_result = idx.columns
+            break
+          end
+        end
+
+        # no joy, see about just using all the columns that say the are primary
+        # keys
+        if pk_result.empty? then
+          pk_result = self.primary_key_columns
+        end
+        @primary_key = pk_result
+      end
+      return @primary_key
+    end
   end
 end
 

data/lib/amalgalite/type_maps/default_map.rb

@@ -116,7 +116,8 @@ module Amalgalite::TypeMaps
     end
 
     ##
-    # convert a string to a datetime
+    # convert a string to a datetime, if no timzone is found in the parsed
+    # string, set it to the local offset.  
     #
     def datetime( str )
       DateTime.parse( str )

data/lib/amalgalite/version.rb

@@ -8,8 +8,8 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 7
-    BUILD   = 7
+    MINOR   = 8
+    BUILD   = 0
 
     #
     # return the Version as an array of MAJOR, MINOR, BUILD

data/spec/schema_spec.rb

@@ -42,6 +42,14 @@ describe Amalgalite::Schema do
     @iso_db.schema.views["v1"].sql.should eql(sql)
   end
 
+  it "removes quotes from around default values in columns" do
+    sql = "CREATE TABLE t1( d1 default 't' )"
+    @iso_db.execute( sql )
+    @iso_db.schema.dirty!
+    tt = @iso_db.schema.tables['t1']
+    tt.columns['d1'].default_value.should == "t"
+  end
+
   it "loads the tables and columns" do
     ct = @iso_db.schema.tables['country']
     ct.name.should eql("country")
@@ -59,6 +67,35 @@ describe Amalgalite::Schema do
     ct.columns['id'].should_not be_auto_increment
   end
 
+  it "knows what the primary key of a table is" do
+    ct = @iso_db.schema.tables['country']
+    ct.primary_key.should == [ ct.columns['two_letter'] ]
+  end
+
+  it "knows the primary key of a table even without an explicity unique index" do
+    sql = "CREATE TABLE u( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL , other text )"
+    @iso_db.execute( sql )
+    @iso_db.schema.dirty!
+    ut = @iso_db.schema.tables['u']
+    ut.primary_key.should == [ ut.columns['id'] ]
+  end
+
+  it "knows the primary key of a temporary table" do
+    @iso_db.execute "CREATE TEMPORARY TABLE tt( a, b INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, c )"
+    @iso_db.schema.dirty!
+    tt = @iso_db.schema.load_table( 'tt' )
+    tt.primary_key.should == [ tt.columns['b'] ]
+
+  end
+
+  it "knows what the primary key of a table is when it is a multiple column primary key" do
+    sql = "CREATE TABLE m ( id1, id2, PRIMARY KEY (id2, id1) )"
+    @iso_db.execute( sql )
+    @iso_db.schema.dirty!
+    mt = @iso_db.schema.tables['m']
+    mt.primary_key.should == [ mt.columns['id2'], mt.columns['id1'] ]
+  end
+
   it "loads the indexes" do
     c = @iso_db.schema.tables['country']
     c.indexes.size.should eql(2)
@@ -72,4 +109,12 @@ describe Amalgalite::Schema do
     subc.indexes.size.should eql(3)
     subc.indexes['subcountry_country'].columns.first.should eql(@iso_db.schema.tables['subcountry'].columns['country'])
   end
+
+  it "can load the schema of a temporary table" do
+    @iso_db.execute "CREATE TEMPORARY TABLE tt( a, b, c )"
+    @iso_db.schema.dirty!
+    @iso_db.schema.tables['tt'].should be_nil
+    @iso_db.schema.load_table('tt').should_not be_nil
+    @iso_db.schema.tables['tt'].should be_temporary
+  end
 end

data/spec/tap_spec.rb

@@ -32,7 +32,7 @@ describe Amalgalite::Taps::StringIO do
     s = ::Amalgalite::Taps::StringIO.new
     s.profile( 'test', 42 )
     s.dump_profile
-    s.string.should == "42 : test\ntest[test] => sum: 42, sumsq: 1764, n: 1, mean: 42.000000, stddev: 0.000000, min: 42, max: 42\n"
+    s.string.should eql("42 : test\ntest[test] => sum: 42, sumsq: 1764, n: 1, mean: 42.000000, stddev: 0.000000, min: 42, max: 42\n")
   end
 
   it "has a stdout tap" do

data/tasks/config.rb

@@ -61,7 +61,7 @@ Configuration.for("rubygem") {
 Configuration.for('test') {
   mode      "spec"
   files     Configuration.for("packaging").files.test
-  options   %w[ --format progress --color ]
+  options   %w[ --format profile --color ]
   ruby_opts %w[  ]
 }
 

data/tasks/distribution.rake

@@ -18,7 +18,7 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
 
     desc "Install as a gem"
     task :install => [:clobber, :package] do
-      sh "sudo gem install --local pkg/#{Amalgalite::GEM_SPEC.full_name}.gem"
+      sh "sudo gem install --local pkg/#{Amalgalite::GEM_SPEC.full_name}.gem --no-rdoc --no-ri"
     end
 
     desc "Uninstall gem"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.7.7
+  version: 0.8.0
 platform: x86-mswin32-60
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -07:00
+date: 2009-03-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency