rails_sql_views 0.3.0 → 0.4.0

data/lib/rails_sql_views/connection_adapters/abstract/schema_statements.rb

@@ -7,20 +7,22 @@ module RailsSqlViews
       #   Specify restrictions for inserts or updates in updatable views. ANSI SQL 92 defines two check option
       #   values: CASCADED and LOCAL. See your database documentation for allowed values.
       def create_view(name, select_query, options={})
-        view_definition = ViewDefinition.new(self, select_query)
+        if supports_views?
+          view_definition = ViewDefinition.new(self, select_query)
 
-        yield view_definition
+          yield view_definition
 
-        if options[:force]
-          drop_view(name) rescue nil
-        end
+          if options[:force]
+            drop_view(name) rescue nil
+          end
 
-        create_sql = "CREATE VIEW "
-        create_sql << "#{name} ("
-        create_sql << view_definition.to_sql
-        create_sql << ") AS #{view_definition.select_query}"
-        create_sql << " WITH #{options[:check_option]} CHECK OPTION" if options[:check_option]
-        execute create_sql
+          create_sql = "CREATE VIEW "
+          create_sql << "#{name} ("
+          create_sql << view_definition.to_sql
+          create_sql << ") AS #{view_definition.select_query}"
+          create_sql << " WITH #{options[:check_option]} CHECK OPTION" if options[:check_option]
+          execute create_sql
+        end
       end
       
       # Drop a view.
@@ -29,9 +31,11 @@ module RailsSqlViews
       #   Specify the drop behavior. ANSI SQL 92 defines two drop behaviors, CASCADE and RESTRICT. See your
       #   database documentation to determine what drop behaviors are available.
       def drop_view(name, options={})
-        drop_sql = "DROP VIEW #{name}"
-        drop_sql << " #{options[:drop_behavior]}" if options[:drop_behavior]
-        execute drop_sql
+        if supports_views?
+          drop_sql = "DROP VIEW #{name}"
+          drop_sql << " #{options[:drop_behavior]}" if options[:drop_behavior]
+          execute drop_sql
+        end
       end
     end
   end

data/lib/rails_sql_views/connection_adapters/mysql_adapter.rb

@@ -8,15 +8,28 @@ module ActiveRecord
       
       def tables(name = nil) #:nodoc:
         tables = []
-        execute("SHOW TABLE STATUS", name).each { |field| tables << field[0] if field[17] != 'VIEW' }
+        execute("SHOW TABLE STATUS", name).each { |row| tables << row[0] if row[17] != 'VIEW' }
         tables
       end
       
       def views(name = nil) #:nodoc:
         views = []
-        execute("SHOW TABLE STATUS", name).each { |field| views << field[0] if field[17] == 'VIEW' }
+        execute("SHOW TABLE STATUS", name).each { |row| views << row[0] if row[17] == 'VIEW' }
         views
       end
+      
+      # Get the view select statement for the specified table.
+      def view_select_statement(view, name=nil)
+        row = execute("SHOW CREATE VIEW #{view}", name).each do |row|
+          return convert_statement(row[1]) if row[0] == view
+        end
+        raise "No view called #{view} found"
+      end
+      
+      private
+      def convert_statement(s)
+        s.gsub!(/.* AS (select .*)/, '\1')
+      end
     end
   end
 end

data/lib/rails_sql_views/schema_dumper.rb

@@ -15,7 +15,9 @@ module ActiveRecord
     # Add views to the end of the dump stream
     def dump_with_views(stream)
       dump_without_views(stream)
-      views(stream)
+      if @connection.supports_views?
+        views(stream)
+      end
       trailer_without_views(stream)
       stream
     end
@@ -43,6 +45,7 @@ module ActiveRecord
         v = StringIO.new
 
         v.print "  create_view #{view.inspect}"
+        v.print ", \"#{@connection.view_select_statement(view)}\""
         v.print ", :force => true"
         v.puts " do |v|"
 

data/lib/rails_sql_views/version.rb

@@ -1,7 +1,7 @@
 module RailsSqlViews
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rails_sql_views
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 date: 2006-12-28 00:00:00 -05:00
 summary: Adds SQL Views to Rails.
 require_paths: