picky 1.5.0 → 1.5.1

data/lib/picky/sources/db.rb

@@ -28,6 +28,8 @@ module Sources
     #
     attr_reader :connection_options
     
+    @@traversal_id = :__picky_id
+    
     def initialize select_statement, options = { file: 'app/db.yml' }
       @select_statement = select_statement
       @database         = create_database_adapter
@@ -86,11 +88,9 @@ module Sources
       # TODO Use rename_column ASAP.
       #
       if on_database.adapter_name == "PostgreSQL"
-        on_database.execute "ALTER TABLE #{origin} RENAME COLUMN id TO indexed_id"
-        on_database.execute "ALTER TABLE #{origin} ADD COLUMN id SERIAL PRIMARY KEY"
+        on_database.execute "ALTER TABLE #{origin} ADD COLUMN #{@@traversal_id} SERIAL PRIMARY KEY"
       else
-        on_database.execute "ALTER TABLE #{origin} CHANGE COLUMN id indexed_id INTEGER"
-        on_database.execute "ALTER TABLE #{origin} ADD COLUMN id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT"
+        on_database.execute "ALTER TABLE #{origin} ADD COLUMN #{@@traversal_id} INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT"
       end
       
       # Execute any special queries this type needs executed.
@@ -103,7 +103,7 @@ module Sources
     def count type # :nodoc:
       connect_backend
       
-      database.connection.select_value("SELECT COUNT(id) FROM #{snapshot_table_name(type)}").to_i
+      database.connection.select_value("SELECT COUNT(#{@@traversal_id}) FROM #{snapshot_table_name(type)}").to_i
     end
     
     #
@@ -130,19 +130,19 @@ module Sources
       # TODO Rewrite ASAP.
       #
       if database.connection.adapter_name == "PostgreSQL"
-        id_key   = 'indexed_id'
+        id_key   = 'id'
         text_key = category.from.to_s
         database.connection.execute(select_statement).each do |hash|
-          indexed_id, text = hash.values_at id_key, text_key
+          id, text = hash.values_at id_key, text_key
           next unless text
           text.force_encoding 'utf-8' # TODO Still needed? Or move to backend?
-          yield indexed_id, text
+          yield id, text
         end
       else
-        database.connection.execute(select_statement).each do |indexed_id, text|
+        database.connection.execute(select_statement).each do |id, text|
           next unless text
           text.force_encoding 'utf-8' # TODO Still needed? Or move to backend?
-          yield indexed_id, text
+          yield id, text
         end
       end
     end
@@ -156,13 +156,13 @@ module Sources
       
       statement += statement.include?('WHERE') ? ' AND' : ' WHERE'
       
-      "#{statement} st.id > #{offset} LIMIT #{chunksize}"
+      "#{statement} st.#{@@traversal_id} > #{offset} LIMIT #{chunksize}"
     end
     
     # The harvest statement used to pull data from the snapshot table.
     #
     def harvest_statement type, category # :nodoc:
-      "SELECT indexed_id, #{category.from} FROM #{snapshot_table_name(type)} st"
+      "SELECT id, #{category.from} FROM #{snapshot_table_name(type)} st"
     end
     
     # The amount of records that are loaded each chunk.

data/spec/lib/sources/db_spec.rb

@@ -30,7 +30,7 @@ describe Sources::DB do
 
           @connection.should_receive(:execute).
                       once.
-                      with('SELECT indexed_id, some_category FROM some_type_type_index st WHERE st.id > some_offset LIMIT 25000').
+                      with('SELECT id, some_category FROM some_type_type_index st WHERE st.__picky_id > some_offset LIMIT 25000').
                       and_return []
 
           @source.get_data @type, @category, :some_offset
@@ -40,7 +40,7 @@ describe Sources::DB do
         it 'yields to the caller' do
           @connection.should_receive(:execute).
                       any_number_of_times.
-                      with('SELECT indexed_id, some_category FROM some_type_type_index st WHERE st.id > some_offset LIMIT 25000').
+                      with('SELECT id, some_category FROM some_type_type_index st WHERE st.__picky_id > some_offset LIMIT 25000').
                       and_return [[1, 'text']]
 
           @source.get_data @type, @category, :some_offset do |id, text|
@@ -86,7 +86,7 @@ describe Sources::DB do
     end
     it "should get the id count" do
       result = stub(:result, :to_i => 12_345)
-      @connection.should_receive(:select_value).once.with("SELECT COUNT(id) FROM some_type_name_type_index")
+      @connection.should_receive(:select_value).once.with("SELECT COUNT(__picky_id) FROM some_type_name_type_index")
       
       @source.count @type
     end
@@ -120,11 +120,11 @@ describe Sources::DB do
     end
     it "should add an AND if it already contains a WHERE statement" do
       @source.should_receive(:harvest_statement).and_return 'WHERE'
-      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "WHERE AND st.id > some_offset LIMIT 25000"
+      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "WHERE AND st.__picky_id > some_offset LIMIT 25000"
     end
     it "should add a WHERE if it doesn't already contain one" do
       @source.should_receive(:harvest_statement).and_return 'some_statement'
-      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "some_statement WHERE st.id > some_offset LIMIT 25000"
+      @source.harvest_statement_with_offset(@type, @category, :some_offset).should == "some_statement WHERE st.__picky_id > some_offset LIMIT 25000"
     end
   end
   

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +01:00
+date: 2011-03-04 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency