Ticket #1751: named_sequences_for_oracle.diff

test/fixtures/db_definitions/oci.sql

@@ -216 +216 @@
-  id integer not null primary key,
-  fk_id integer not null references fk_test_has_fk initially deferred disable
-);
+
+create table widgets (
+  widget_id integer not null primary_key,
+  widget_name varchar(255) no null,
+);
+create sequence widget_sq minvalue 10;

lib/active_record/connection_adapters/sqlite_adapter.rb

@@ -119 +119 @@
-        @connection.changes
-      end
-
-
+, sequence_name = nil
-        execute(sql, name = nil)
-        id_value || @connection.last_insert_row_id
-      end

lib/active_record/connection_adapters/abstract_adapter.rb

@@ -279 +279 @@
-      def columns(table_name, name = nil) end
-
-      # Returns the last auto-generated ID from the affected table.
-
+, sequence_name = nil
-
-      # Executes the update statement and returns the number of rows affected.
-      def update(sql, name = nil) end

lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -95 +95 @@
-        end
-      end
-
-
+, sequence_name = nil
-        execute(sql, name)
-        table = sql.split(" ", 4)[2]
-        return id_value || last_insert_id(table, pk)

lib/active_record/connection_adapters/mysql_adapter.rb

@@ -109 +109 @@
-        columns
-      end
-
-
+, sequence_name = nil
-        execute(sql, name = nil)
-        id_value || @connection.insert_id
-      end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -204 +204 @@
-        columns
-      end
-
-
+, sequence_name = nil
-        begin
-          table_name = get_table_name(sql)
-          col = get_identity_column(table_name)

lib/active_record/connection_adapters/db2_adapter.rb

@@ -44 +44 @@
-          select(sql, name).first
-        end
-
-
+, sequence_name = nil
-          execute(sql, name = nil)
-          id_value || last_insert_id
-        end

lib/active_record/connection_adapters/oci_adapter.rb

@@ -163 +163 @@
-          cols
-        end
-
-
+, sequence_name = nil
-          if pk.nil? # Who called us? What does the sql look like? No idea!
-            execute sql, name
-          elsif id_value # Pre-assigned id
-            log(sql, name) { @connection.exec sql }
+                  elsif sequence_name
+                    id_value = select_one("select #{sequence_name}.nextval id from dual")['id']
+                        log(sql,name) { @connection.exec sql, id_value }
-          else # Assume the sql contains a bind-variable for the id
-            id_value = select_one("select rails_sequence.nextval id from dual")['id']
-            log(sql, name) { @connection.exec sql, id_value }

lib/active_record/base.rb

@@ -548 +548 @@
-        "#{table_name_prefix}#{undecorated_table_name(class_name_of_active_record_descendant(self))}#{table_name_suffix}"
-      end
-
+          # sequence name placeholder
+          def sequence_name
+            nil
+          end
+
-      # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
-      # primary_key_prefix_type setting, though.
-      def primary_key
@@ -609 +614 @@
-      end
-      alias :inheritance_column= :set_inheritance_column
-
+          # Sets the name of the sequence to be used for this class
+          # no effect if not set, will treat as an auto-increment table 
+          # or use 'rails_sequence' (for oci)
+
+          def set_sequence_name( value=nil, &block )
+            define_attr_method :sequence_name, value, &block
+          end
+          alias :sequence_name= :set_sequence_name
+
-      # Turns the +table_name+ back into a class name following the reverse rules of +table_name+.
-      def class_name(table_name = table_name) # :nodoc:
-        # remove any prefix and/or suffix from the table name
@@ -1157 +1171 @@
-          "(#{quoted_column_names.join(', ')}) " +
-          "VALUES(#{attributes_with_quotes.values.join(', ')})",
-          "#{self.class.name} Create",
-
+, self.class.sequence_name
-        )
-
-        @new_record = false