ruby-list

 斉藤 登と申します。
 PostgreSQL用拡張ライブラリの psql.rb をみて学んでたんですが、挙動が
おかしい所があったので修正しました。
 修正点は、
 ・sql文にエラーがあった場合、その後の sql を実行してくれなくなるの
    を修正。
 ・ファイルからの入力がうまくいかなかったのを修正。起動オプションで
   は -f 。コマンドでは \i。
 ・\E がうまく動かなかったのを修正。
 ・細かい点を少し修正。

 以上です。
----
 斉藤 登        Saitou Noboru <noborus@mb.kcom.ne.jp>
      http://webclub.kcom.ne.jp/mb/noborus/
     ----

Attachments (1)

psql.diff (3.55 KB, text/x-diff)

--- psql.rb.orig	Tue Jul 13 13:13:33 1999
+++ psql.rb	Thu Apr 13 21:57:47 2000
@@ -599,29 +599,27 @@
 
   when 'E'
     if args[1]
-      lastfile = args[1]
+      begin
+	lastfile = args[1]
+	File.file?(lastfile) && (mt = File.mtime(lastfile))
+	editFile(lastfile)
+	File.file?(lastfile) && (mt2 = File.mtime(lastfile))
+	fd = File.new(lastfile, "r")
+	if mt != mt2
+	  MainLoop(settings, fd)
+	  fd.close()
+	else
+	  if !settings.quiet
+	    printf(STDERR, "warning: %s not modified. query not executed\n", lastfile)
+	  end
+	  fd.close()
+	end
+      rescue
+	#
+      end
     else
       printf(STDERR, "\\r must be followed by a file name initially\n");
-      break
-    end
-
-    st = File.stat(lastfile)
-    editFile(lastfile)
-    if ((st2 = File.stat(lastfile) == nil) || 
-	(fd = File.new(lastfile, "r") == nil))
-      break
-    end
-
-    if st2.mtime == st.mtime
-      if !settings.quiet
-	printf(STDERR, "warning: %s not modified. query not executed\n", lastfile)
-      end
-      fd.close()
-      break
     end
-    MainLoop(settings, fd)
-    fd.close()
-    
   when 'f'
     if args[1]
       settings.opt.fieldSep = args[1]
@@ -645,17 +643,17 @@
     do_help(args[1])
 
   when 'i' # \i is include file
-    if !args[1]
+    if args[1]
+      begin
+	fd = File.open(args[1], "r")
+	MainLoop(settings, fd)
+	fd.close()
+      rescue Errno::ENOENT
+	printf(STDERR, "file named %s could not be opened\n", args[1])
+      end
+    else
       printf(STDERR, "\\i must be followed by a file name\n")
-      break
-    end
-    if fd = File.new(args[1], "r") == nil
-      printf(STDERR, "file named %s could not be opened\n", args[1])
-      break
     end
-    MainLoop(settings, fd)
-    fd.close()
-
   when 'l' # \l is list database
     listAllDbs(settings)
 
@@ -750,7 +748,7 @@
 
   if settings.singleStep
     printf("\n**************************************");
-    ptintf("*****************************************\n")
+    printf("*****************************************\n")
     STDOUT.flush
     printf("\npress return to continue ..\n");
     gets("", STDIN);
@@ -771,8 +769,8 @@
 	  settings.queryFout = STDOUT
 	end
       else
-      results.print(settings.queryFout, settings.opt)
-      settings.queryFout.flush
+	results.print(settings.queryFout, settings.opt)
+	settings.queryFout.flush
       end
       results.clear
 
@@ -885,13 +883,12 @@
       if line.length == 0
 	next
       end
-      p line
       ### begin slash command handling ###
       if line[0, 1] == "\\"
 	query = line
 	slashCmdStatus, query = HandleSlashCmds(settings, line, nil)
 	if slashCmdStatus == 0 && query != nil
-	  success = success && SendQuery(settings, query, FALSE, FALSE, 0)
+	  success = SendQuery(settings, query, FALSE, FALSE, 0) && success
 	  querySent = TRUE
 	elsif slashCmdStatus == 1
 	  query = nil
@@ -905,7 +902,7 @@
       ### begin query command handling ###
       slashCmdStatus = -1
       if settings.singleLineMode
-	success = success && SendQuery(settings, line, FALSE, FALSE, 0)
+	success = SendQuery(settings, line, FALSE, FALSE, 0) && success
 	querySent = TRUE
       else
 
@@ -926,7 +923,7 @@
 	    query = queryWaiting
 	    queryWaiting = nil
 
-	    success = success && SendQuery(settings, query, FALSE, FALSE, 0)
+	    success = SendQuery(settings, query, FALSE, FALSE, 0) && success
 	    querySent = TRUE
 	  else
 	    querySent = FALSE
@@ -1080,7 +1077,7 @@
     if singleSlashCmd
       line = singleQuery
     else
-      sprintf(line, "\\i %s", qfilename)
+      line = sprintf("\\i %s", qfilename)
     end
     HandleSlashCmds(settings, line, "")
   else

Thread

Prev Next

In This Thread

Prev Next

[#21717] patch of `Support for strings represented as a vector of ordinals' — sekita-n@... (Nobutaka SEKITANI)

[#21718] print, puts, printf — Masaki Suketa<CQN02273@...>

[#21730] Project Apollo 5.01 — Kazuhiro Yoshida <moriq.kazuhiro@...>

[#21732] GtkRadioMenuItem activate — mof <mof@...>

[#21736] OBJECTDAY 2000 — 助田 雅紀 <masaki.suketa@...>

[#21738] ruby の W3C ドラフト — KUBO Takehiro <tkubo@...>

[#21745] RubyUnit 'runit/cui/testrunner.rb' patch — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#21749] 漢字の文字化けについて — "KAWAUCHI" <kawauchi@...>

[#21752] ruby 1.4.4.deb — akira yamada / やまだあきら <akira@...>

[#21754] — Yoshiaki Oda <oda@...>

[#21759] Q: to_str — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#21760] proposal to change uri.rb — Tomoyuki Kosimizu <greentea@...2.so-net.ne.jp>

[#21765] rdindex-1.0.0 — rubikitch <rubikitch@...>

[#21767] [Patch] ftpup: illegal timezone adjustment — "NAKAMURA, Hiroshi" <nakahiro@...>

[#21781] how to get error reason in ftplib ? — "Kikutani, Makoto" <kikutani@...>

[#21785] VB meets Ruby — arton <arton@...>

[#21787] blade again? — "Kikutani, Makoto" <kikutani@...>

[#21789] about ftplib(ftpup) — goto@...

[#21798] script language magazine? — Akihiro Yamauchi <aygoofy@...>

[#21804] blade namazu — Shin-ichiro HARA <sinara@...>

[#21808] tktext.rb BUG — nagai@...

[#21811] Ruby icon competition は？ — Kazuhiro Nishiyama <nishiyama@...1.tiki.ne.jp>

[#21813] にっき — OZAWA Sakuro <crouton@...>

[#21818] RubyToken::TkSTRING::value — Yasushi Shoji <yashi@...>

[#21821] mod_ruby から拡張モジュールがロードできない — Norihito Shinzan (Jun Kabbalah) <kabbalah@...>

[#21822] ruby1.4.3 の cgi.rb でクッキー部分でのバグ — Keisuke Minami <keisuke@...>

[#21823] ruby1.4.3 の cgi.rb でクッキー部分でのバグ — Keisuke Minami <keisuke@...>

[#21826] `require': No such file to load -- tcltklib (LoadError) — "Takuro Suzuki" <etsuzuki@...>

[#21828] Re: proposal to change uri.rb — "ta-ka-si@..." <ta-ka-si@...>

[#21829] CVF: comp.lang.ruby — Yukihiro Matsumoto <matz@...>

[#21834] How can i use mod_ruby — goto@...

[#21837] site_ruby & Linux distribution — OZAWA Sakuro <crouton@...>

[#21838] ループの中での exec の使い方 — Ko Tanikawa <agape@...14.odn.ne.jp>

[#21843] [Q]Security Check($SAFE): FileTest within mod_ruby — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#21862] #define const — Toyofuku <toyofuku@...>

[#21870] rubyunit — rubikitch <rubikitch@...>

[#21887] psql.rb の修正 — Saitou Noboru <noborus@...>

[#21891] 誕生日おめでとう〜 — rubikitch <rubikitch@...>

[#21892] ユーザーの新規登録方法について — goto@...

[#21902] Re: #define const — toyofuku@...

[#21905] rd-draft.ja.rd — akira yamada / やまだあきら <akira@...>

[#21907] blade で — 時田幸粋 <ktokita@...>

[#21909] Ruby 1.4.4 — Yukihiro Matsumoto <matz@...>

[#21916] Ruby/Qt and Ruby/KDE — Nobuyuki Horie <horie@...>

[#21918] ANN: ActiveScriptRuby English Page — arton <arton@...>

[#21919] Re: #define const — toyofuku@...

[#21922] ruby-1.4.4 binary for BeOS 5 (Intel) — tenmei@... (Noriaki Harada)

[#21928] SomeError — Masatoshi SEKI <m_seki@...>

[#21931] ruby-mode — Yasushi Abe <yasushi@...>

[#21934] close on disk full — "Kikutani, Makoto" <kikutani@...>

[#21940] Ruby 1.4.4 binaries for Cygwin and DJGPP — WATANABE Hirofumi <Hirofumi.Watanabe@...>

[#21944] [Q] RD with CSS — gotoken@... (GOTO Kentaro)

[#21956] Thread & STDIN — Masato Toyoshima <mt@...>

[#21964] location of ruby-1.4.4.tar.gz — Yasuhiro Fukuma <yasuf@...>

[#21965] Re: [ruby-math:00257] Re: Polynomial.rb and floating point exception — kjana@... (YANAGAWA Kazuhisa)

[#21974] Re: Polynomial.rb and floating point exception — "K.Kodama" <kdm@...>

[#21981] rd2man — WATANABE Hirofumi <eban@...>

[#21990] rb.org — OZAWA Sakuro <crouton@...>

[#21998] Ruby 1.4.4 and Ruby/GTK 0.23 RPM packages for Vine Linux 2.0 (Vine Plus) — Naoki Kawakami <knao@...>

[#21999] media watch 2000.03.18 — Noritsugu Nakamura <nnakamur@...>

[#22005] Any good books for graph library? — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#22006] Is there a standard Iterator protocol? — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#22014] shell interactive — WATANABE Daisaku <dwata@...3.rim.or.jp>

[#22022] w3ml — とみたまさひろ <tommy@...>

[#22026] assert — "友谷 登" <ntomo@...>

[#22067] [solved] shell interactive — WATANABE Daisaku <dwata@...3.rim.or.jp>

[#22069] Re: #define const — Toyofuku <toyofuku@...>

[#22070] upload ruby-1.4.4 for OS/2 but... — kenn@...

[#22074] Ruby-1.4.3 の make に失敗 — Yasuhide Yano <yasuhi@...>

[#22075] erb-1.2.2 — Masatoshi SEKI <m_seki@...>

[#22082] ruby-1.4.4-i586-beos-socket.zip — Katsuyuki Komatsu <komatsu@...>

[#22085] Linux Conference セミナー「オープンソースのビジネスモデル」 — matz@... (Yukihiro Matsumoto)

[#22087] media watch 2000.03.24 — Noritsugu Nakamura <nnakamur@...>

[#22096] libwrap-ruby — Shugo Maeda <shugo@...>

[#22103] Please put ruby-1.4.4.tar.gz in pub/lang/ruby/1.4/ — "Akinori -Aki- MUSHA" <knu@...>

[#22112] net 1.1.16 — Minero Aoki <aamine@...>

[#22115] デフォルト付き attr_reader — tnaka@...

[#22117] StateGraph: state machine interpreter — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#22126] (件名なし) — Toshinori Takata <takata@...>

[#22130] PostgreSQL 拡張モジュールのラージオブジェクトの対応 — Saitou Noboru <noborus@...>

[#21736] OBJECTDAY 2000 — 助田　雅紀 <masaki.suketa@...>

[#22026] assert — "友谷登" <ntomo@...>

[#22211] Web 掲示板 — 堀川　久 <vzw00011@...>