diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sybase_adapter.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 2e523029f5..0a74c34cd2 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Sybase: hide timestamp columns since they're inherently read-only. #7716 [Mike Joyce] + * Oracle: overflow Time to DateTime. #7718 [Michael Schoen] * PostgreSQL: don't use async_exec and async_query with postgres-pr. #7727 [flowdelic] diff --git a/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb b/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb index 45b5d0bc96..c43e9435b4 100644 --- a/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb @@ -242,8 +242,8 @@ module ActiveRecord SELECT col.name AS name, type.name AS type, col.prec, col.scale, col.length, col.status, obj.sysstat2, def.text FROM sysobjects obj, syscolumns col, systypes type, syscomments def - WHERE obj.id = col.id AND col.usertype = type.usertype AND col.cdefault *= def.id - AND obj.type = 'U' AND obj.name = '#{table_name}' ORDER BY col.colid + WHERE obj.id = col.id AND col.usertype = type.usertype AND type.name != 'timestamp' + AND col.cdefault *= def.id AND obj.type = 'U' AND obj.name = '#{table_name}' ORDER BY col.colid SQLTEXT @logger.debug "Get Column Info for table '#{table_name}'" if @logger @connection.set_rowcount(0) |