cartodb-importer 0.2.7 → 0.2.8

data/lib/cartodb-importer/importer.rb

@@ -111,6 +111,7 @@ module CartoDB
       end
       
       if @ext == '.csv'
+        
         ogr2ogr_bin_path = `which ogr2ogr`.strip
         ogr2ogr_command = %Q{#{ogr2ogr_bin_path} -f "PostgreSQL" PG:"host=#{@db_configuration[:host]} port=#{@db_configuration[:port]} user=#{@db_configuration[:username]} dbname=#{@db_configuration[:database]}" #{path} -nln #{@suggested_name}}
         
@@ -322,17 +323,14 @@ module CartoDB
     end
     
     def get_valid_name(name)
-      candidates = @db_connection.tables.map{ |t| t.to_s }.select{ |t| t.match(/^#{name}/) }
-      if candidates.any?
-        max_candidate = candidates.max
-        if max_candidate =~ /(.+)_(\d+)$/
-          return $1 + "_#{$2.to_i +  1}"
-        else
-          return max_candidate + "_2"
-        end
-      else
-        return name
+      existing_names = @db_connection["select relname from pg_stat_user_tables WHERE schemaname='public' and relname ilike '#{name}%'"].map(:relname)
+      testn = 1
+      uniname = name
+      while true==existing_names.include?("#{uniname}")
+        uniname = "#{name}_#{testn}"
+        testn = testn + 1
       end
+      return uniname
     end
     
     def log(str)

data/lib/cartodb-importer/version.rb

@@ -1,6 +1,6 @@
 module CartoDB
   class Importer
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end
     

data/spec/import_spec.rb

@@ -177,11 +177,19 @@ describe CartoDB::Importer do
     it "should import estaciones2.csv" do
       importer = CartoDB::Importer.new :import_from_file => File.expand_path("../support/data/estaciones2.csv", __FILE__),
                                      :database => "cartodb_importer_test", :username => 'postgres', :password => '',
-                                     :host => 'localhost', :port => 5432
+                                     :host => 'localhost', :port => 5432, :suggested_name => 'estaciones2'
       result = importer.import!
       result.name.should == 'estaciones2'
       result.rows_imported.should == 30
       result.import_type.should == '.csv'
+      
+      importer2 = CartoDB::Importer.new :import_from_file => File.expand_path("../support/data/estaciones2.csv", __FILE__),
+                                     :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                     :host => 'localhost', :port => 5432, :suggested_name => 'estaciones2'
+      result2 = importer2.import!
+      result2.name.should == 'estaciones2_0'
+      result2.rows_imported.should == 30
+      result2.import_type.should == '.csv'
     end
   end
   
@@ -263,7 +271,7 @@ describe CartoDB::Importer do
                                        :database => "cartodb_importer_test", :username => 'postgres', :password => '',
                                        :host => 'localhost', :port => 5432
       result2 = importer.import!
-      result2.name.should == 'tm_world_borders_simpl_0_4'
+      result2.name.should == 'tm_world_borders_simpl_0_3_0'
       #result.rows_imported.should == 4365
       result2.import_type.should == '.shp'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartodb-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70204688871100 !ruby/object:Gem::Requirement
+  requirement: &70263347758260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688871100
+  version_requirements: *70263347758260
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70204688870460 !ruby/object:Gem::Requirement
+  requirement: &70263347757840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688870460
+  version_requirements: *70263347757840
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70204688869740 !ruby/object:Gem::Requirement
+  requirement: &70263347757380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688869740
+  version_requirements: *70263347757380
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70204688869160 !ruby/object:Gem::Requirement
+  requirement: &70263347756940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688869160
+  version_requirements: *70263347756940
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &70204688868520 !ruby/object:Gem::Requirement
+  requirement: &70263347756360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688868520
+  version_requirements: *70263347756360
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70204688867880 !ruby/object:Gem::Requirement
+  requirement: &70263347755840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688867880
+  version_requirements: *70263347755840
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70204688867260 !ruby/object:Gem::Requirement
+  requirement: &70263347755180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204688867260
+  version_requirements: *70263347755180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70204688866620 !ruby/object:Gem::Requirement
+  requirement: &70263347754620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204688866620
+  version_requirements: *70263347754620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70204688865980 !ruby/object:Gem::Requirement
+  requirement: &70263347754140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204688865980
+  version_requirements: *70263347754140
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70204688865360 !ruby/object:Gem::Requirement
+  requirement: &70263347753660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204688865360
+  version_requirements: *70263347753660
 description: Import CSV, SHP, and other files with data into a PostgreSQL table
 email:
 - andrew@vizzuality.com