Project

General

Profile

« Previous | Next » 

Revision 1195

Trac importer: support database schema for Trac migration (#757 by John Goerzen).

View differences:

trunk/lib/tasks/migrate_from_trac.rake
513 513
        @@trac_db_password = password
514 514
      end
515 515
      
516
      mattr_reader :trac_directory, :trac_adapter, :trac_db_host, :trac_db_port, :trac_db_name, :trac_db_username, :trac_db_password
516
      def self.set_trac_db_schema(schema)
517
        @@trac_db_schema = schema
518
      end
519

  
520
      mattr_reader :trac_directory, :trac_adapter, :trac_db_host, :trac_db_port, :trac_db_name, :trac_db_schema, :trac_db_username, :trac_db_password
517 521
      
518 522
      def self.trac_db_path; "#{trac_directory}/db/trac.db" end
519 523
      def self.trac_attachments_directory; "#{trac_directory}/attachments" end
......
544 548
           :host => trac_db_host,
545 549
           :port => trac_db_port,
546 550
           :username => trac_db_username,
547
           :password => trac_db_password}
551
           :password => trac_db_password,
552
           :schema_search_path => trac_db_schema
553
          }
548 554
        end
549 555
      end
550 556
      
......
580 586
      end
581 587
    end
582 588
    
583
    DEFAULT_PORTS = {'mysql' => 3306, 'postgresl' => 5432}
589
    DEFAULT_PORTS = {'mysql' => 3306, 'postgresql' => 5432}
584 590
    
585 591
    prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory.strip}
586 592
    prompt('Trac database adapter (sqlite, sqlite3, mysql, postgresql)', :default => 'sqlite') {|adapter| TracMigrate.set_trac_adapter adapter}
......
588 594
      prompt('Trac database host', :default => 'localhost') {|host| TracMigrate.set_trac_db_host host}
589 595
      prompt('Trac database port', :default => DEFAULT_PORTS[TracMigrate.trac_adapter]) {|port| TracMigrate.set_trac_db_port port}
590 596
      prompt('Trac database name') {|name| TracMigrate.set_trac_db_name name}
597
      prompt('Trac database schema', :default => 'public') {|schema| TracMigrate.set_trac_db_schema schema}
591 598
      prompt('Trac database username') {|username| TracMigrate.set_trac_db_username username}
592 599
      prompt('Trac database password') {|password| TracMigrate.set_trac_db_password password}
593 600
    end

Also available in: Unified diff