activerecord-jdbcvertica-adapter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18b74f7b66907e7b282bef43f8f12ee5a2829537
-  data.tar.gz: 0706da8018c41c7103e843fa0308f27fea68132f
+  metadata.gz: 3763fb0885067df8427a8ebb62615187c6d77376
+  data.tar.gz: ec1f313ef961d6f323333a80e974a7064be4c580
 SHA512:
-  metadata.gz: 2f4863be4923061e76bcc4ed83243e2c55ae1afe4db99b389680c55b41f92c089c3f6fe0af2cde95ca916791dfb6a6fd0dc6096a59620a2a9e6510c2b2483e5e
-  data.tar.gz: 8ef7e4297ab56f94c6a6b8a0f78c6445d89ae223986d8125553ed13f9f22795c8238b2c644c098b071ac82441640e6106964f7f49ac00cfa30fb73a3f3ebe09e
+  metadata.gz: 3d108bfa54433ee4398b27115d4e1168755d9a5e2accbc84bd4bd92ba016f6548e0fc894424ecab96b9a5f3384fd9880bb4ca693eeec00b84eeaf1bfb7533b4d
+  data.tar.gz: da086fe08adbd715065a118b88c7e0e00c22b32d54f0f1721973d64736df6edcf5e13de002d0ba3cca18f38e32ca5e5b17284629a3a51348eccfd6d1d57ec727

data/lib/activerecord-jdbcvertica-adapter/version.rb

@@ -1,7 +1,7 @@
 module Activerecord
   module Jdbcvertica
     module Adapter
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

data/lib/arjdbc/vertica/adapter.rb

@@ -6,9 +6,10 @@ require 'arjdbc/vertica/column'
 module ::ArJdbc
   module Vertica
     ADAPTER_NAME = 'Vertica'.freeze
+    INSERT_TABLE_EXTRACTION = /into\s+(?<table_name>[^\(]*).*values\s*\(/im
 
     NATIVE_DATABASE_TYPES = {
-      :primary_key => "auto_increment primary key",
+      :primary_key => "integer primary key",
       :string      => { :name => "varchar", :limit => 255 },
       :text        => { :name => "varchar", :limit => 15000 },
       :integer     => { :name => "integer" },
@@ -47,31 +48,89 @@ module ::ArJdbc
       return columns
     end
 
+    ##
+    # Override create_table to create the sequences
+    # needed to manage primary keys
+    #
+    def create_table(table_name, options = {})
+      super
+
+      sequence_name = sequence_name_for(table_name, options[:primary_key] || "id")
+      unless sequence_exists?(sequence_name)
+        create_sequence(sequence_name)
+      end
+    end
+
+    def create_sequence(sequence_name)
+      sql = <<-SQL
+        CREATE SEQUENCE #{sequence_name};
+      SQL
+
+      return execute(sql)
+    end
+
+    def drop_sequence(sequence_name)
+      sql = <<-SQL
+        DROP SEQUENCE #{sequence_name};
+      SQL
+
+      return execute(sql)
+    end
+
+    def drop_table(table_name, options = {})
+      super
+
+      sequence_name = sequence_name_for(table_name, options[:primary_key] || "id")
+      if sequence_exists?(sequence_name)
+        drop_sequence(sequence_name)
+      end
+    end
+
     ##
     # Vertica JDBC does not work with JDBC GET_GENERATED_KEYS
     # so we need to execute the sql raw and then lookup the 
     # LAST_INSERT_ID() that occurred in this "session"
     #
-    def exec_insert(sql, name, binds, *args)
+    def exec_insert(sql, name, binds, primary_key = nil, sequence_name = nil)
+      # Execute the SQL
       execute(sql, name, binds)
+    end
 
-      return select_value("SELECT LAST_INSERT_ID();")
+    def extract_table_ref_from_insert_sql(sql)
+      match_data = INSERT_TABLE_EXTRACTION.match(sql)
+      match_data[:table_name].strip if match_data[:table_name]
     end
 
     def native_database_types
       NATIVE_DATABASE_TYPES
     end 
 
+    def next_insert_id_for(sequence_name)
+      return select_value("SELECT NEXTVAL('#{sequence_name}');")
+    end
+
+    def next_sequence_value(sequence_name)
+      next_insert_id_for(sequence_name)
+    end
+
+    def prefetch_primary_key?(table_name = nil)
+      true
+    end
+
+    def primary_key_for(table_name)
+      primary_keys(table_name)
+    end
+
     ##
     # Vertica should "auto-discover" the primary key if marked on the table
     #
-    def primary_keys(table)
+    def primary_keys(table_name)
       @primary_keys ||= {}
-      return @primary_keys[table] if @primary_keys[table]
+      return @primary_keys[table_name] if @primary_keys[table_name]
 
-      keys = self.execute("SELECT column_name FROM v_catalog.primary_keys WHERE table_name = '#{table}';")
-      @primary_keys[table] = [ keys.first['column_name'] ]
-      @primary_keys[table]
+      keys = self.execute("SELECT column_name FROM v_catalog.primary_keys WHERE table_name = '#{table_name}';")
+      @primary_keys[table_name] = [ keys.first['column_name'] ]
+      @primary_keys[table_name]
     end
 
     ##
@@ -90,6 +149,19 @@ module ::ArJdbc
       # no op
     end
 
+    def sequence_exists?(sequence_name)
+      sql = <<-SQL
+        SELECT 1 from v_catalog.sequences WHERE sequence_name = '#{sequence_name}';
+      SQL
+
+      sequence_present = select_value(sql)
+      return sequence_present == 1
+    end
+
+    def sequence_name_for(table_name, primary_key_name = nil)
+      "#{table_name}_#{primary_key_name || 'id'}_seq"
+    end
+
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcvertica-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord