Permalink
Browse files

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

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4100 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2cc9b21 commit 0703149e713c112f8568d396e7bc6e9be21c31d2 @dhh dhh committed Mar 30, 2006
View
@@ -1,3 +1,8 @@
+*SVN*
+
+* Fixed broken OCIAdapter #4457 [schoenm@earthlink.net]
+
+
*1.14.0* (March 27th, 2005)
* Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]
@@ -44,15 +44,11 @@ def self.oci_connection(config) #:nodoc:
# 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
# needs to know the id value explicitly.
- def attributes_with_quotes_pre_oracle #:nodoc:
- attributes_with_quotes
- end
-
-
- def attributes_with_quotes(creating = true) #:nodoc:
- aq = attributes_with_quotes_pre_oracle creating
+ alias :attributes_with_quotes_pre_oracle :attributes_with_quotes
+ def attributes_with_quotes(include_primary_key = true) #:nodoc:
+ aq = attributes_with_quotes_pre_oracle(include_primary_key)
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
aq
end
View
@@ -1,11 +1,11 @@
*SVN*
-* Avoid passing escapeHTML non-string in Rails' info controller. [Nicholas Seckar]
-
-* Fix Rails info controller's tests. [Nicholas Seckar]
+* Added expiration settings for JavaScript, CSS, HTML, and images 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)
@@ -3,15 +3,20 @@
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.document-root = CWD + "/public/"
server.errorlog = CWD + "/log/lighttpd.error.log"
accesslog.filename = CWD + "/log/lighttpd.access.log"
url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
+
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
# *need* to execute a second request while the first is still pending.

0 comments on commit 0703149

Please sign in to comment.