rails_sql_views 0.6.1 → 0.8.0

data/lib/rails_sql_views/connection_adapters/oci_adapter.rb

@@ -1,16 +1,17 @@
-module ActiveRecord
+module RailsSqlViews
  module ConnectionAdapters
-   class OciAdapter
+   module OciAdapter
      # Returns true as this adapter supports views.
      def supports_views?
        true
      end
 
-     def tables(name = nil) #:nodoc:
+     def base_tables(name = nil) #:nodoc:
        tables = []
        execute("SELECT TABLE_NAME FROM USER_TABLES", name).each { |row| tables << row[0]  }
        tables
      end
+     alias nonview_tables base_tables
 
      def views(name = nil) #:nodoc:
        views = []
@@ -29,4 +30,4 @@ module ActiveRecord
 
    end
  end
-end
+end

data/lib/rails_sql_views/connection_adapters/oracle_adapter.rb

@@ -1,16 +1,17 @@
-module ActiveRecord
+module RailsSqlViews
  module ConnectionAdapters
-   class OracleAdapter
+   module OracleAdapter
      # Returns true as this adapter supports views.
      def supports_views?
        true
      end
 
-     def tables(name = nil) #:nodoc:
+     def base_tables(name = nil) #:nodoc:
        tables = []
        execute("SELECT TABLE_NAME FROM USER_TABLES", name).each { |row| tables << row[0]  }
        tables
      end
+     alias nonview_tables base_tables
 
      def views(name = nil) #:nodoc:
        views = []
@@ -29,4 +30,4 @@ module ActiveRecord
 
    end
  end
-end
+end

data/lib/rails_sql_views/connection_adapters/oracleenhanced_adapter.rb

@@ -0,0 +1,39 @@
+module RailsSqlViews
+  module ConnectionAdapters
+    module OracleEnhancedAdapter
+      # Returns true as this adapter supports views.
+      def supports_views?
+        true
+      end
+      
+      def base_tables(name = nil) #:nodoc:
+        tables = []
+        cursor = execute("SELECT TABLE_NAME FROM USER_TABLES", name)
+        while row = cursor.fetch
+          tables << row[0]
+        end
+        tables
+      end
+      alias nonview_tables base_tables
+      
+      def views(name = nil) #:nodoc:
+        views = []
+        cursor = execute("SELECT VIEW_NAME FROM USER_VIEWS", name)
+        while row = cursor.fetch
+          views << row[0]
+        end
+        views
+      end
+      
+      # Get the view select statement for the specified table.
+      def view_select_statement(view, name=nil)
+        cursor = execute("SELECT TEXT FROM USER_VIEWS WHERE VIEW_NAME = '#{view}'", name)
+        if row = cursor.fetch
+          return row[0]
+        else
+          raise "No view called #{view} found"
+        end
+      end
+    end
+  end
+end

data/lib/rails_sql_views/connection_adapters/oracleenhanced_adapter.rb.orig

@@ -0,0 +1,72 @@
+module RailsSqlViews
+  module ConnectionAdapters
+    module OracleEnhancedAdapter
+<<<<<<< HEAD
+      def self.included(base)
+        base.alias_method_chain :tables, :views_included
+      end
+=======
+>>>>>>> Add support for oracle_enhanced adapter. Don't alias tables in PostgreSQL adapter if it's already been aliased.
+      # Returns true as this adapter supports views.
+      def supports_views?
+        true
+      end
+      
+<<<<<<< HEAD
+      def tables_with_views_included(name = nil)
+        tables = []
+        sql = " SELECT TABLE_NAME FROM USER_TABLES
+                UNION
+                SELECT VIEW_NAME AS TABLE_NAME FROM USER_VIEWS"
+        cursor = execute(sql, name)
+        while row = cursor.fetch
+          tables << row[0].downcase
+        end
+        tables
+      end
+      
+=======
+>>>>>>> Add support for oracle_enhanced adapter. Don't alias tables in PostgreSQL adapter if it's already been aliased.
+      def base_tables(name = nil) #:nodoc:
+        tables = []
+        cursor = execute("SELECT TABLE_NAME FROM USER_TABLES", name)
+        while row = cursor.fetch
+<<<<<<< HEAD
+          tables << row[0].downcase
+=======
+          tables << row[0]
+>>>>>>> Add support for oracle_enhanced adapter. Don't alias tables in PostgreSQL adapter if it's already been aliased.
+        end
+        tables
+      end
+      alias nonview_tables base_tables
+      
+      def views(name = nil) #:nodoc:
+        views = []
+        cursor = execute("SELECT VIEW_NAME FROM USER_VIEWS", name)
+        while row = cursor.fetch
+<<<<<<< HEAD
+          views << row[0].downcase
+=======
+          views << row[0]
+>>>>>>> Add support for oracle_enhanced adapter. Don't alias tables in PostgreSQL adapter if it's already been aliased.
+        end
+        views
+      end
+      
+      # Get the view select statement for the specified table.
+      def view_select_statement(view, name=nil)
+<<<<<<< HEAD
+        view.upcase!
+=======
+>>>>>>> Add support for oracle_enhanced adapter. Don't alias tables in PostgreSQL adapter if it's already been aliased.
+        cursor = execute("SELECT TEXT FROM USER_VIEWS WHERE VIEW_NAME = '#{view}'", name)
+        if row = cursor.fetch
+          return row[0]
+        else
+          raise "No view called #{view} found"
+        end
+      end
+    end
+  end
+end

data/lib/rails_sql_views/connection_adapters/postgresql_adapter.rb

@@ -1,11 +1,37 @@
-module ActiveRecord
+module RailsSqlViews
   module ConnectionAdapters
-    class PostgreSQLAdapter
+    module PostgreSQLAdapter
+      def self.included(base)
+        base.alias_method_chain :tables, :views_included
+      end
       # Returns true as this adapter supports views.
       def supports_views?
         true
       end
       
+      def tables_with_views_included(name = nil)
+        q = <<-SQL
+        SELECT table_name, table_type
+          FROM information_schema.tables
+         WHERE table_schema IN (#{schemas})
+           AND table_type IN ('BASE TABLE', 'VIEW')
+        SQL
+
+        query(q, name).map { |row| row[0] }
+      end
+      
+      def base_tables(name = nil)
+        q = <<-SQL
+        SELECT table_name, table_type
+          FROM information_schema.tables
+         WHERE table_schema IN (#{schemas})
+           AND table_type = 'BASE TABLE'
+        SQL
+        
+        query(q, name).map { |row| row[0] }
+      end
+      alias nonview_tables base_tables
+      
       def views(name = nil) #:nodoc:
         q = <<-SQL
         SELECT table_name, table_type

data/lib/rails_sql_views/connection_adapters/postgresql_adapter.rb.orig

@@ -0,0 +1,69 @@
+module RailsSqlViews
+  module ConnectionAdapters
+    module PostgreSQLAdapter
+      def self.included(base)
+<<<<<<< HEAD
+        base.alias_method_chain :tables, :views_included unless method_defined?(:tables_with_views_included)
+=======
+        base.alias_method_chain :tables, :views_included
+>>>>>>> Make tests pass again for PostgreSQL and MySQL adapters.
+      end
+      # Returns true as this adapter supports views.
+      def supports_views?
+        true
+      end
+      
+      def tables_with_views_included(name = nil)
+        q = <<-SQL
+        SELECT table_name, table_type
+          FROM information_schema.tables
+         WHERE table_schema IN (#{schemas})
+           AND table_type IN ('BASE TABLE', 'VIEW')
+        SQL
+
+        query(q, name).map { |row| row[0] }
+      end
+      
+      def base_tables(name = nil)
+        q = <<-SQL
+        SELECT table_name, table_type
+          FROM information_schema.tables
+         WHERE table_schema IN (#{schemas})
+           AND table_type = 'BASE TABLE'
+        SQL
+        
+        query(q, name).map { |row| row[0] }
+      end
+      alias nonview_tables base_tables
+      
+      def views(name = nil) #:nodoc:
+        q = <<-SQL
+        SELECT table_name, table_type
+          FROM information_schema.tables
+         WHERE table_schema IN (#{schemas})
+           AND table_type = 'VIEW'
+        SQL
+        
+        query(q, name).map { |row| row[0] }
+      end
+
+      def view_select_statement(view, name = nil)
+        q = <<-SQL
+        SELECT view_definition
+          FROM information_schema.views 
+         WHERE table_catalog = (SELECT catalog_name FROM information_schema.information_schema_catalog_name)
+           AND table_schema IN (#{schemas})
+           AND table_name = '#{view}'
+        SQL
+        
+        select_value(q, name) or raise "No view called #{view} found"
+      end
+
+      private
+        
+      def schemas
+        schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
+      end
+    end
+  end
+end

data/lib/rails_sql_views/connection_adapters/sqlite_adapter.rb

@@ -0,0 +1,66 @@
+module RailsSqlViews
+  module ConnectionAdapters
+    module SQLiteAdapter
+      def supports_views?
+        true
+      end
+
+      def supports_drop_table_cascade?
+        return false 
+      end
+      
+      def tables(name = nil) #:nodoc:
+        sql = <<-SQL
+          SELECT name
+          FROM sqlite_master
+          WHERE (type = 'table' OR type = 'view') AND NOT name = 'sqlite_sequence'
+        SQL
+
+        execute(sql, name).map do |row|
+          row[0]
+        end
+      end
+
+      def base_tables(name = nil)
+        sql = <<-SQL
+          SELECT name
+          FROM sqlite_master
+          WHERE (type = 'table') AND NOT name = 'sqlite_sequence'
+        SQL
+
+        execute(sql, name).map do |row|
+          row[0]
+        end        
+      end
+      alias nonview_tables base_tables
+      
+      def views(name = nil)
+        sql = <<-SQL
+          SELECT name
+          FROM sqlite_master
+          WHERE type = 'view' AND NOT name = 'sqlite_sequence'
+        SQL
+
+        execute(sql, name).map do |row|
+          row[0]
+        end
+      end
+      
+      # Get the view select statement for the specified table.
+      def view_select_statement(view, name = nil)
+        sql = <<-SQL
+          SELECT sql
+          FROM sqlite_master
+          WHERE name = '#{view}' AND NOT name = 'sqlite_sequence'
+        SQL
+        
+        (select_value(sql, name).gsub("CREATE VIEW #{view} AS ", "")) or raise "No view called #{view} found"
+      end
+      
+      def supports_view_columns_definition?
+        false
+      end
+      
+    end
+  end
+end

data/lib/rails_sql_views/connection_adapters/sqlserver_adapter.rb

@@ -1,11 +1,18 @@
-module ActiveRecord
+module RailsSqlViews
   module ConnectionAdapters
-    class SQLServerAdapter
+    module SQLServerAdapter
       # Returns true as this adapter supports views.
       def supports_views?
         true
       end
       
+      # Get all of the non-view tables from the currently connected schema
+      def base_tables(name = nil)
+        # this is untested
+        select_values("SELECT table_name FROM information_schema.tables", name)
+      end
+      alias nonview_tables base_tables
+      
       # Returns all the view names from the currently connected schema.
       def views(name = nil)
         select_values("SELECT table_name FROM information_schema.views", name)
@@ -29,8 +36,8 @@ module ActiveRecord
       
       private
       def convert_statement(s)
-        s.sub(/^CREATE.* AS (select .*)/, '\1').gsub(/\n/, '')
+        s.sub(/^CREATE.* AS (select .*)/i, '\1').gsub(/\n/, '')
       end
     end
   end
-end
+end

data/lib/rails_sql_views/loader.rb

@@ -0,0 +1,18 @@
+
+module RailsSqlViews
+  module Loader
+    SUPPORTED_ADAPTERS = %w( Mysql PostgreSQL SQLServer SQLite OracleEnhanced )
+
+    def self.load_extensions
+      SUPPORTED_ADAPTERS.each do |db|
+        if ActiveRecord::ConnectionAdapters.const_defined?("#{db}Adapter")
+          require "rails_sql_views/connection_adapters/#{db.downcase}_adapter"
+          ActiveRecord::ConnectionAdapters.const_get("#{db}Adapter").class_eval do
+            include RailsSqlViews::ConnectionAdapters::AbstractAdapter
+            include RailsSqlViews::ConnectionAdapters.const_get("#{db}Adapter")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_sql_views/schema_dumper.rb

@@ -1,16 +1,26 @@
-module ActiveRecord
-  class SchemaDumper
-    
-    # A list of views which should not be dumped to the schema. 
-    # Acceptable values are strings as well as regexp.
-    # This setting is only used if ActiveRecord::Base.schema_format == :ruby
-    cattr_accessor :ignore_views 
-    @@ignore_views = []
+module RailsSqlViews
+  module SchemaDumper
+    def self.included(base)
+      base.alias_method_chain :trailer, :views
+      base.alias_method_chain :dump, :views
+      base.alias_method_chain :tables, :views_excluded
+      
+      # A list of views which should not be dumped to the schema. 
+      # Acceptable values are strings as well as regexp.
+      # This setting is only used if ActiveRecord::Base.schema_format == :ruby
+      base.cattr_accessor :ignore_views
+      base.ignore_views = []
+      # Optional: specify the order that in which views are created.
+      # This allows views to depend on and include fields from other views.
+      # It is not necessary to specify all the view names, just the ones that 
+      # need to be created first
+      base.cattr_accessor :view_creation_order
+      base.view_creation_order = []
+    end
     
     def trailer_with_views(stream)
       # do nothing...we'll call this later
     end
-    alias_method_chain :trailer, :views
     
     # Add views to the end of the dump stream
     def dump_with_views(stream)
@@ -20,20 +30,32 @@ module ActiveRecord
           views(stream)
         end
       rescue => e
-        ActiveRecord::Base.logger.error "Unable to dump views: #{e}"
+        if ActiveRecord::Base.logger
+          ActiveRecord::Base.logger.error "Unable to dump views: #{e}"
+        else
+          raise e
+        end
       end
       trailer_without_views(stream)
       stream
     end
-    alias_method_chain :dump, :views
     
     # Add views to the stream
     def views(stream)
-      @connection.views.sort.each do |v|
-        next if ["schema_info", ignore_views].flatten.any? do |ignored|
+      if view_creation_order.empty?
+        sorted_views = @connection.views.sort
+      else
+        # set union, merge by joining arrays, removing dups
+        # this will float the view name sin view_creation_order to the top
+        # without requiring all the views to be specified
+        sorted_views = view_creation_order | @connection.views
+      end
+      sorted_views.each do |v|
+        next if [ActiveRecord::Migrator.schema_migrations_table_name, ignore_views].flatten.any? do |ignored|
           case ignored
-          when String: v == ignored
-          when Regexp: v =~ ignored
+          when String then v == ignored
+          when Symbol then v == ignored.to_s
+          when Regexp then v =~ ignored
           else
             raise StandardError, 'ActiveRecord::SchemaDumper.ignore_views accepts an array of String and / or Regexp values.'
           end
@@ -71,5 +93,20 @@ module ActiveRecord
       
       stream
     end
+
+    def tables_with_views_excluded(stream)
+      @connection.base_tables.sort.each do |tbl|
+        next if [ActiveRecord::Migrator.schema_migrations_table_name, ignore_tables].flatten.any? do |ignored|
+          case ignored
+          when String then tbl == ignored
+          when Regexp then tbl =~ ignored
+          else
+            raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.'
+          end
+        end
+        table(tbl, stream)
+      end
+    end
+
   end
-end
+end