dameng-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c52f71ca3c6d4a5ce20dee6be61831a5378cfd5bfb607c4967cc3a8afb0c6d7
-  data.tar.gz: e8b1bebb377f3dc3043a2122b21dbb5e592c0ea4fb9d73707a21afa605c7ddf9
+  metadata.gz: df58b701f21045bf213bcb68f55f666f438392f5f3dc98f4288f4446cf4ed19c
+  data.tar.gz: aca1b8c49c32adec34ef0991b945e50924325d9b53da25da4c75966a52d89cd0
 SHA512:
-  metadata.gz: 64697aba410fa1b37145ac581e528047f9316853010005034baf7c54d6e1fba399a888893ce3b02a0a8a0646ce4a9b2b59a7b325e10eccc99488996ed4d707b1
-  data.tar.gz: 8700a9b393a13fc303679f7651ee5f8a585b35f83e8a10452a31aff83fae0a2ac2484a42883c40f8509fbf8c53918705350f632f5e65d93eef25aeb02b7c3e1d
+  metadata.gz: dcdde8463487934af0b6ca03c593b34e5bc129c440f6e2bf7640b77da63ba18d421f13c9de0bf017fb82dcfdc6322092c1ffe99c5c86d4f12c47757b9a917bc1
+  data.tar.gz: 7bf19ae686f0c53a9869e81c764ccad859bbbb479bf8aaded99dca0e568e9bfaa7068f848c69c4f10624e7e44f8fca4a5ed365add652bac8483e9853ed6d4e3f

data/lib/dm_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DmRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/sql/dm_rails_columns.sql

@@ -1,4 +1,5 @@
 -- dm-rails 辅助视图：为 ActiveRecord 提供 MySQL 风格的列结构信息
+-- 主键用预聚合 LEFT JOIN，勿改回相关子查询（后者在达梦上可慢 3 个数量级）
 -- 在达梦业务 schema 下用达梦客户端执行（勿经代理执行）；视图名可通过 DM_RAILS_VIEW 环境变量对应调整
 CREATE OR REPLACE VIEW dm_rails_columns AS
 SELECT LOWER(c.TABLE_NAME) AS tbl,
@@ -22,9 +23,13 @@ SELECT LOWER(c.TABLE_NAME) AS tbl,
          ELSE 'varchar(255)'
        END AS ctype,
        CASE c.NULLABLE WHEN 'Y' THEN 'YES' ELSE 'NO' END AS is_null,
-       NVL((SELECT 'PRI' FROM USER_CONS_COLUMNS cu JOIN USER_CONSTRAINTS uc ON cu.CONSTRAINT_NAME = uc.CONSTRAINT_NAME
-            WHERE uc.CONSTRAINT_TYPE = 'P' AND cu.TABLE_NAME = c.TABLE_NAME AND cu.COLUMN_NAME = c.COLUMN_NAME AND ROWNUM <= 1), '') AS key_kind,
+       CASE WHEN pk.COLUMN_NAME IS NOT NULL THEN 'PRI' ELSE '' END AS key_kind,
        c.DATA_DEFAULT AS def_val,
        CASE WHEN LOWER(c.COLUMN_NAME) = 'id' THEN 'auto_increment' ELSE '' END AS extra_str,
        c.COLUMN_ID AS col_order
-FROM USER_TAB_COLUMNS c;
+FROM USER_TAB_COLUMNS c
+LEFT JOIN (SELECT DISTINCT cu.TABLE_NAME, cu.COLUMN_NAME
+           FROM USER_CONS_COLUMNS cu
+           JOIN USER_CONSTRAINTS uc ON cu.CONSTRAINT_NAME = uc.CONSTRAINT_NAME
+           WHERE uc.CONSTRAINT_TYPE = 'P') pk
+  ON pk.TABLE_NAME = c.TABLE_NAME AND pk.COLUMN_NAME = c.COLUMN_NAME;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dameng-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - qinyuanmao