Title: [1004] trunk/activerecord-jdbc: 20479: Improve get_table_name for MSSQL (
Aslak Helles?\195?\184y)
- Revision
- 1004
- Author
- nicksieger
- Date
- 2008-06-03 23:16:31 -0400 (Tue, 03 Jun 2008)
Log Message
20479: Improve get_table_name for MSSQL (Aslak Helles?\195?\184y)
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/History.txt (1003 => 1004)
--- trunk/activerecord-jdbc/History.txt 2008-06-04 03:16:26 UTC (rev 1003)
+++ trunk/activerecord-jdbc/History.txt 2008-06-04 03:16:31 UTC (rev 1004)
@@ -3,14 +3,14 @@
- Now sporting a JDBC sqlite3 adapter! Thanks Joseph Athman.
- Added support for InterSystems Cache database (Ryan Bell)
- Fix for JRUBY-2256
-- JRUBY-1638, JRUBY-2404, JRUBY-2463: schema.table handling and Oracle NUMBER fixes (Thanks Darcy Schultz & Jesse Hu)
+- JRUBY-1638, JRUBY-2404, JRUBY-2463: schema.table handling and Oracle NUMBER fixes (Darcy Schultz & Jesse Hu)
- Add structure dump and other DDL-ish for DB2 (courtesy abedra and stuarthalloway)
- Fix missing quote_table_name function under Rails 1.2.6 and earlier
- Small tweaks to jdbc.rake to select proper config
- JRUBY-2011: Fix MSSQL string un-quoting issue (Silvio Fonseca)
- JRUBY-1977, 17427: Fix information_schema select issue with MSSQL (Matt Burke)
+- 20479: Improve get_table_name for MSSQL (Aslak Hellesøy)
-
== 0.8
- NOTE: This release is only compatible with JRuby 1.1RC3 or later.
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb (1003 => 1004)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb 2008-06-04 03:16:26 UTC (rev 1003)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb 2008-06-04 03:16:31 UTC (rev 1004)
@@ -262,9 +262,9 @@
end
def get_table_name(sql)
- if sql =~ /^\s*insert\s+into\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
+ if sql =~ /^\s*insert\s+into\s+([^\(\s,]+)\s*|^\s*update\s+([^\(\s,]+)\s*/i
$1
- elsif sql =~ /from\s+([^\(\s]+)\s*/i
+ elsif sql =~ /from\s+([^\(\s,]+)\s*/i
$1
else
nil
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/version.rb (1003 => 1004)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/version.rb 2008-06-04 03:16:26 UTC (rev 1003)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/version.rb 2008-06-04 03:16:31 UTC (rev 1004)
@@ -1,5 +1,5 @@
module JdbcAdapter
module Version
- VERSION = "0.8"
+ VERSION = "0.8.1"
end
end
\ No newline at end of file
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
