kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#112] Fix failing raw version for postgres

Browse Source
This commit is contained in:
Holger Just 2011-05-16 00:01:09 +02:00
parent d90102420d
commit 705c0db000
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/chili_project/database.rb
View File

@ -64,7 +64,7 @@ module ChiliProject
version = ActiveRecord::Base.connection.select_value('SELECT VERSION()') version = ActiveRecord::Base.connection.select_value('SELECT VERSION()')
when :postgresql when :postgresql
version = ActiveRecord::Base.connection.select_value('SELECT version()') version = ActiveRecord::Base.connection.select_value('SELECT version()')
version.match(/^PostgreSQL (\S+)/i)[1] unless raw raw ? version : version.match(/^PostgreSQL (\S+)/i)[1]
when :sqlite when :sqlite
if SQLite3.const_defined? 'SQLITE_VERSION' if SQLite3.const_defined? 'SQLITE_VERSION'
SQLite3::SQLITE_VERSION SQLite3::SQLITE_VERSION

11
test/unit/lib/chili_project/database_test.rb
View File

@ -36,4 +36,15 @@ class ChiliProject::DatabaseTest < ActiveSupport::TestCase
should "return a version string" do should "return a version string" do
assert_equal "3.6.12", ChiliProject::Database.version assert_equal "3.6.12", ChiliProject::Database.version
end end
should "return long version string for raw==true" do
ChiliProject::Database.stubs(:adapter_name).returns "PostgreSQL"
raw_version = "PostgreSQL 8.3.11 on x86_64-pc-linux-gnu, compiled by GCC gcc-4.3.real (Debian 4.3.2-1.1) 4.3.2"
ActiveRecord::Base.connection.stubs(:select_value).returns raw_version
assert_equal "8.3.11", ChiliProject::Database.version
assert_equal raw_version, ChiliProject::Database.version(true)
end
end end