amalgalite 0.12.0-x86-mingw32 → 0.15.0-x86-mingw32

data/ext/amalgalite/sqlite3ext.h

@@ -14,8 +14,6 @@
 ** an SQLite instance.  Shared libraries that intend to be loaded
 ** as extensions by SQLite should #include this file instead of 
 ** sqlite3.h.
-**
-** @(#) $Id: sqlite3ext.h,v 1.25 2008/10/12 00:27:54 shane Exp $
 */
 #ifndef _SQLITE3EXT_H_
 #define _SQLITE3EXT_H_

data/gemspec.rb

@@ -21,6 +21,7 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec|
 
   # add dependencies here
   spec.add_dependency("arrayfields", "~> 4.7.0")
+  spec.add_dependency("fastercsv", "~> 1.5.3")
   
   spec.add_development_dependency("rake", "~> 0.8.4")
   spec.add_development_dependency("configuration", "~> 0.0.5")

data/lib/amalgalite.rb

@@ -29,6 +29,7 @@ require 'amalgalite/column'
 require 'amalgalite/database'
 require 'amalgalite/function'
 require 'amalgalite/index'
+require 'amalgalite/memory_database'
 require 'amalgalite/paths'
 require 'amalgalite/profile_tap'
 require 'amalgalite/progress_handler'

data/lib/amalgalite/csv_table_importer.rb

@@ -0,0 +1,69 @@
+require 'fastercsv'
+module Amalgalite
+  ##
+  # A class to deal with importing CSV data into a single table in the
+  # database.
+  #
+  class CSVTableImporter
+    def initialize( csv_path, database, table_name, options = {} )
+      @csv_path   = File.expand_path( csv_path )
+      @database   = database
+      @table_name = table_name
+      @table      = @database.schema.tables[@table_name]
+      @options    = options
+      validate
+    end
+
+    def run
+      @database.transaction do |db|
+        db.prepare( insert_sql ) do |stmt|
+          ::FasterCSV.foreach( @csv_path, @options ) do |row|
+            stmt.execute( row )
+          end
+        end
+      end
+    end
+
+    ##
+    # The column names of the import table in definiation order
+    #
+    def column_names
+      @table.columns_in_order.collect { |c| c.name }
+    end
+
+    ##
+    # The columns used for the insertion.  This is either #column_names
+    # or the value out of @options[:headers] if that value is an Array
+    #
+    def insert_column_list
+      column_list = self.column_names
+      if Array === @options[:headers]  then
+        column_list = @options[:headers]
+      end
+      return column_list
+    end
+
+    ##
+    # The prepared statement SQL that is used for the import
+    #
+    def insert_sql
+      column_sql = insert_column_list.join(",")
+      vars       = insert_column_list.collect { |x| "?" }.join(",")
+      return "INSERT INTO #{@table_name}(#{column_sql}) VALUES (#{vars})"
+    end
+
+    def table_list
+      @database.schema.tables.keys
+    end
+
+    ##
+    # validate that the arguments for initialization are valid and that the #run
+    # method will probably execute
+    #
+    def validate
+      raise ArgumentError, "CSV file #{@csv_path} does not exist" unless File.exist?( @csv_path )
+      raise ArgumentError, "CSV file #{@csv_path} is not readable" unless File.readable?( @csv_path )
+      raise ArgumentError, "The table '#{@table_name} is not found in the database.  The known tables are #{table_list.sort.join(", ")}" unless @table
+    end
+  end
+end

data/lib/amalgalite/database.rb

@@ -10,6 +10,7 @@ require 'amalgalite/function'
 require 'amalgalite/aggregate'
 require 'amalgalite/busy_timeout'
 require 'amalgalite/progress_handler'
+require 'amalgalite/csv_table_importer'
 
 module Amalgalite
   #
@@ -30,7 +31,7 @@ module Amalgalite
   #
   # Open an in-memory database:
   #
-  #   db = Amalgalite::Database.new( ":memory:" )
+  #   db = Amalgalite::MemoryDatabase.new
   #
   class Database
 
@@ -946,6 +947,30 @@ module Amalgalite
       @api.replicate_to( to_db.api )
       return to_db
     end
+
+    ##
+    # call-seq:
+    #   db.import_csv_to_table( "/some/location/data.csv", "my_table" )
+    #   db.import_csv_to_table( "countries.csv", "countries", :col_sep => "|", :headers => %w[ name two_letter id ] )
+    #
+    #
+    # import_csv_to_table() takes 2 required arguments, and a hash of options.  The 
+    # first argument is the path to a CSV, the second is the table in which
+    # to load the data.  The options has is a subset of those used by FasterCSV
+    #
+    # * :col_sep - the string placed between each field.  Default is ","
+    # * :row_sep - the String appended to the end of each row.  Default is :auto
+    # * :quote_char - The character used to quote fields.  Default '"'
+    # * :headers - set to true or :first_row if there are headers in this CSV. Default is false.
+    #              This may also be an Array.  If that is the case then the
+    #              array is used as the fields in the CSV and the fields in the
+    #              table in which to insert.  If this is set to an Array, it is
+    #              assumed that all rows in the csv will be inserted.
+    #
+    def import_csv_to_table( csv_path, table_name, options = {} )
+      importer = CSVTableImporter.new( csv_path, self, table_name, options )
+      importer.run
+    end
   end
 end
 

data/lib/amalgalite/memory_database.rb

@@ -0,0 +1,15 @@
+require 'amalgalite/database'
+module Amalgalite
+  #
+  # The encapsulation of a connection to an SQLite3 in-memory database.  
+  #
+  # Open an in-memory database:
+  #
+  #   db = Amalgalite::MemoryDatabase.new
+  #
+  class MemoryDatabase < Database
+    def initialize
+      super( ":memory:" )
+    end
+  end
+end

data/lib/amalgalite/packer.rb

@@ -68,8 +68,10 @@ module Amalgalite
           amalgalite/type_maps/default_map.rb
           amalgalite/function.rb
           amalgalite/progress_handler.rb
+          amalgalite/csv_table_importer.rb
           amalgalite/database.rb
           amalgalite/index.rb
+          amalgalite/memory_database.rb
           amalgalite/paths.rb
           amalgalite/table.rb
           amalgalite/view.rb

data/lib/amalgalite/version.rb

@@ -8,7 +8,7 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 12
+    MINOR   = 15
     BUILD   = 0
 
     #

data/spec/aggregate_spec.rb

@@ -1,11 +1,5 @@
-require 'rubygems'
-require 'spec'
-
 require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) )
 
-require 'amalgalite'
-require 'amalgalite/database'
-
 class AggregateTest1 < ::Amalgalite::Aggregate
   def initialize
     @name = 'atest1'
@@ -23,19 +17,6 @@ end
 
 describe "Aggregate SQL Functions" do
 
-  before(:each) do
-    @schema = IO.read( SpecInfo.test_schema_file )
-    @iso_db_file = SpecInfo.make_iso_db
-    @iso_db = Amalgalite::Database.new( SpecInfo.make_iso_db )
-  end
-
-  after(:each) do
-    File.unlink SpecInfo.test_db if File.exist?( SpecInfo.test_db )
-    @iso_db.close
-    File.unlink @iso_db_file if File.exist?( @iso_db_file )
-  end
-
-
   it "must have a finalize method implemented" do
     ag = ::Amalgalite::Aggregate.new
     lambda { ag.finalize }.should raise_error( NotImplementedError, /Aggregate#finalize must be implemented/ )

data/spec/blob_spec.rb

@@ -1,11 +1,7 @@
-require 'rubygems'
-require 'spec'
-
-$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-require 'amalgalite'
+require File.expand_path( File.join( File.dirname(__FILE__), 'spec_helper'))
 
 describe Amalgalite::Blob do
-  DATA_FILE = File.expand_path( File.join( File.dirname(__FILE__), "iso-3166-country.txt" ) )
+
   before(:each) do
     @blob_db_name = File.join(File.dirname( __FILE__ ), "blob.db")
     File.unlink @blob_db_name if File.exist?( @blob_db_name )
@@ -17,6 +13,7 @@ describe Amalgalite::Blob do
         data    TEXT ); 
     SQL
     @db.execute( @schema_sql )
+    @country_data_file = Amalgalite::Iso3166Database.country_data_file
     @junk_file = File.join( File.dirname(__FILE__), "test_output")
   end
 
@@ -26,14 +23,14 @@ describe Amalgalite::Blob do
     File.unlink @junk_file    if File.exist?( @junk_file )
   end
 
-  { :file   => DATA_FILE,
-    :string => IO.read( DATA_FILE ),
-    :io     => StringIO.new( IO.read( DATA_FILE ) ) }.each_pair do |style, data |
+  { :file   => Amalgalite::Iso3166Database.country_data_file,
+    :string => IO.read( Amalgalite::Iso3166Database.country_data_file),
+    :io     => StringIO.new( IO.read( Amalgalite::Iso3166Database.country_data_file) ) }.each_pair do |style, data |
     describe "inserts a blob from a #{style}" do
       before(:each) do
         column = @db.schema.tables['blobs'].columns['data']
         @db.execute("INSERT INTO blobs(name, data) VALUES ($name, $data)",
-                    { "$name" => DATA_FILE,
+                    { "$name" => @country_data_file,
                       "$data" => Amalgalite::Blob.new( style => data,
                                                       :column => column ) } )
         @db.execute("VACUUM")
@@ -47,26 +44,26 @@ describe Amalgalite::Blob do
       it "and retrieves the data as a single value" do
         all_rows = @db.execute("SELECT name,data FROM blobs")
         all_rows.size.should eql(1)
-        all_rows.first['name'].should eql(DATA_FILE)
+        all_rows.first['name'].should eql(@country_data_file)
         all_rows.first['data'].should_not be_incremental
-        all_rows.first['data'].to_string_io.string.should eql(IO.read( DATA_FILE ))
+        all_rows.first['data'].to_string_io.string.should eql(IO.read( @country_data_file ))
       end
 
       it "and retrieves the data using incremental IO" do
         all_rows = @db.execute("SELECT * FROM blobs")
         all_rows.size.should eql(1)
-        all_rows.first['name'].should eql(DATA_FILE)
+        all_rows.first['name'].should eql(@country_data_file)
         all_rows.first['data'].should be_incremental
-        all_rows.first['data'].to_string_io.string.should eql(IO.read( DATA_FILE ))
+        all_rows.first['data'].to_string_io.string.should eql(IO.read( @country_data_file ))
       end
 
       it "writes the data to a file " do
         all_rows = @db.execute("SELECT * FROM blobs")
         all_rows.size.should eql(1)
-        all_rows.first['name'].should eql(DATA_FILE)
+        all_rows.first['name'].should eql(@country_data_file)
         all_rows.first['data'].should be_incremental
         all_rows.first['data'].write_to_file( @junk_file )
-        IO.read( @junk_file).should eql(IO.read( DATA_FILE ))
+        IO.read( @junk_file).should eql(IO.read( @country_data_file ))
       end
     end
   end

data/spec/busy_handler.rb

@@ -1,11 +1,5 @@
-require 'rubygems'
-require 'spec'
-
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper.rb' ) )
 
-require 'amalgalite'
-require 'amalgalite/database'
-
 class BusyHandlerTest < Amalgalite::BusyHandler
   attr_accessor :call_count
   def initialize( max = 5 )
@@ -24,15 +18,13 @@ end
 
 describe "Busy Handlers" do
   before(:each) do
-    @db_name = SpecInfo.make_iso_db
-    @read_db = Amalgalite::Database.new( @db_name )
-    @write_db = Amalgalite::Database.new( @db_name )
+    @read_db = Amalgalite::Database.new( @iso_db_path )
+    @write_db = Amalgalite::Database.new( @iso_db_path )
   end
 
   after(:each) do
     @write_db.close
     @read_db.close
-    File.unlink @db_name if File.exist?( @db_name )
   end
 
   it "raises NotImplemented if #call is not overwritten" do

data/spec/data/iso-3166-country.txt

@@ -0,0 +1,242 @@
+Afghanistan|AF|4
+Albania|AL|8
+Algeria|DZ|12
+American Samoa|AS|16
+Andorra|AD|20
+Angola|AO|24
+Anguilla|AI|660
+Antarctica|AQ|10
+Antigua and Barbuda|AG|28
+Argentina|AR|32
+Armenia|AM|51
+Aruba|AW|533
+Australia|AU|36
+Austria|AT|40
+Azerbaijan|AZ|31
+Bahamas|BS|44
+Bahrain|BH|48
+Bangladesh|BD|50
+Barbados|BB|52
+Belarus|BY|112
+Belgium|BE|56
+Belize|BZ|84
+Benin|BJ|204
+Bermuda|BM|60
+Bhutan|BT|64
+Bolivia|BO|68
+Bosnia and Herzegowina|BA|70
+Botswana|BW|72
+Bouvet Island|BV|74
+Brazil|BR|76
+British Indian Ocean Territory|IO|86
+Brunei Darussalam|BN|96
+Bulgaria|BG|100
+Burkina Faso|BF|854
+Burundi|BI|108
+Cambodia|KH|116
+Cameroon|CM|120
+Cape Verde|CV|132
+Cayman Islands|KY|136
+Central African Republic|CF|140
+Chad|TD|148
+Chile|CL|152
+China|CN|156
+Christmas Island|CX|162
+Cocos (Keeling) Islands|CC|166
+Colombia|CO|170
+Comoros|KM|174
+Congo|CG|178
+Congo, The Democratic Republic of the|CD|180
+Cook Islands|CK|184
+Costa Rica|CR|188
+Cote D'Ivoire|CI|384
+Croatia (local name: Hrvatska)|HR|191
+Cuba|CU|192
+Cyprus|CY|196
+Czech Republic|CZ|203
+Denmark|DK|208
+Djibouti|DJ|262
+Dominica|DM|212
+Dominican Republic|DO|214
+East Timor|TP|626
+Ecuador|EC|218
+Egypt|EG|818
+El Salvador|SV|222
+Equatorial Guinea|GQ|226
+Eritrea|ER|232
+Estonia|EE|233
+Ethiopia|ET|231
+Falkland Islands (Malvinas)|FK|238
+Faroe Islands|FO|234
+Fiji|FJ|242
+Finland|FI|246
+France|FR|250
+France, Metropolitan|FX|249
+French Guiana|GF|254
+French Polynesia|PF|258
+French Southern Territories|TF|260
+Gabon|GA|266
+Gambia|GM|270
+Georgia|GE|268
+Germany|DE|276
+Ghana|GH|288
+Gibraltar|GI|292
+Greece|GR|300
+Greenland|GL|304
+Grenada|GD|308
+Guadeloupe|GP|312
+Guam|GU|316
+Guatemala|GT|320
+Guinea|GN|324
+Guinea-Bissau|GW|624
+Guyana|GY|328
+Haiti|HT|332
+Heard and McDonald Islands|HM|334
+Holy See (Vatican City State)|VA|336
+Honduras|HN|340
+Hong Kong|HK|344
+Hungary|HU|348
+Iceland|IS|352
+India|IN|356
+Indonesia|ID|360
+Iran (Islamic Republic of)|IR|364
+Iraq|IQ|368
+Ireland|IE|372
+Israel|IL|376
+Italy|IT|380
+Jamaica|JM|388
+Japan|JP|392
+Jordan|JO|400
+Kazakhstan|KZ|398
+Kenya|KE|404
+Kiribati|KI|296
+Korea, Democratic People's Republic of|KP|408
+Korea, Republic of|KR|410
+Kuwait|KW|414
+Kyrgyzstan|KG|417
+Lao People's Democratic Republic|LA|418
+Latvia|LV|428
+Lebanon|LB|422
+Lesotho|LS|426
+Liberia|LR|430
+Libyan Arab Jamahiriya|LY|434
+Liechtenstein|LI|438
+Lithuania|LT|440
+Luxembourg|LU|442
+Macau|MO|446
+Macedonia, the Former Yugoslav Republic of|MK|807
+Madagascar|MG|450
+Malawi|MW|454
+Malaysia|MY|458
+Maldives|MV|462
+Mali|ML|466
+Malta|MT|470
+Marshall Islands|MH|584
+Martinique|MQ|474
+Mauritania|MR|478
+Mauritius|MU|480
+Mayotte|YT|175
+Micronesia, Federated States of|FM|583
+Moldova, Republic of|MD|498
+Monaco|MC|492
+Mongolia|MN|496
+Montserrat|MS|500
+Morocco|MA|504
+Mozambique|MZ|508
+Myanmar|MM|104
+Namibia|NA|516
+Nauru|NR|520
+Nepal|NP|524
+Netherlands|NL|528
+Netherlands Antilles|AN|530
+New Caledonia|NC|540
+New Zealand|NZ|554
+Nicaragua|NI|558
+Niger|NE|562
+Nigeria|NG|566
+Niue|NU|570
+Norfolk Island|NF|574
+Northern Mariana Islands|MP|580
+Norway|NO|578
+Oman|OM|512
+Pakistan|PK|586
+Palau|PW|585
+Palestinian Territory, Occupied|PS|275
+Panama|PA|591
+Papua New Guinea|PG|598
+Paraguay|PY|600
+Peru|PE|604
+Philippines|PH|608
+Pitcairn|PN|612
+Poland|PL|616
+Portugal|PT|620
+Puerto Rico|PR|630
+Qatar|QA|634
+Reunion|RE|638
+Romania|RO|642
+Russian Federation|RU|643
+Rwanda|RW|646
+Saint Kitts and Nevis|KN|659
+Saint Lucia|LC|662
+Saint Vincent and the Grenadines|VC|670
+Samoa|WS|882
+San Marino|SM|674
+Sao Tome and Principe|ST|678
+Saudi Arabia|SA|682
+Senegal|SN|686
+Serbia and Montenegro|CS|891
+Seychelles|SC|690
+Sierra Leone|SL|694
+Singapore|SG|702
+Slovakia (Slovak Republic)|SK|703
+Slovenia|SI|705
+Solomon Islands|SB|90
+Somalia|SO|706
+South Africa|ZA|710
+South Georgia and the South Sandwich Islands|GS|239
+Spain|ES|724
+Sri Lanka|LK|144
+St. Helena|SH|654
+St. Pierre and Miquelon|PM|666
+Sudan|SD|736
+Suriname|SR|740
+Svalbard and Jan Mayen Islands|SJ|744
+Swaziland|SZ|748
+Sweden|SE|752
+Switzerland|CH|756
+Syrian Arab Republic|SY|760
+Taiwan, Province of China|TW|158
+Tajikistan|TJ|762
+Tanzania, United Republic of|TZ|834
+Thailand|TH|764
+Timor-Leste|TL|626
+Togo|TG|768
+Tokelau|TK|772
+Tonga|TO|776
+Trinidad and Tobago|TT|780
+Tunisia|TN|788
+Turkey|TR|792
+Turkmenistan|TM|795
+Turks and Caicos Islands|TC|796
+Tuvalu|TV|798
+Uganda|UG|800
+Ukraine|UA|804
+United Arab Emirates|AE|784
+United States Minor Outlying Islands|UM|581
+Uruguay|UY|858
+Uzbekistan|UZ|860
+Vanuatu|VU|548
+Venezuela|VE|862
+Viet Nam|VN|704
+Virgin Islands (British)|VG|92
+Virgin Islands (U.S.)|VI|850
+Wallis and Futuna Islands|WF|876
+Western Sahara|EH|732
+Yemen|YE|887
+Yugoslavia|YU|891
+Zambia|ZM|894
+Zimbabwe|ZW|716
+Canada|CA|124
+Mexico|MX|484
+United Kingdom|GB|826
+United States|US|840