[Groonga-mysql-commit] mroonga/homebrew-mroonga at b745be0 [master] Use install SQL file

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Mar 10 14:58:22 JST 2015


Kouhei Sutou	2015-03-10 14:58:22 +0900 (Tue, 10 Mar 2015)

  New Revision: b745be0a612f8b04fb8ad428ddc9b408cbc83977
  https://github.com/mroonga/homebrew-mroonga/commit/b745be0a612f8b04fb8ad428ddc9b408cbc83977

  Message:
    Use install SQL file

  Modified files:
    mroonga.rb

  Modified: mroonga.rb (+4 -11)
===================================================================
--- mroonga.rb    2015-03-10 14:01:36 +0900 (c956d0d)
+++ mroonga.rb    2015-03-10 14:58:22 +0900 (af0970e)
@@ -71,7 +71,7 @@ class Mroonga < Formula
   def caveats
     <<-EOS.undent
       To install mroonga plugin, run the following command:
-         mysql -uroot -e '#{install_sql}'
+         mysql -uroot < '#{install_sql_path}'
 
       To confirm successfuly installed, run the following command
       and confirm that 'mroonga' is in the list:
@@ -149,18 +149,11 @@ class Mroonga < Formula
     system("./configure", *configure_args)
     system("make")
     system("make install")
-    system("mysql -uroot -e '#{install_sql}' || true")
+    system("mysql -uroot < '#{install_sql_path}' || true")
   end
 
-  def install_sql
-    sqls = [
-      "INSTALL PLUGIN Mroonga SONAME \"ha_mroonga.so\";",
-      "CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME \"ha_mroonga.so\";",
-      "CREATE FUNCTION mroonga_snippet RETURNS STRING SONAME \"ha_mroonga.so\";",
-      "CREATE FUNCTION mroonga_command RETURNS STRING SONAME \"ha_mroonga.so\";",
-      "CREATE FUNCTION mroonga_escape RETURNS STRING SONAME \"ha_mroonga.so\";"
-    ]
-    sqls.join(" ")
+  def install_sql_path
+    prefix + "share/mroonga/install.sql"
   end
 
   def option_value(search_key)
-------------- next part --------------
HTML����������������������������...
Télécharger 



More information about the Groonga-mysql-commit mailing list
Back to archive index