Fixed error in sql dir name

2.0^2
Luis Bosque 11 years ago
parent 1afddee9a5
commit 106ab4cdda

@ -555,10 +555,10 @@ class User < Sequel::Model
in_database(as: :superuser) do |user_database|
user_database.transaction do
if files.empty?
glob = Rails.root.join('lib/sql/sites-enabled/*.sql')
glob = Rails.root.join('lib/sql/scripts-enabled/*.sql')
sql_files = Dir.glob(glob).sort
else
sql_files = files.map {|sql| Rails.root.join('lib/sql/sites-enabled', sql).to_s}.sort
sql_files = files.map {|sql| Rails.root.join('lib/sql/scripts-enabled', sql).to_s}.sort
end
sql_files.each do |f|
if File.exists?(f)
@ -567,7 +567,7 @@ class User < Sequel::Model
@sql.gsub!(':DATABASE_USERNAME', self.database_username)
user_database.run(@sql)
else
CartoDB::Logger.info "SQL function #{File.basename(f)} doesn't exist in lib/sql/sites-enabled directory. Not loading it."
CartoDB::Logger.info "SQL function #{File.basename(f)} doesn't exist in lib/sql/scripts-enabled directory. Not loading it."
end
end
end

Loading…
Cancel
Save