Changeset 2317

Timestamp:

09/23/05 17:27:59 (3 years ago)

Author:

minam

Message:

Allow the postgresql adapter to work with the SchemaDumper.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb (modified) (3 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow the postgresql adapter to work with the SchemaDumper.
-
-* Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases.

trunk/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -90 +90 @@
-      end
-
+      # Return the list of all tables in the schema search path.
+      def tables(name = nil)
+        schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
+        query(<<-SQL, name).map { |row| row[0] }
+          SELECT tablename
+            FROM pg_tables
+           WHERE schemaname IN (#{schemas})
+        SQL
+      end
+
+      def indexes(table_name, name = nil)
+        result = query(<<-SQL, name)
+          SELECT i.relname, d.indisunique, a.attname
+            FROM pg_class t, pg_class i, pg_index d, pg_attribute a
+           WHERE i.relkind = 'i'
+             AND d.indexrelid = i.oid
+             AND d.indisprimary = 'f'
+             AND t.oid = d.indrelid
+             AND t.relname = '#{table_name}'
+             AND a.attrelid = t.oid
+             AND ( d.indkey[0]=a.attnum OR d.indkey[1]=a.attnum
+                OR d.indkey[2]=a.attnum OR d.indkey[3]=a.attnum
+                OR d.indkey[4]=a.attnum OR d.indkey[5]=a.attnum
+                OR d.indkey[6]=a.attnum OR d.indkey[7]=a.attnum
+                OR d.indkey[8]=a.attnum OR d.indkey[9]=a.attnum )
+          ORDER BY i.relname
+        SQL
+
+        current_index = nil
+        indexes = []
+
+        result.each do |row|
+          if current_index != row[0]
+            indexes << IndexDefinition.new(table_name, row[0], row[1] == "t", [])
+            current_index = row[0]
+          end
+
+          indexes.last.columns << row[2]
+        end
+
+        indexes
+      end
+
-      def columns(table_name, name = nil)
-
-
+
+
+
-        end
-      end
@@ -214 +258 @@
-          s.gsub(/\\([0-9][0-9][0-9])/) { $1.oct.chr }.gsub(/\\\\/) { '\\' } unless s.nil?
-        end
-
+
-        # Query a table's column names, default values, and types.
-        #
@@ -235 +279 @@
-        def column_definitions(table_name)
-          query <<-end_sql
-
+, a.attnotnull
-              FROM pg_attribute a LEFT JOIN pg_attrdef d
-                ON a.attrelid = d.adrelid AND a.attnum = d.adnum