kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed broken OCIAdapter (closes #4457) [schoenm@earthlink.net]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4100 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2006-03-30 03:38:15 +00:00
parent 2cc9b21c07
commit 0703149e71
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
activerecord/CHANGELOG
View file

@ -1,3 +1,8 @@
*SVN*
* Fixed broken OCIAdapter #4457 [schoenm@earthlink.net]
*1.14.0* (March 27th, 2005) *1.14.0* (March 27th, 2005)
* Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar] * Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]

12
activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
View file

@ -44,15 +44,11 @@ begin
# Enable the id column to be bound into the sql later, by the adapter's insert method. # Enable the id column to be bound into the sql later, by the adapter's insert method.
# This is preferable to inserting the hard-coded value here, because the insert method # This is preferable to inserting the hard-coded value here, because the insert method
# needs to know the id value explicitly. # needs to know the id value explicitly.
def attributes_with_quotes_pre_oracle #:nodoc: alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
attributes_with_quotes def attributes_with_quotes(include_primary_key = true) #:nodoc:
end aq = attributes_with_quotes_pre_oracle(include_primary_key)
def attributes_with_quotes(creating = true) #:nodoc:
aq = attributes_with_quotes_pre_oracle creating
if connection.class == ConnectionAdapters::OracleAdapter if connection.class == ConnectionAdapters::OracleAdapter
aq[self.class.primary_key] = ":id" if creating && aq[self.class.primary_key].nil? aq[self.class.primary_key] = ":id" if include_primary_key && aq[self.class.primary_key].nil?
end end
aq aq
end end

6
railties/CHANGELOG
View file

@ -1,11 +1,11 @@
*SVN* *SVN*
* Avoid passing escapeHTML non-string in Rails' info controller. [Nicholas Seckar] * Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf [DHH]
* Fix Rails info controller's tests. [Nicholas Seckar]
* Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf [DHH] * Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf [DHH]
* Avoid passing escapeHTML non-string in Rails' info controller [Nicholas Seckar]
*1.1.0* (March 27th, 2005) *1.1.0* (March 27th, 2005)

7
railties/configs/lighttpd.conf
View file

@ -3,7 +3,7 @@
server.port = 3000 server.port = 3000
server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress" ) server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire" )
server.error-handler-404 = "/dispatch.fcgi" server.error-handler-404 = "/dispatch.fcgi"
server.document-root = CWD + "/public/" server.document-root = CWD + "/public/"
@ -11,7 +11,12 @@ server.errorlog = CWD + "/log/lighttpd.error.log"
accesslog.filename = CWD + "/log/lighttpd.access.log" accesslog.filename = CWD + "/log/lighttpd.access.log"
url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" ) url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
compress.filetype = ( "text/plain", "text/html", "text/css", "text/javascript" ) compress.filetype = ( "text/plain", "text/html", "text/css", "text/javascript" )
compress.cache-dir = CWD + "/tmp/cache"
expire.url = ( "/favicon.ico" => "access 3 days", "/images/" => "access 3 days", "/stylesheets/" => "access 3 days", "/javascripts/" => "access 3 days" )
# Change *-procs to 2 if you need to use Upload Progress or other tasks that # Change *-procs to 2 if you need to use Upload Progress or other tasks that
# *need* to execute a second request while the first is still pending. # *need* to execute a second request while the first is still pending.