Commit c92002c

committed

Added: database_type to configuration

1 parent 9babda8 commit c92002cCopy full SHA for c92002c

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`module ClosureTree`
`2`	`2`	`class Configuration # :nodoc:`
`3`	`3`	`attr_accessor :database_less`
	`4`	`+ attr_accessor :database_type`
`4`	`5`
`5`	`6`	`def initialize`
`6`	`7`	`@database_less = ENV['DATABASE_URL'].to_s.include?('//user:pass@127.0.0.1/')`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,17 @@ def self.adapter_for_connection(connection)`
`12`	`12`	`end`
`13`	`13`	`end`
`14`	`14`
	`15`	`+ def self.adapter_for_database_type(database_type)`
	`16`	`+ case database_type`
	`17`	`+ when :postgresql`
	`18`	`+ ::ClosureTree::NumericOrderSupport::PostgreSQLAdapter`
	`19`	`+ when :mysql`
	`20`	`+ ::ClosureTree::NumericOrderSupport::MysqlAdapter`
	`21`	`+ else`
	`22`	`+ ::ClosureTree::NumericOrderSupport::GenericAdapter`
	`23`	`+ end`
	`24`	`+ end`
	`25`	`+`
`15`	`26`	`module MysqlAdapter`
`16`	`27`	`def reorder_with_parent_id(parent_id, minimum_sort_order_value = nil)`
`17`	`28`	`return if parent_id.nil? && dont_order_roots`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,11 @@ def initialize(model_class, options)`
`27`	`27`	`}.merge(options)`
`28`	`28`	`raise ArgumentError, "name_column can't be 'path'" if options[:name_column] == 'path'`
`29`	`29`	`if order_is_numeric?`
`30`		`- extend NumericOrderSupport.adapter_for_connection(connection)`
	`30`	`+ if ClosureTree.configuration.database_type`
	`31`	`+ extend NumericOrderSupport.adapter_for_database_type(ClosureTree.configuration.database_type)`
	`32`	`+ else`
	`33`	`+ extend NumericOrderSupport.adapter_for_connection(connection)`
	`34`	`+ end`
`31`	`35`	`end`
`32`	`36`	`end`
`33`	`37`

Comments

(0)